From 2012a63f0a9dc65943f681a9f9d0df8815d7774e Mon Sep 17 00:00:00 2001
From: Said Gedik <said.gedik@nttdata.com>
Date: Tue, 16 May 2023 15:35:50 +0200
Subject: [PATCH] a

---
 .../calender/changes/ChangeRequest.java       | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/com/nttdata/calender/changes/ChangeRequest.java b/backend/src/main/java/com/nttdata/calender/changes/ChangeRequest.java
index 895451f..ea4f8cd 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/ChangeRequest.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeRequest.java
@@ -1,5 +1,7 @@
 package com.nttdata.calender.changes;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 
 import com.bmc.arsys.api.ARException;
@@ -122,17 +124,31 @@ public class ChangeRequest {
                 if (column.equals("D2")) {
                     var startFrom = filter.get(i).getCriteria()[0];
                     var startTo = filter.get(i).getCriteria()[1];
-                    if (!startFrom.isEmpty() && !startTo.isEmpty()) {
+
+                    System.out.println(startFrom);
+                    System.out.println(startTo);
+
+                    String inputFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+                    String outputFormat = "MM/dd/yyyy";
+
+                    LocalDateTime dateTime = LocalDateTime.parse(startFrom, DateTimeFormatter.ofPattern(inputFormat));
+                    String startFromFormatted = dateTime.format(DateTimeFormatter.ofPattern(outputFormat));
+                    String startToFormatted = dateTime.format(DateTimeFormatter.ofPattern(outputFormat));
+
+                    System.out.println(startFromFormatted);
+                    System.out.println(startToFormatted);
+
+                    if (!startFromFormatted.isEmpty() && !startToFormatted.isEmpty()) {
                         var dateColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId(column));
 
                         // Same day changes need to startFrom=day and startTo=day+24h 60m 60s
-                        if (startFrom.equals(startTo)) {
-                            startTo = "\' < (\"" + startTo + "\"" + " + (24 * (60 * 60)))";
+                        if (startFromFormatted.equals(startToFormatted)) {
+                            startToFormatted = "\' < (\"" + startToFormatted + "\"" + " + (24 * (60 * 60)))";
                         } else
-                            startTo = "\' <= \"" + startTo + "\"";
+                            startToFormatted = "\' <= \"" + startToFormatted + "\"";
 
-                        qualifier += "\'" + dateColumn + "\' >= \"" + startFrom + "\" AND ";
-                        qualifier += "\'" + dateColumn + startTo;
+                        qualifier += "\'" + dateColumn + "\' >= \"" + startFromFormatted + "\" AND ";
+                        qualifier += "\'" + dateColumn + startToFormatted;
                     }
                     qualifier = "(" + qualifier + ")";
                     continue;