Merge pull request apache#5864

FINERACT-2611: Allow MakerCheckerRequest does not accept makerDateTim…

Author: adamsaghy

fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/DateUtils.java

@@ -42,6 +42,7 @@
 import org.apache.fineract.infrastructure.core.domain.FineractPlatformTenant;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.apache.fineract.infrastructure.core.serialization.JsonParserHelper;
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.lang.NonNull;
 
 public final class DateUtils {
@@ -464,6 +465,36 @@ public static LocalDateTime convertDateTimeStringToLocalDateTime(String dateTime
         }
     }
 
+    public static OffsetDateTime convertDateTimeStringToOffsetDateTime(String dateTimeStr, String dateFormat, String localeStr,
+            LocalTime fallbackTime) {
+        if (Strings.isEmpty(dateTimeStr)) {
+            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);
+        boolean hasOffset = parsed.isSupported(ChronoField.OFFSET_SECONDS);
+
+        try {
+            if (hasTime && hasOffset) {
+                return OffsetDateTime.from(parsed);
+            } else if (hasTime) {
+                LocalDateTime localDateTime = LocalDateTime.from(parsed);
+                return localDateTime.atOffset(ZoneOffset.UTC);
+            } else {
+                LocalDate date = LocalDate.from(parsed);
+                LocalDateTime localDateTime = LocalDateTime.of(date, fallbackTime);
+                return localDateTime.atOffset(ZoneOffset.UTC);
+            }
+        } 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);
+        }
+    }
+
     /**
      * Returns the earlier date. If date1 is before date2 it return date1 otherwise date2.
      *

fineract-provider/src/main/java/org/apache/fineract/commands/data/request/MakerCheckerRequest.java

@@ -21,10 +21,12 @@
 import jakarta.ws.rs.QueryParam;
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.ZonedDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.apache.fineract.infrastructure.core.service.DateUtils;
 
 @Setter
 @Getter
@@ -43,9 +45,9 @@ public class MakerCheckerRequest implements Serializable {
     @QueryParam("makerId")
     private Long makerId;
     @QueryParam("makerDateTimeFrom")
-    private ZonedDateTime makerDateTimeFrom;
+    private String makerDateTimeFrom;
     @QueryParam("makerDateTimeTo")
-    private ZonedDateTime makerDateTimeTo;
+    private String makerDateTimeTo;
     @QueryParam("clientId")
     private Long clientId;
     @QueryParam("loanid")
@@ -56,4 +58,16 @@ public class MakerCheckerRequest implements Serializable {
     private Long groupId;
     @QueryParam("savingsAccountId")
     private Long savingsAccountId;
+    @QueryParam("dateFormat")
+    private String dateFormat;
+    @QueryParam("locale")
+    private String locale;
+
+    public OffsetDateTime getMakerDateTimeFrom() {
+        return DateUtils.convertDateTimeStringToOffsetDateTime(makerDateTimeFrom, dateFormat, locale, LocalTime.MIN);
+    }
+
+    public OffsetDateTime getMakerDateTimeTo() {
+        return DateUtils.convertDateTimeStringToOffsetDateTime(makerDateTimeTo, dateFormat, locale, LocalTime.MAX);
+    }
 }