fix painless script for day of week function

Author: fupelaqu

es6/sql-bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala

@@ -2945,7 +2945,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       |    "wd": {
       |      "script": {
       |        "lang": "painless",
-      |        "source": "def param1 = (!doc.containsKey('createdAt') || doc['createdAt'].empty ? null : doc['createdAt'].value.get(ChronoField.DAY_OF_WEEK)); param1"
+      |        "source": "def param1 = (!doc.containsKey('createdAt') || doc['createdAt'].empty ? null : doc['createdAt'].value); (param1 == null) ? null : (param1.get(ChronoField.DAY_OF_WEEK) + 6) % 7"
       |      }
       |    },
       |    "yd": {
@@ -3047,6 +3047,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
       .replaceAll("-", " - ")
       .replaceAll("\\*", " * ")
       .replaceAll("/", " / ")
+      .replaceAll("%", " % ")
       .replaceAll(">", " > ")
       .replaceAll("<", " < ")
       .replaceAll("!=", " != ")

sql/bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala

@@ -2949,7 +2949,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         |    "wd": {
         |      "script": {
         |        "lang": "painless",
-        |        "source": "def param1 = (!doc.containsKey('createdAt') || doc['createdAt'].empty ? null : doc['createdAt'].value.get(ChronoField.DAY_OF_WEEK)); param1"
+        |        "source": "def param1 = (!doc.containsKey('createdAt') || doc['createdAt'].empty ? null : doc['createdAt'].value); (param1 == null) ? null : (param1.get(ChronoField.DAY_OF_WEEK) + 6) % 7"
         |      }
         |    },
         |    "yd": {
@@ -3051,6 +3051,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
         .replaceAll("-", " - ")
         .replaceAll("\\*", " * ")
         .replaceAll("/", " / ")
+        .replaceAll("%", " % ")
         .replaceAll(">", " > ")
         .replaceAll("<", " < ")
         .replaceAll("!=", " != ")

sql/src/main/scala/app/softnetwork/elastic/sql/function/time/package.scala

@@ -294,7 +294,23 @@ package object time {
 
   class DayOfMonth extends TimeFieldExtract(DAY_OF_MONTH)
 
-  class DayOfWeek extends TimeFieldExtract(DAY_OF_WEEK)
+  class DayOfWeek(date: Identifier)
+      extends TimeFieldExtract(DAY_OF_WEEK)
+      with FunctionWithIdentifier {
+    override def identifier: Identifier = date
+    override def args: List[PainlessScript] = List(identifier)
+    override def toPainlessCall(
+      callArgs: List[String],
+      context: Option[PainlessContext]
+    ): String = {
+      callArgs match {
+        case arg :: Nil =>
+          s"($arg.get(${field.painless(context)}) + 6) % 7"
+        case _ => throw new IllegalArgumentException("DayOfWeek requires exactly one argument")
+      }
+    }
+
+  }
 
   class DayOfYear extends TimeFieldExtract(DAY_OF_YEAR)
 

sql/src/main/scala/app/softnetwork/elastic/sql/parser/function/time/package.scala

@@ -191,14 +191,21 @@ package object time {
 
     import TimeField._
 
+    def day_of_week_tr: PackratParser[FunctionWithIdentifier] =
+      DAY_OF_WEEK.regex ~ start ~ (identifierWithTransformation | identifierWithIntervalFunction | identifierWithFunction | identifier) ~ end ^^ {
+        case _ ~ _ ~ i ~ _ => new DayOfWeek(i)
+      }
+
+    def day_of_week_identifier: PackratParser[Identifier] = day_of_week_tr ^^ { dw =>
+      dw.identifier.withFunctions(dw +: dw.identifier.functions)
+    }
+
     def year_tr: PackratParser[TransformFunction[SQLTemporal, SQLNumeric]] =
       YEAR.regex ^^ (_ => new Year)
     def month_of_year_tr: PackratParser[TransformFunction[SQLTemporal, SQLNumeric]] =
       MONTH_OF_YEAR.regex ^^ (_ => new MonthOfYear)
     def day_of_month_tr: PackratParser[TransformFunction[SQLTemporal, SQLNumeric]] =
       DAY_OF_MONTH.regex ^^ (_ => new DayOfMonth)
-    def day_of_week_tr: PackratParser[TransformFunction[SQLTemporal, SQLNumeric]] =
-      DAY_OF_WEEK.regex ^^ (_ => new DayOfWeek)
     def day_of_year_tr: PackratParser[TransformFunction[SQLTemporal, SQLNumeric]] =
       DAY_OF_YEAR.regex ^^ (_ => new DayOfYear)
     def hour_of_day_tr: PackratParser[TransformFunction[SQLTemporal, SQLNumeric]] =
@@ -228,7 +235,6 @@ package object time {
       year_tr |
       month_of_year_tr |
       day_of_month_tr |
-      day_of_week_tr |
       day_of_year_tr |
       hour_of_day_tr |
       minute_of_hour_tr |
@@ -250,6 +256,7 @@ package object time {
       dateTimeFunctionWithIdentifier |
       date_diff_identifier |
       date_trunc_identifier |
+      day_of_week_identifier |
       extract_identifier) ~ rep(intervalFunction) ^^ { case i ~ f =>
         i.withFunctions(f ++ i.functions)
       }