adamsaghy commented on code in PR #4673:
URL: https://github.com/apache/fineract/pull/4673#discussion_r2096029248


##########
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:
   Logic already in place to handle this and you are able to search one day as 
well.



-- 
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