Bugfix/hellodata 1118 wrong timezone in announcements (#7)

* HELLODATA-1118 - fix timezone fetch to system default * fix build --------- Co-authored-by: Slawomir Wieczorek <slawomir.wieczorek@bedag.ch>
kanton-bern · Jan 19, 2024 · bd8d64c · bd8d64c
1 parent da30e4c
commit bd8d64c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.../main/java/ch/bedag/dap/hellodata/portal/base/config/LocalDateTimeToMillisSerializer.java b/.../main/java/ch/bedag/dap/hellodata/portal/base/config/LocalDateTimeToMillisSerializer.java
@@ -31,12 +31,18 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import lombok.extern.log4j.Log4j2;
 
+@Log4j2
 public class LocalDateTimeToMillisSerializer extends JsonSerializer<LocalDateTime> {
 
     @Override
     public void serialize(LocalDateTime value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-        gen.writeNumber(value.toEpochSecond(ZoneOffset.UTC) * 1000L);
+        log.debug("Serializing date {}", value);
+        ZonedDateTime zdt = ZonedDateTime.of(value, ZoneId.systemDefault());
+        gen.writeNumber(zdt.toInstant().toEpochMilli());
     }
 }
diff --git a/...al-api/src/main/java/ch/bedag/dap/hellodata/portal/superset/service/DashboardService.java b/...al-api/src/main/java/ch/bedag/dap/hellodata/portal/superset/service/DashboardService.java
@@ -44,6 +44,8 @@
 import ch.bedag.dap.hellodata.portal.superset.data.UpdateSupersetDashboardMetadataDto;
 import ch.bedag.dap.hellodata.portal.superset.entity.DashboardMetadataEntity;
 import ch.bedag.dap.hellodata.portal.superset.repository.DashboardMetadataRepository;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.collections4.CollectionUtils;
@@ -146,7 +148,8 @@ private void fetchMetadata(String instanceName, SupersetDashboard dashboard, Sup
             dashboardDto.setScheduled(dashboardMetadataEntity.getScheduled());
             dashboardDto.setDatasource(dashboardMetadataEntity.getDatasource());
             LocalDateTime lastAccessDate = dashboardMetadataEntity.getModifiedDate() != null ? dashboardMetadataEntity.getModifiedDate() : dashboardMetadataEntity.getCreatedDate();
-            long metadataModifiedBy = lastAccessDate.toInstant(ZoneOffset.UTC).toEpochMilli();
+            ZonedDateTime zdt = ZonedDateTime.of(lastAccessDate, ZoneId.systemDefault());
+            long metadataModifiedBy =zdt.toInstant().toEpochMilli();
             dashboardDto.setModified(Math.max(changedOnUtcInSuperset, metadataModifiedBy));
         }
     }

diff --git a/...l-api/src/test/java/ch/bedag/dap/hellodata/portal/email/service/EmailSendServiceTest.java b/...l-api/src/test/java/ch/bedag/dap/hellodata/portal/email/service/EmailSendServiceTest.java
@@ -83,7 +83,7 @@ public void toSimpleMailMessage_when_user_deactivated_should_generate_correct_ht
         Document actualDoc = Jsoup.parse(Objects.requireNonNull(email.getText()));
 
         //then
-        assertThat(expectedDoc.html()).isEqualTo(actualDoc.html());
+        assertThat(actualDoc.html()).isEqualTo(expectedDoc.html());
     }
 
     @Test
@@ -115,7 +115,7 @@ public void toSimpleMailMessage_when_user_activated_should_generate_correct_html
         Document actualDoc = Jsoup.parse(Objects.requireNonNull(email.getText()));
 
         //then
-        assertThat(expectedDoc.html()).isEqualTo(actualDoc.html());
+        assertThat(actualDoc.html()).isEqualTo(expectedDoc.html());
     }
 
     @Test
@@ -162,7 +162,7 @@ public void toSimpleMailMessage_when_user_role_changed_should_generate_correct_h
         Document actualDoc = Jsoup.parse(Objects.requireNonNull(email.getText()));
 
         //then
-        assertThat(expectedDoc.html()).isEqualTo(actualDoc.html());
+        assertThat(actualDoc.html()).isEqualTo(expectedDoc.html());
     }
 
     @Test
@@ -210,6 +210,6 @@ public void toSimpleMailMessage_when_user_account_created_should_generate_correc
         Document actualDoc = Jsoup.parse(Objects.requireNonNull(email.getText()));
 
         //then
-        assertThat(expectedDoc.html()).isEqualTo(actualDoc.html());
+        assertThat(actualDoc.html()).isEqualTo(expectedDoc.html());
     }
 }