add an alternative pattern for date in reports

TransitTrack · May 17, 2024 · 5be7fee · 5be7fee
1 parent 3c1da43
commit 5be7fee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/org/transitclock/api/resources/ReportsApi.java b/app/src/main/java/org/transitclock/api/resources/ReportsApi.java
@@ -47,8 +47,8 @@ ResponseEntity<String> getTripsWithTravelTimes(
     ResponseEntity<String> getAvlReport(
             StandardParameters stdParameters,
             @Parameter(description = "Vehicle id") @RequestParam(value = "v") String vehicleId,
-            @Parameter(description = "Begin date(MM-DD-YYYY.") @RequestParam(value = "beginDate") String beginDate,
-            @Parameter(description = "Num days.", required = false) @RequestParam(value = "numDays", required = false) int numDays,
+            @Parameter(description = "Begin date(MM-DD-YYYY or YYYY-MM-DD") @RequestParam(value = "beginDate") String beginDate,
+            @Parameter(description = "Num days.") @RequestParam(value = "numDays", defaultValue = "1", required = false) int numDays,
             @Parameter(description = "Begin time(HH:MM)") @RequestParam(value = "beginTime", required = false) String beginTime,
             @Parameter(description = "End time(HH:MM)") @RequestParam(value = "endTime", required = false) String endTime);
 
@@ -104,7 +104,7 @@ ResponseEntity<String> getTrips(
     ResponseEntity<String> scheduleAdhReport(
             StandardParameters stdParameters,
             @Parameter(description = "Route id") @RequestParam(value = "r") String routeId,
-            @Parameter(description = "Begin date(MM-DD-YYYY.") @RequestParam(value = "beginDate") String beginDate,
+            @Parameter(description = "Begin date(MM-DD-YYYY or YYYY-MM-DD") @RequestParam(value = "beginDate") String beginDate,
             @Parameter(description = "Num days.") @RequestParam(value = "numDays", defaultValue = "1", required = false) int numDays,
             @Parameter(description = "Begin time(HH:MM)") @RequestParam(value = "beginTime") String beginTime,
             @Parameter(description = "End time(HH:MM)") @RequestParam(value = "endTime") String endTime,

diff --git a/app/src/main/java/org/transitclock/core/reports/SqlUtils.java b/app/src/main/java/org/transitclock/core/reports/SqlUtils.java
@@ -217,10 +217,12 @@ public static String timeRangeClause(
 
         SimpleDateFormat currentFormat = new SimpleDateFormat("MM-dd-yyyy");
         SimpleDateFormat requiredFormat = new SimpleDateFormat("yyyy-MM-dd");
+        if (beginDate.charAt(4) != '-') { // for two patterns MM-dd-yyyy & yyyy-MM-dd
         try {
             beginDate = requiredFormat.format(currentFormat.parse(beginDate));
         } catch (ParseException e) {
             logger.error("Exception happened while processing time-range clause", e);
+            }
         }
         return " AND %s BETWEEN '%s' AND TIMESTAMP '%s' + INTERVAL '%d day' %s "
                 .formatted(timeColumnName, beginDate, beginDate, numDays, timeSql);