FINERACT-2181: Fix audit filtering

2025-05-21 21:12:02 +02:00
parent 15c968bc1b
commit f8d9958ea7
5 changed files with 134 additions and 19 deletions
@@ -23,18 +23,22 @@ import static java.time.temporal.ChronoUnit.DAYS;
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
+import java.time.temporal.TemporalAccessor;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 import org.apache.fineract.infrastructure.core.data.ApiParameterError;
 import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.JsonParserHelper;

 public final class DateUtils {

@@ -466,4 +470,29 @@ public final class DateUtils {
        }
        return formatter;
    }
+
+    public static LocalDateTime convertDateTimeStringToLocalDateTime(String dateTimeStr, String dateFormat, String localeStr,
+            LocalTime fallbackTime) {
+        if (dateTimeStr == null || dateTimeStr.isBlank()) {
+            return null;
+        }
+        final Locale locale = localeStr == null ? null : JsonParserHelper.localeFromString(localeStr);
+        DateTimeFormatter formatter = getDateFormatter(dateFormat, locale);
+        TemporalAccessor parsed = formatter.parse(dateTimeStr);
+
+        boolean hasTime = parsed.isSupported(ChronoField.HOUR_OF_DAY) && parsed.isSupported(ChronoField.MINUTE_OF_HOUR);
+
+        try {
+            if (hasTime) {
+                return LocalDateTime.from(parsed);
+            } else {
+                LocalDate date = LocalDate.from(parsed);
+                return LocalDateTime.of(date, fallbackTime);
+            }
+        } catch (final DateTimeParseException e) {
+            final List<ApiParameterError> errors = List.of(ApiParameterError.parameterError("validation.msg.invalid.date.pattern",
+                    "The parameter date (" + dateTimeStr + ") format is invalid", "date", dateTimeStr));
+            throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", errors, e);
+        }
+    }
 }
@@ -22,7 +22,9 @@ import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
+import lombok.Getter;

 /**
 * Utility to assemble the WHERE clause of an SQL query without the risk of SQL injection.
@@ -57,8 +59,10 @@ public class SQLBuilder {
     *            placeholder)
     * @param argument
     *            The argument to be filtered on (e.g. "Michael" or 123). The null value is explicitly permitted.
+     * @param whereLogicalOperator
+     *            operator between the criteria
     */
-    public void addCriteria(String criteria, Object argument) {
+    public void addCriteria(String criteria, Object argument, WhereLogicalOperator whereLogicalOperator) {
        if (criteria == null || criteria.trim().isEmpty()) {
            throw new IllegalArgumentException("criteria cannot be null");
        }
@@ -92,8 +96,9 @@ public class SQLBuilder {
            throw new IllegalArgumentException("criteria must end with valid SQL operator for WHERE: " + trimmedCriteria);
        }

+        // TODO: Would be better to use SqlOperator functionality to handle
        if (sb.length() > 0) {
-            sb.append("  AND  ");
+            sb.append(whereLogicalOperator.getSqlStr());
        }
        sb.append(trimmedCriteria);
        sb.append(" ?");
@@ -101,15 +106,32 @@ public class SQLBuilder {
        args.add(argument);
    }

+    public void addCriteria(String criteria, Object argument) {
+        addCriteria(criteria, argument, WhereLogicalOperator.AND);
+    }
+
    /**
     * Delegates to {@link #addCriteria(String, Object)} if argument is not null, otherwise does nothing.
     */
-    public void addNonNullCriteria(String criteria, Object argument) {
+    public void addNonNullCriteria(String criteria, Object argument, WhereLogicalOperator whereLogicalOperator) {
        if (argument != null) {
-            addCriteria(criteria, argument);
+            addCriteria(criteria, argument, whereLogicalOperator);
        }
    }

+    public void addNonNullCriteria(String criteria, Object argument) {
+        addNonNullCriteria(criteria, argument, WhereLogicalOperator.AND);
+    }
+
+    public void addSubOperation(Consumer<SQLBuilder> subOperation) {
+        if (sb.length() > 0) {
+            sb.append(WhereLogicalOperator.AND.getSqlStr());
+        }
+        sb.append(" ( ");
+        subOperation.accept(this);
+        sb.append(" ) ");
+    }
+
    /**
     * Returns a SQL WHERE clause, created from the {@link #addCriteria(String, Object)}, with '?' placeholders.
     *
@@ -141,9 +163,9 @@ public class SQLBuilder {
        StringBuilder whereClause = new StringBuilder("SQLBuilder{");
        for (int i = 0; i < args.size(); i++) {
            if (i != 0) {
-                whereClause.append("  AND  ");
+                whereClause.append(WhereLogicalOperator.AND.getSqlStr());
            } else {
-                whereClause.append("WHERE  ");
+                whereClause.append("WHERE ");
            }
            Object currentArg = args.get(i);
            whereClause.append(crts.get(i));
@@ -163,4 +185,19 @@ public class SQLBuilder {
        whereClause.append("}");
        return whereClause.toString();
    }
+
+    @Getter
+    public enum WhereLogicalOperator {
+
+        NONE(""), //
+        AND(" AND "), //
+        OR(" OR "); //
+
+        private final String sqlStr;
+
+        WhereLogicalOperator(String sqlStr) {
+            this.sqlStr = sqlStr;
+        }
+
+    }
 }