marta-jankovics commented on code in PR #4673:
URL: https://github.com/apache/fineract/pull/4673#discussion_r2094737688


##########
fineract-provider/src/main/java/org/apache/fineract/commands/data/request/AuditRequest.java:
##########
@@ -66,5 +71,35 @@ public class AuditRequest implements Serializable {
     private Long savingsAccountId;
     @QueryParam("processingResult")
     private String processingResult;
+    @QueryParam("dateFormat")
+    private String dateFormat;
+    @QueryParam("locale")
+    private String locale;
 
+    public Temporal getMakerDateTimeFrom() {
+        return convertDateTimeToLocalDateTime(makerDateTimeFrom);
+    }
+
+    public Temporal getMakerDateTimeTo() {
+        return convertDateTimeToLocalDateTime(makerDateTimeTo);
+    }
+
+    public Temporal getCheckerDateTimeFrom() {
+        return convertDateTimeToLocalDateTime(checkerDateTimeFrom);
+    }
+
+    public Temporal getCheckerDateTimeTo() {
+        return convertDateTimeToLocalDateTime(checkerDateTimeTo);
+    }
+
+    private Temporal convertDateTimeToLocalDateTime(String dateTimeStr) {
+        if (dateTimeStr == null || dateTimeStr.isEmpty()) {
+            return null;
+        }
+        try {
+            return LocalDateTime.parse(dateTimeStr, 
DateTimeFormatter.ofPattern(dateFormat, Locale.of(locale)));

Review Comment:
   locale and dateFormat both can be null, maybe the best to use null-safe 
DateUtils parse methods.
   I think dateFormat can not be a dateTimeFormat (for that we usually use 
dateTimeFormat as parameter)



##########
fineract-provider/src/main/java/org/apache/fineract/commands/api/AuditsApiResource.java:
##########
@@ -119,10 +119,38 @@ private SQLBuilder getExtraCriteria(AuditRequest 
auditRequest) {
         extraCriteria.addNonNullCriteria("aud.resource_id = ", 
auditRequest.getResourceId());
         extraCriteria.addNonNullCriteria("aud.maker_id = ", 
auditRequest.getMakerId());
         extraCriteria.addNonNullCriteria("aud.checker_id = ", 
auditRequest.getCheckerId());
-        extraCriteria.addNonNullCriteria("aud.made_on_date >= ", 
auditRequest.getMakerDateTimeFrom());
-        extraCriteria.addNonNullCriteria("aud.made_on_date <= ", 
auditRequest.getMakerDateTimeTo());
-        extraCriteria.addNonNullCriteria("aud.checked_on_date >= ", 
auditRequest.getCheckerDateTimeFrom());
-        extraCriteria.addNonNullCriteria("aud.checked_on_date <= ", 
auditRequest.getCheckerDateTimeTo());
+        if (auditRequest.getMakerDateTimeFrom() != null) {
+            extraCriteria.addSubOperation((SQLBuilder criteria) -> {
+                criteria.addNonNullCriteria("aud.made_on_date >= ", 
auditRequest.getMakerDateTimeFrom(),
+                        SQLBuilder.WhereLogicalOperator.NONE);
+                criteria.addNonNullCriteria("aud.made_on_date_utc >= ", 
auditRequest.getMakerDateTimeFrom(),
+                        SQLBuilder.WhereLogicalOperator.OR);
+            });
+        }
+        if (auditRequest.getMakerDateTimeTo() != null) {
+            extraCriteria.addSubOperation((SQLBuilder criteria) -> {
+                criteria.addNonNullCriteria("aud.made_on_date <= ", 
auditRequest.getMakerDateTimeTo(),
+                        SQLBuilder.WhereLogicalOperator.NONE);
+                criteria.addNonNullCriteria("aud.made_on_date_utc <= ", 
auditRequest.getMakerDateTimeTo(),
+                        SQLBuilder.WhereLogicalOperator.OR);
+            });
+        }
+        if (auditRequest.getCheckerDateTimeFrom() != null) {
+            extraCriteria.addSubOperation((SQLBuilder criteria) -> {
+                criteria.addNonNullCriteria("aud.checked_on_date >= ", 
auditRequest.getCheckerDateTimeFrom(),
+                        SQLBuilder.WhereLogicalOperator.NONE);
+                criteria.addNonNullCriteria("aud.checked_on_date_utc >= ", 
auditRequest.getCheckerDateTimeFrom(),
+                        SQLBuilder.WhereLogicalOperator.OR);
+            });
+        }
+        if (auditRequest.getCheckerDateTimeTo() != null) {
+            extraCriteria.addSubOperation((SQLBuilder criteria) -> {
+                criteria.addNonNullCriteria("aud.checked_on_date <= ", 
auditRequest.getCheckerDateTimeTo(),

Review Comment:
   Since these fields are DateTime types, this way we can 't search for one 
day. I suggest to 
   - get the start date of the day
   - add one day to ...To dates
   - use operator < 
   - use zoned DateTime (OffsetDateTime) of UTC zone (to work with old fields)



##########
fineract-core/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java:
##########
@@ -132,35 +152,20 @@ public Object[] getArguments() {
         return args.toArray();
     }
 
-    /*
-     * Returns a String representation suitable for debugging and log output. 
This is ONLY intended for debugging in
-     * logs, and NEVER for passing to a JDBC database.
-     */
-    @Override
-    public String toString() {
-        StringBuilder whereClause = new StringBuilder("SQLBuilder{");
-        for (int i = 0; i < args.size(); i++) {
-            if (i != 0) {
-                whereClause.append("  AND  ");
-            } else {
-                whereClause.append("WHERE  ");
-            }
-            Object currentArg = args.get(i);
-            whereClause.append(crts.get(i));
-            whereClause.append(" ");
-            whereClause.append("[");
-            if (currentArg instanceof String) {
-                whereClause.append("'");
-                whereClause.append(currentArg);
-                whereClause.append("'");
-            } else if (currentArg == null) {
-                whereClause.append("null");
-            } else {
-                whereClause.append(String.valueOf(currentArg));
-            }
-            whereClause.append("]");
+    public enum WhereLogicalOperator {

Review Comment:
   Better to use the existing SqlOperator than create new type here.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to