CE-1068: initial checkin of variables in filter handling

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/tables/QQueryFilterTest.java

@@ -0,0 +1,100 @@
+/*
+ * QQQ - Low-code Application Framework for Engineers.
+ * Copyright (C) 2021-2022.  Kingsrook, LLC
+ * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
+ * contact@kingsrook.com
+ * https://github.com/Kingsrook/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.kingsrook.qqq.backend.core.actions.tables;
+
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import com.kingsrook.qqq.backend.core.BaseTest;
+import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
+import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
+import com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions.AbstractFilterExpression;
+import com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions.FilterVariableExpression;
+import org.junit.jupiter.api.Test;
+import static com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator.BETWEEN;
+import static com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator.EQUALS;
+import static com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator.IS_BLANK;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+
+/*******************************************************************************
+ ** Unit test for QQueryFilter
+ **
+ *******************************************************************************/
+class QQueryFilterTest extends BaseTest
+{
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Test
+   public void testInterpretValues() throws QException
+   {
+      Map<String, Serializable> inputValues = new HashMap<>();
+      inputValues.put("clientIdEquals1", "value");
+
+      AbstractFilterExpression<Serializable> expression = new FilterVariableExpression()
+         .withVariableName("clientIdEquals1");
+
+      QQueryFilter qQueryFilter = new QQueryFilter(new QFilterCriteria("id", EQUALS, expression));
+      qQueryFilter.interpretValues(inputValues);
+
+      assertEquals("value", qQueryFilter.getCriteria().get(0).getValues().get(0));
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Test
+   public void testPrepForBackend() throws QException
+   {
+      FilterVariableExpression fve0 = new FilterVariableExpression();
+      FilterVariableExpression fve1 = new FilterVariableExpression();
+      FilterVariableExpression fve2 = new FilterVariableExpression();
+      FilterVariableExpression fve3 = new FilterVariableExpression();
+      FilterVariableExpression fve4 = new FilterVariableExpression();
+      FilterVariableExpression fve5 = new FilterVariableExpression();
+      FilterVariableExpression fve6 = new FilterVariableExpression();
+
+      QQueryFilter qQueryFilter = new QQueryFilter(
+         new QFilterCriteria("id", EQUALS, fve0),
+         new QFilterCriteria("value", IS_BLANK, fve1),
+         new QFilterCriteria("id", EQUALS, fve2),
+         new QFilterCriteria("id", BETWEEN, fve3, fve4),
+         new QFilterCriteria("id", BETWEEN, fve5, fve6)
+      );
+      qQueryFilter.prepForBackend();
+
+      assertEquals("idEquals", fve0.getVariableName());
+      assertEquals("valueIsBlank", fve1.getVariableName());
+      assertEquals("idEquals2", fve2.getVariableName());
+      assertEquals("idBetweenFrom", fve3.getVariableName());
+      assertEquals("idBetweenTo", fve4.getVariableName());
+      assertEquals("idBetweenFrom2", fve5.getVariableName());
+      assertEquals("idBetweenTo2", fve6.getVariableName());
+   }
+
+}

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/expressions/NowWithOffsetTest.java

@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 
 /*******************************************************************************
- ** Unit test for NowWithOffset 
+ ** Unit test for NowWithOffset
  *******************************************************************************/
 class NowWithOffsetTest extends BaseTest
 {
@@ -42,7 +42,7 @@ class NowWithOffsetTest extends BaseTest
     **
     *******************************************************************************/
    @Test
-   void test()
+   void test() throws Exception
    {
       long now = System.currentTimeMillis();
 
@@ -65,4 +65,4 @@ class NowWithOffsetTest extends BaseTest
       assertThat(oneYearFromNowMillis).isCloseTo(now + (730 * DAY_IN_MILLIS), Offset.offset(10_000L + 3 * DAY_IN_MILLIS));
    }
 
-}
+}

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/model/savedreports/SavedReportTableCustomizerTest.java

@@ -37,7 +37,9 @@ import com.kingsrook.qqq.backend.core.model.actions.reporting.pivottable.PivotTa
 import com.kingsrook.qqq.backend.core.model.actions.reporting.pivottable.PivotTableValue;
 import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput;
+import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
+import com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions.FilterVariableExpression;
 import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateOutput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
@@ -45,11 +47,12 @@ import com.kingsrook.qqq.backend.core.utils.JsonUtils;
 import com.kingsrook.qqq.backend.core.utils.TestUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import static com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator.EQUALS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 
 /*******************************************************************************
- ** Unit test for SavedReportTableCustomizer 
+ ** Unit test for SavedReportTableCustomizer
  *******************************************************************************/
 class SavedReportTableCustomizerTest extends BaseTest
 {
@@ -98,6 +101,31 @@ class SavedReportTableCustomizerTest extends BaseTest
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Test
+   void testPrepareFilterVariable()
+   {
+      QQueryFilter qQueryFilter = new QQueryFilter(new QFilterCriteria("id", EQUALS, new FilterVariableExpression()));
+
+      QRecord record = new SavedReport()
+         .withTableName(TestUtils.TABLE_NAME_PERSON_MEMORY)
+         .withQueryFilterJson(JsonUtils.toJson(qQueryFilter))
+         .withColumnsJson(JsonUtils.toJson(new ReportColumns()
+            .withColumn("id")
+            .withColumn("firstName")
+            .withColumn("lastName")
+            .withColumn("birthDate")))
+         .toQRecord();
+
+      new SavedReportTableCustomizer().preValidateRecord(record);
+
+      assertThat(record.getValueString("queryFilterJson").contains("idEquals"));
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -224,5 +252,4 @@ class SavedReportTableCustomizerTest extends BaseTest
          List.of("Missing function for at least one pivot table value"));
    }
 
-
-}
+}