Fix getConnectionDataHistory DST gap hour bug (#11647)

airbytehq · Mar 13, 2024 · 6cf30cb · 6cf30cb
1 parent a77e127
commit 6cf30cb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...e-commons-server/src/main/java/io/airbyte/commons/server/handlers/ConnectionsHandler.java b/...e-commons-server/src/main/java/io/airbyte/commons/server/handlers/ConnectionsHandler.java
@@ -105,6 +105,7 @@
 import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -923,7 +924,7 @@ public List<ConnectionDataHistoryReadItem> getConnectionDataHistory(final Connec
     final ZoneId requestZone = ZoneId.of(connectionDataHistoryRequestBody.getTimezone());
 
     // Start time in designated timezone
-    final ZonedDateTime endTimeInUserTimeZone = Instant.now().atZone(ZoneId.of(connectionDataHistoryRequestBody.getTimezone()));
+    final ZonedDateTime endTimeInUserTimeZone = Instant.now().atZone(requestZone).toLocalDate().atTime(LocalTime.MAX).atZone(requestZone);
     final ZonedDateTime startTimeInUserTimeZone = endTimeInUserTimeZone.toLocalDate().atStartOfDay(requestZone).minusDays(29);
     // Convert start time to UTC (since that's what the database uses)
     final Instant startTimeInUTC = startTimeInUserTimeZone.toInstant();