taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

concatenate filter and change logging

main
Julius Sula 2023-05-16 15:53:54 +02:00
parent 7570306341
commit fc33428ccf
2 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
backend/src/main/java/com/nttdata/calender/changes/ChangeRequest.java
View File

@ -10,7 +10,6 @@ import com.nttdata.calender.api.RemedyJavaAPI;
import com.nttdata.calender.changes.query.Filter; import com.nttdata.calender.changes.query.Filter;
import com.nttdata.calender.changes.query.Sort; import com.nttdata.calender.changes.query.Sort;
/** /**
* Represents a change request object that stores information about slice start, * Represents a change request object that stores information about slice start,
* slice end, * slice end,
@ -126,19 +125,13 @@ public class ChangeRequest {
var startFrom = filter.get(i).getCriteria()[0]; var startFrom = filter.get(i).getCriteria()[0];
var startTo = filter.get(i).getCriteria()[1]; 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 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)); LocalDateTime dateTime = LocalDateTime.parse(startFrom, DateTimeFormatter.ofPattern(inputFormat));
String startFromFormatted = dateTime.format(DateTimeFormatter.ofPattern(outputFormat)); String startFromFormatted = dateTime.format(DateTimeFormatter.ofPattern(outputFormat));
String startToFormatted = 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()) { if (!startFromFormatted.isEmpty() && !startToFormatted.isEmpty()) {
var dateColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId(column)); var dateColumn = api.getFieldDatabaseName(query.getFormName(), query.getFieldId(column));
@ -152,38 +145,37 @@ public class ChangeRequest {
qualifier += "\'" + dateColumn + startToFormatted; qualifier += "\'" + dateColumn + startToFormatted;
} }
qualifier = "(" + qualifier + ")"; 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 + "\' "; switch (filter.get(i).getFilter()) {
var criterias = filter.get(i).getCriteria(); case "equals":
var inner_concat = " OR "; inner_filter += "= ";
var inner_criteria_prefix = ""; break;
case "contains":
switch (filter.get(i).getFilter()) { inner_filter += "LIKE ";
case "equals": inner_concat = " AND ";
inner_filter += "= "; inner_criteria_prefix = "%";
break; break;
case "contains": default:
inner_filter += "LIKE "; throw new ARException();
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;
} }
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) { if (i < filter.size() - 1) {
qualifier += " AND "; qualifier += " AND ";
} }

6
backend/src/main/resources/log4j2.xml
View File

@ -2,7 +2,7 @@
<Configuration status="info"> <Configuration status="info">
<Appenders> <Appenders>
<RollingFile name="application" <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> <PatternLayout>
<Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n%ex{full}</Pattern> <Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n%ex{full}</Pattern>
</PatternLayout> </PatternLayout>
@ -11,7 +11,7 @@
</Policies> </Policies>
</RollingFile> </RollingFile>
<RollingFile name="error" <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> <PatternLayout>
<Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n%ex{full}</Pattern> <Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n%ex{full}</Pattern>
</PatternLayout> </PatternLayout>
@ -20,7 +20,7 @@
</Policies> </Policies>
</RollingFile> </RollingFile>
<RollingFile name="warn" <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> <PatternLayout>
<Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n</Pattern> <Pattern>%d{yyyy-MM-dd-HH:mm:ss} %-5p %m%n</Pattern>
</PatternLayout> </PatternLayout>