validate date format yyyy-mm-dd

TransitTrack · May 19, 2024 · c88d0c8 · c88d0c8
1 parent 2c9dc03
commit c88d0c8
Showing 1 changed file with 7 additions and 3 deletions.
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,13 +217,17 @@ 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));
+            if (beginDate.charAt(4) != '-') { // for two patterns MM-dd-yyyy & yyyy-MM-dd
+                beginDate = requiredFormat.format(currentFormat.parse(beginDate));
+            } else {
+                requiredFormat.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);
     }