Merge pull request #21 from drivergroup/queryparsers

Added converting camel case to snake case for filters and sorting AST

4 files changed, 34 insertions, 5 deletions

diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala
index 768e5f5..7bbcd10 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParser.scala
@@ -5,6 +5,7 @@ import fastparse.all._
 import fastparse.core.Parsed
 import fastparse.parsers.Intrinsics.CharPred
 import xyz.driver.pdsuicommon.db.{SearchFilterBinaryOperation, SearchFilterExpr, SearchFilterNAryOperation}
+import xyz.driver.pdsuicommon.utils.Utils._
 
 import scala.util.Try
 
@@ -56,7 +57,8 @@ object SearchFilterParser {
       CharPred(c => c.isLetterOrDigit)
         .rep(min = 1)).!.map(SearchFilterExpr.Dimension(None, _))
     val pathParser = P(identParser.! ~ "." ~ identParser.!) map {
-      case (left, right) => SearchFilterExpr.Dimension(Some(left), right)
+      case (left, right) =>
+        SearchFilterExpr.Dimension(Some(toSnakeCase(left)), toSnakeCase(right))
     }
     P(pathParser | identParser)
   }
diff --git a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
index c1c332f..4bfc669 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/parsers/SortingParser.scala
@@ -3,6 +3,7 @@ package xyz.driver.pdsuicommon.parsers
 import xyz.driver.pdsuicommon.db.{Sorting, SortingOrder}
 import fastparse.all._
 import fastparse.core.Parsed
+import xyz.driver.pdsuicommon.utils.Utils._
 
 import scala.util.Try
 
@@ -18,8 +19,11 @@ object SortingParser {
       case (sortingOrder, field) =>
         val prefixedFields = field.split("\\.", 2)
         prefixedFields.size match {
-          case 1 => Sorting.Dimension(None, field, sortingOrder)
-          case 2 => Sorting.Dimension(Some(prefixedFields.head), prefixedFields.last, sortingOrder)
+          case 1 => Sorting.Dimension(None, toSnakeCase(field), sortingOrder)
+          case 2 =>
+            Sorting.Dimension(Some(prefixedFields.head).map(toSnakeCase),
+                              toSnakeCase(prefixedFields.last),
+                              sortingOrder)
         }
     }
   }
diff --git a/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala b/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala
index 02c9e28..63b0572 100644
--- a/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala
+++ b/src/main/scala/xyz/driver/pdsuicommon/utils/Utils.scala
@@ -1,6 +1,7 @@
 package xyz.driver.pdsuicommon.utils
 
 import java.time.LocalDateTime
+import java.util.regex.{Matcher, Pattern}
 
 object Utils {
 
@@ -20,4 +21,23 @@ object Utils {
         fullClassName.substring(fullClassName.lastIndexOf("$") + 1)
     }
   }
+
+  def toSnakeCase(str: String): String =
+    str
+      .replaceAll("([A-Z]+)([A-Z][a-z])", "$1_$2")
+      .replaceAll("([a-z\\d])([A-Z])", "$1_$2")
+      .toLowerCase
+
+  def toCamelCase(str: String): String = {
+    val sb = new StringBuffer()
+    def loop(m: Matcher): Unit = if (m.find()) {
+      m.appendReplacement(sb, m.group(1).toUpperCase())
+      loop(m)
+    }
+    val m: Matcher = Pattern.compile("_(.)").matcher(str)
+    loop(m)
+    m.appendTail(sb)
+    sb.toString
+  }
+
 }
diff --git a/src/test/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParserSuite.scala b/src/test/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParserSuite.scala
index 5cd2dc9..9ca2343 100644
--- a/src/test/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParserSuite.scala
+++ b/src/test/scala/xyz/driver/pdsuicommon/parsers/SearchFilterParserSuite.scala
@@ -9,6 +9,7 @@ import org.scalacheck.Arbitrary.arbitrary
 import org.scalacheck.{Gen, Prop}
 import org.scalatest.FreeSpecLike
 import org.scalatest.prop.Checkers
+import xyz.driver.pdsuicommon.utils.Utils._
 
 object SearchFilterParserSuite {
 
@@ -30,8 +31,10 @@ class SearchFilterParserSuite extends FreeSpecLike with Checkers {
         Prop.forAllNoShrink(dimensionGen) {
           case (left, right) =>
             val raw = s"$left.$right"
-            SearchFilterParser.dimensionParser.parse(raw) match {
-              case Parsed.Success(Dimension(Some(`left`), `right`), _) => true
+            val l = toSnakeCase(left)
+            val r = toSnakeCase(right)
+              SearchFilterParser.dimensionParser.parse(raw) match {
+              case Parsed.Success(Dimension(Some(`l`), `r`), _) => true
               case res => false
             }
         }