added is on or after and removed forced contentUpdatedSinceDateTime. …

…upped version
transcom · Nov 30, 2023 · 617c4b1 · 617c4b1
1 parent f66fd8c
commit 617c4b1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>com.milmove.trdmlambda</groupId>
 	<artifactId>trdm-lambda</artifactId>
-	<version>0.4.2.0</version>
+	<version>0.4.2.1</version>
 	<name>trdm java spring interface</name>
 	<description>Project for deploying a Java RESTful interface for SOAP requests to TRDM.</description>
 	<properties>

diff --git a/src/main/java/com/milmove/trdmlambda/milmove/service/GetTableService.java b/src/main/java/com/milmove/trdmlambda/milmove/service/GetTableService.java
@@ -117,37 +117,55 @@ private GetTableResponse createSoapRequest(GetTableRequest request)
         trdm.setPhysicalName(request.getPhysicalName());
         trdm.setReturnContent(Boolean.valueOf(request.isReturnContent()));
 
-        // Use this to set the data pull since time X so as to not always pull all data
-        // every request
-        trdm.setContentUpdatedSinceDateTime(DatatypeFactory.newInstance()
-                .newXMLGregorianCalendar(request.getContentUpdatedSinceDateTime()));
 
         // Check if the optional fields of date time filters were provided
         // If so, then apply filters accordingly
         if (request.getContentUpdatedOnOrBeforeDateTime() != null) {
             // Convert String to XMLGregorianCalendar
             XMLGregorianCalendar contentUpdatedOnOrBeforeDateTime = DatatypeFactory.newInstance()
                     .newXMLGregorianCalendar(request.getContentUpdatedOnOrBeforeDateTime());
-            SingleValueDateTimeFilter singleValueDateTimeFilter = new SingleValueDateTimeFilter();
-            // IS_BETWEEN with TwoValueDateTimeFilter does not behave as expected. Add IS_ON_OR_BEFORE
-            singleValueDateTimeFilter.setFilterType(SingleValueDateTimeFilterType.IS_ON_OR_BEFORE);
-            singleValueDateTimeFilter.setFilterType(SingleValueDateTimeFilterType.IS_ON_OR_BEFORE);
-            singleValueDateTimeFilter.setFilterValue(contentUpdatedOnOrBeforeDateTime);
+            // IS_BETWEEN with TwoValueDateTimeFilter does not behave as expected. Add IS_ON_OR_BEFORE and IS_ON_OR_AFTER
+
+            // Configure IS_ON_OR_AFTER column filter
+            SingleValueDateTimeFilter isOnOrAfterSingleValueDateTimeFilter = new SingleValueDateTimeFilter();
+            isOnOrAfterSingleValueDateTimeFilter.setFilterType(SingleValueDateTimeFilterType.IS_ON_OR_AFTER);
+            // Set value to the contentUpdatedSinceDateTime (So we can reuse it, it means the same logically but is used
+            // for different purposes)
+            isOnOrAfterSingleValueDateTimeFilter.setFilterValue(DatatypeFactory.newInstance()
+                .newXMLGregorianCalendar(request.getContentUpdatedSinceDateTime()));
+            // Add SingleValueDateTimeFilter to ColumnFilterTypes
+            ColumnFilterTypeAndValues isOnOrAfterColumnFilterTypeAndValues = new ColumnFilterTypeAndValues();
+            isOnOrAfterColumnFilterTypeAndValues.getNoValueFilterOrSingleValueFilterOrSingleValueNumericalFilter()
+                    .add(isOnOrAfterSingleValueDateTimeFilter);
+            ColumnFilter isOnOrAfterColumnFilter = new ColumnFilter();
+            isOnOrAfterColumnFilter.setColumn("LAST_UDP_DT"); // Last update date, this string value comes from TRDM
+            // Add ColumnFilterTypes to ColumnFilter
+            isOnOrAfterColumnFilter.setColumnFilterTypes(isOnOrAfterColumnFilterTypeAndValues);
+
+            // Configure IS_ON_OR_BEFORE column filter
+            SingleValueDateTimeFilter isOnOrBeforeSingleValueDateTimeFilter = new SingleValueDateTimeFilter();
+            isOnOrBeforeSingleValueDateTimeFilter.setFilterType(SingleValueDateTimeFilterType.IS_ON_OR_BEFORE);
+            isOnOrBeforeSingleValueDateTimeFilter.setFilterValue(contentUpdatedOnOrBeforeDateTime);
             // Add SingleValueDateTimeFilter to ColumnFilterTypes
-            ColumnFilterTypeAndValues columnFilterTypeAndValues = new ColumnFilterTypeAndValues();
-            columnFilterTypeAndValues.getNoValueFilterOrSingleValueFilterOrSingleValueNumericalFilter()
-                    .add(singleValueDateTimeFilter);
-            ColumnFilter columnFilter = new ColumnFilter();
-            columnFilter.setColumn("LAST_UDP_DT"); // Last update date, this string value comes from TRDM
+            ColumnFilterTypeAndValues isOnOrBeforecolumnFilterTypeAndValues = new ColumnFilterTypeAndValues();
+            isOnOrBeforecolumnFilterTypeAndValues.getNoValueFilterOrSingleValueFilterOrSingleValueNumericalFilter()
+                    .add(isOnOrBeforeSingleValueDateTimeFilter);
+            ColumnFilter isOnOrBeforeColumnFilter = new ColumnFilter();
+            isOnOrBeforeColumnFilter.setColumn("LAST_UDP_DT"); // Last update date, this string value comes from TRDM
             // Add ColumnFilterTypes to ColumnFilter
-            columnFilter.setColumnFilterTypes(columnFilterTypeAndValues);
+            isOnOrBeforeColumnFilter.setColumnFilterTypes(isOnOrBeforecolumnFilterTypeAndValues);
 
             // Create the trdm columns filters class so we can add our column filter to it
             ReturnTableInput.TRDM.ColumnFilters columnFilters = new ReturnTableInput.TRDM.ColumnFilters();
-            columnFilters.getColumnFilter().add(columnFilter);
+            columnFilters.getColumnFilter().add(isOnOrBeforeColumnFilter);
 
             // Set the columnFilters object to the trdm object
             trdm.setColumnFilters(columnFilters);
+        } else {
+        // Use this to set the data pull since time X so as to not always pull all data
+        // every request
+        trdm.setContentUpdatedSinceDateTime(DatatypeFactory.newInstance()
+                .newXMLGregorianCalendar(request.getContentUpdatedSinceDateTime()));
         }
 
         // Check optional field