Merge pull request #54 from thehyve/issue-313

Issue 313
thehyve · Dec 23, 2024 · 04735a7 · 04735a7
2 parents 96f02aa + e93c6f1
commit 04735a7
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 42 deletions.
diff --git a/rabbit-core/src/main/java/org/ohdsi/utilities/StringUtilities.java b/rabbit-core/src/main/java/org/ohdsi/utilities/StringUtilities.java
@@ -17,22 +17,15 @@
  ******************************************************************************/
 package org.ohdsi.utilities;
 
-import org.ohdsi.utilities.collections.CountingSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.zip.DataFormatException;
 
 public class StringUtilities {
@@ -49,7 +42,34 @@ public class StringUtilities {
 	public static long		MISSING_DATE	= -999999;
 
 	private static Calendar	calendar		= new GregorianCalendar();
-
+
+	private static List<String> dateFormats = generateDateFormats();
+
+	private static List<String> generateDateFormats(){
+		List<String> formats = new ArrayList<>();
+		String[] yearFormats = new String[]{"yy", "yyyy"};
+		String[] monthFormats = new String[]{"M", "MM"};
+		String[] dayFormats = new String[]{"d", "dd"};
+
+		String[] separatorFormats = new String[]{"/", ".", "-", " "};
+
+		for (String sep : separatorFormats){
+			for (String year : yearFormats){
+				for (String month : monthFormats){
+					for (String day : dayFormats){
+						// YMD
+						formats.add(year + sep + month + sep + day);
+						//DMY
+						formats.add(day + sep + month + sep + year);
+						//MDY
+						formats.add(month + sep + day + sep + year);
+					}
+				}
+			}
+		}
+		return formats;
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static String joinSorted(Collection<? extends Comparable> s, String delimiter) {
 		List list = new ArrayList(s);
@@ -837,39 +857,15 @@ public static String wordWrap(String text, int lineLength) {
 			return text;
 		}
 	}
-
+
+
 	public static boolean isDate(String string) {
-		if (string.length() == 10) {
-			if ((string.charAt(4) == '-' || string.charAt(4) == '/') || (string.charAt(4) == string.charAt(7)))
-				try {
-					int year = Integer.parseInt(string.substring(0, 4));
-					if (year < 1700 || year > 2200)
-						return false;
-					int month = Integer.parseInt(string.substring(5, 7));
-					if (month < 1 || month > 12)
-						return false;
-					int day = Integer.parseInt(string.substring(8, 10));
-					if (day < 1 || day > 31)
-						return false;
-					return true;
-				} catch (Exception e) {
-					return false;
-				}
-		} else if (string.length() == 8) {
-			if ((string.charAt(2) == '-' || string.charAt(5) == '/') || (string.charAt(2) == string.charAt(5)))
-				try {
-					Integer.parseInt(string.substring(6, 8));
-					int month = Integer.parseInt(string.substring(0, 2));
-					if (month < 1 || month > 12)
-						return false;
-					int day = Integer.parseInt(string.substring(3, 5));
-					if (day < 1 || day > 31)
-						return false;
-					return true;
-				} catch (Exception e) {
-					return false;
-				}
-
+		for (String dateFormat : dateFormats){
+			DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(dateFormat);
+			try {
+				dateFormatter.parse(string);
+				return true;
+			} catch (Exception ignored){}
 		}
 		return false;
 	}

diff --git a/rabbit-core/src/test/java/org/ohdsi/utilities/StringUtilitiesTest.java b/rabbit-core/src/test/java/org/ohdsi/utilities/StringUtilitiesTest.java
@@ -0,0 +1,40 @@
+package org.ohdsi.utilities;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class StringUtilitiesTest {
+
+    @Test
+    void isDate() {
+        // previously supported date formats: yyyy.mm.dd or mm.dd.yy ("." may be any separator)
+        assertTrue(StringUtilities.isDate("31.01.23"));
+        assertTrue(StringUtilities.isDate("31.12.32"));
+        assertTrue(StringUtilities.isDate("12.31.32"));
+        assertTrue(StringUtilities.isDate("2023.01.31"));
+        assertTrue(StringUtilities.isDate("2032.12.31"));
+        assertFalse(StringUtilities.isDate("2032.12.32"));
+
+        // more generally supported date formats after implementing issue #313 (copilot generated)
+        assertTrue(StringUtilities.isDate("2023-01-01"));
+        assertTrue(StringUtilities.isDate("01/01/2023"));
+        assertTrue(StringUtilities.isDate("01-01-2023"));
+        assertTrue(StringUtilities.isDate("01.01.2023"));
+        assertTrue(StringUtilities.isDate("2023/01/01"));
+        assertTrue(StringUtilities.isDate("2023.01.01"));
+        assertTrue(StringUtilities.isDate("2023 01 01"));
+        assertTrue(StringUtilities.isDate("01 01 2023"));
+        assertFalse(StringUtilities.isDate("2023-13-01"));
+        assertFalse(StringUtilities.isDate("2023-01-32"));
+        assertFalse(StringUtilities.isDate("2023/01/32"));
+        assertFalse(StringUtilities.isDate("not a date"));
+
+        assertTrue(StringUtilities.isDate("2023-12-31"));
+        assertTrue(StringUtilities.isDate("12-31-2023"));
+        assertTrue(StringUtilities.isDate("12-13-2023"));
+        assertTrue(StringUtilities.isDate("13-12-2023"));
+        assertFalse(StringUtilities.isDate("13-13-2023"));
+
+    }
+}