don't truncate hours offset (#1203)

it-at-m · Jan 16, 2024 · 9bd7ddf · 9bd7ddf
1 parent cd03b5f
commit 9bd7ddf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.../de/muenchen/oss/digiwf/task/service/adapter/out/engine/RemoteTaskCommandRestAdapter.java b/.../de/muenchen/oss/digiwf/task/service/adapter/out/engine/RemoteTaskCommandRestAdapter.java
@@ -51,7 +51,7 @@ public void unassignUserTask(String taskId) {
   public void deferUserTask(String taskId, Instant followUpDate) {
     var task = taskService.createTaskQuery().taskId(taskId).singleResult();
     if (task != null) {
-      task.setFollowUpDate(Date.from(followUpDate.truncatedTo(ChronoUnit.DAYS)));
+      task.setFollowUpDate(Date.from(followUpDate));
       taskService.saveTask(task);
     }
   }

diff --git a/...muenchen/oss/digiwf/task/service/adapter/out/engine/RemoteTaskCommandRestAdapterTest.java b/...muenchen/oss/digiwf/task/service/adapter/out/engine/RemoteTaskCommandRestAdapterTest.java
@@ -11,6 +11,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.UUID;
 
@@ -74,13 +75,19 @@ void save() {
 
     @Test
     void deferUserTask() {
-        val instant = LocalDateTime.of(2023, 5, 24, 12, 0).toInstant(ZoneOffset.UTC);
+        val originalTZ = System.getProperty("user.timezone");
+        System.setProperty("user.timezone", "Europe/Berlin");
+        val offsetDateTimeFromFrontend = OffsetDateTime.parse("2024-01-18T00:00:00.000+01:00");
+        val instant = offsetDateTimeFromFrontend.toInstant();
+
         final TaskFake task = TaskFake.builder().build();
         QueryMocks.mockTaskQuery(taskService).singleResult(task);
 
         taskCommandPort.deferUserTask(taskId, instant);
-        assertThat(task.getFollowUpDate()).isNotNull(); // check only if there is an interaction, no Instant to DateTime transformation is tested
+        assertThat(task.getFollowUpDate()).isNotNull();
+        assertThat(task.getFollowUpDate()).isEqualTo("2024-01-18T00:00:00.000+01:00");
         verify(taskService).saveTask(task);
+        System.setProperty("user.timezone", originalTZ);
     }
     @Test
     void undeferUserTask() {