Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/org/hisp/dhis/util/DateTimeUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,19 @@ public static String getUtcDateTimeString(Date dateTime) {
return String.format("%sZ", getUtcDateFormat(DATE_TIME_FORMAT).format(dateTime));
}

/**
* Escapes a date time string for use in filter operations
*
* @param dateTime the date time string to escape (e.g. {@code "2024-01-15T10:30:00"}).
* @return the escaped date time string (e.g. {@code "2024-01-15T10/:30/:00"}).
*/
public static String escapeDateTimeForFilter(String dateTime) {
if (dateTime == null) {
return "";
}
return dateTime.replace(":", "/:");
}

// -----------------------------------------------------------------------------------------------
// Validation methods
// -----------------------------------------------------------------------------------------------
Expand Down
23 changes: 23 additions & 0 deletions src/test/java/org/hisp/dhis/util/DateTimeUtilsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,29 @@ void testIsValidLocalDateTime() {
assertTrue(DateTimeUtils.isValidLocalDateTime("2018-12-02T18:12:35.798Z"));
}

@Test
void shouldEscapeDateTimeColonsForFilter() {
assertEquals(
"2024-01-15T10/:30/:00", DateTimeUtils.escapeDateTimeForFilter("2024-01-15T10:30:00"));
}

@Test
void shouldEscapeDateTimeWithSecondsForFilter() {
assertEquals(
"2024-01-15T10/:30/:45.123",
DateTimeUtils.escapeDateTimeForFilter("2024-01-15T10:30:45.123"));
}

@Test
void shouldReturnSameStringWhenNoColonsPresent() {
assertEquals("2024-01-15", DateTimeUtils.escapeDateTimeForFilter("2024-01-15"));
}

@Test
void shouldReturnEmptyStringWhenDateTimeIsNull() {
assertEquals("", DateTimeUtils.escapeDateTimeForFilter(null));
}

// -----------------------------------------------------------------------------------------------
// Support methods
// -----------------------------------------------------------------------------------------------
Expand Down
Loading