From fc33428ccf8ee82c4072c28ca834833e7248200c Mon Sep 17 00:00:00 2001
From: Julius Sula <julius.sula@nttdata.com>
Date: Tue, 16 May 2023 15:53:54 +0200
Subject: [PATCH] concatenate filter and change logging

---
 .../calender/changes/ChangeRequest.java       | 62 ++++++++-----------
 backend/src/main/resources/log4j2.xml         |  6 +-
 2 files changed, 30 insertions(+), 38 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 67d0757..af01174 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/ChangeRequest.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeRequest.java
@@ -10,7 +10,6 @@ import com.nttdata.calender.api.RemedyJavaAPI;
 import com.nttdata.calender.changes.query.Filter;
 import com.nttdata.calender.changes.query.Sort;
 
-
 /**
  * Represents a change request object that stores information about slice start,
  * slice end,
@@ -126,19 +125,13 @@ public class ChangeRequest {
                     var startFrom = filter.get(i).getCriteria()[0];
                     var startTo = filter.get(i).getCriteria()[1];
 
-                    System.out.println(startFrom);
-                    System.out.println(startTo);
-
                     String inputFormat = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
-                    String outputFormat = "MM/dd/yyyy";
+                    String outputFormat = "dd/MM/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));
 
@@ -152,38 +145,37 @@ public class ChangeRequest {
                         qualifier += "\'" + dateColumn + startToFormatted;
                     }
                     qualifier = "(" + qualifier + ")";
-                    continue;
-                }
+                } else {
+                    column = api.getFieldDatabaseName(query.getFormName(), query.getFieldId(column));
 
-                column = api.getFieldDatabaseName(query.getFormName(), query.getFieldId(column));
+                    var inner_filter = "\'" + column + "\' ";
+                    var criterias = filter.get(i).getCriteria();
+                    var inner_concat = " OR ";
+                    var inner_criteria_prefix = "";
 
-                var inner_filter = "\'" + column + "\' ";
-                var criterias = filter.get(i).getCriteria();
-                var inner_concat = " OR ";
-                var inner_criteria_prefix = "";
-
-                switch (filter.get(i).getFilter()) {
-                    case "equals":
-                        inner_filter += "= ";
-                        break;
-                    case "contains":
-                        inner_filter += "LIKE ";
-                        inner_concat = " AND ";
-                        inner_criteria_prefix = "%";
-                        break;
-                    default:
-                        throw new ARException();
-                }
-
-                for (int j = 0; j < criterias.length; j++) {
-                    criterias[j] = inner_criteria_prefix + criterias[j] + inner_criteria_prefix;
-                    inner_qualifier += "(" + inner_filter + "\"" + criterias[j] + "\")";
-                    if (j < criterias.length - 1) {
-                        inner_qualifier += inner_concat;
+                    switch (filter.get(i).getFilter()) {
+                        case "equals":
+                            inner_filter += "= ";
+                            break;
+                        case "contains":
+                            inner_filter += "LIKE ";
+                            inner_concat = " AND ";
+                            inner_criteria_prefix = "%";
+                            break;
+                        default:
+                            throw new ARException();
                     }
+
+                    for (int j = 0; j < criterias.length; j++) {
+                        criterias[j] = inner_criteria_prefix + criterias[j] + inner_criteria_prefix;
+                        inner_qualifier += "(" + inner_filter + "\"" + criterias[j] + "\")";
+                        if (j < criterias.length - 1) {
+                            inner_qualifier += inner_concat;
+                        }
+                    }
+                    qualifier += "(" + inner_qualifier + ")";
                 }
 
-                qualifier += "(" + inner_qualifier + ")";
                 if (i < filter.size() - 1) {
                     qualifier += " AND ";
                 }
diff --git a/backend/src/main/resources/log4j2.xml b/backend/src/main/resources/log4j2.xml
index 7e72545..42d8114 100644
--- a/backend/src/main/resources/log4j2.xml
+++ b/backend/src/main/resources/log4j2.xml
@@ -2,7 +2,7 @@
 <Configuration status="info">
     <Appenders>
 		<RollingFile name="application"
-			fileName="./backend/log/application.log" filePattern="application-%d{yyyy-MM-dd-HH-mm}-%i.log">
+			fileName="./backend/log/application.log" filePattern="backend/log/application-%d{yyyy-MM-dd-HH-mm}-%i.log">
 			<PatternLayout>
 				<Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n%ex{full}</Pattern>
 			</PatternLayout>
@@ -11,7 +11,7 @@
 			</Policies>
 		</RollingFile>
      	<RollingFile name="error"
-			fileName="./backend/log/error.log" filePattern="error-%d{yyyy-MM-dd-HH-mm}-%i.log">
+			fileName="./backend/log/error.log" filePattern="backend/log/error-%d{yyyy-MM-dd-HH-mm}-%i.log">
 			<PatternLayout>
 				<Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n%ex{full}</Pattern>
 			</PatternLayout>
@@ -20,7 +20,7 @@
 			</Policies>
 		</RollingFile>
         <RollingFile name="warn"
-			fileName="./backend/log/warn.log" filePattern="warn-%d{yyyy-MM-dd-HH-mm}-%i.log">
+			fileName="./backend/log/warn.log" filePattern="backend/log/warn-%d{yyyy-MM-dd-HH-mm}-%i.log">
 			<PatternLayout>
 				<Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n</Pattern>
 			</PatternLayout>