pcvolkmer/mv64e-onkostar-data
1
0
Fork 0
mirror of https://github.com/pcvolkmer/mv64e-onkostar-data.git synced 2025-07-03 19:12:55 +00:00
Code Activity

fix: date alignment for different time zones

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2025-06-22 13:34:30 +02:00
parent 6a3ee860b7
commit bdf4bb0e23
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dev/pcvolkmer/onco/datamapper/ResultSet.java
View File

@ -2,6 +2,8 @@ package dev.pcvolkmer.onco.datamapper;
import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException; import dev.pcvolkmer.onco.datamapper.exceptions.DataAccessException;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;
@ -124,7 +126,9 @@ public class ResultSet {
return null; return null;
} }
if (raw instanceof Date) { if (raw instanceof Date) {
return (Date) raw; var localDate = LocalDate.parse(raw.toString());
// JSON Converter uses UTC timezone
return Date.from(localDate.atStartOfDay(ZoneId.of("UTC")).toInstant());
} }
throw new IllegalArgumentException("Cannot convert " + raw.getClass() + " to Date"); throw new IllegalArgumentException("Cannot convert " + raw.getClass() + " to Date");

4
src/test/java/dev/pcvolkmer/onco/datamapper/ResultSetTest.java
View File

@ -37,7 +37,7 @@ class ResultSetTest {
void shouldReturnDateValues() { void shouldReturnDateValues() {
var data = getTestData(); var data = getTestData();
assertThat(data.getDate("date")).isEqualTo(new Date(Date.from(Instant.parse("2025-06-21T12:00:00Z")).getTime())); assertThat(data.getDate("date")).isEqualTo(new Date(Date.from(Instant.parse("2025-06-21T00:00:00Z")).getTime()));
} }
static ResultSet getTestData() { static ResultSet getTestData() {
@ -45,7 +45,7 @@ class ResultSetTest {
Map.of( Map.of(
"string", "TestString", "string", "TestString",
"int", 42, "int", 42,
"date", new Date(Date.from(Instant.parse("2025-06-21T12:00:00Z")).getTime()) "date", new Date(Date.from(Instant.parse("2025-06-21T02:00:00Z")).getTime())
) )
); );
} }