From 2de75eaa40d26aaf55e86c494e748bb09d169752 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 26 Jul 2024 15:52:53 +0200
Subject: [PATCH] OZG-6179 set milliseconds to 0
---
.../nachrichten/antragraum/AntragraumNachrichtMapper.java | 3 ++-
.../nachrichten/antragraum/AntragraumNachrichtMapperTest.java | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
index 53e7298..3c14695 100644
--- a/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
+++ b/nachrichten-manager-server/src/main/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapper.java
@@ -25,6 +25,7 @@
package de.ozgcloud.nachrichten.antragraum;
import java.time.ZonedDateTime;
+import java.time.temporal.ChronoField;
import org.apache.commons.lang3.StringUtils;
import org.mapstruct.CollectionMappingStrategy;
@@ -75,7 +76,7 @@ interface AntragraumNachrichtMapper {
default ZonedDateTime mapZonedDateTime(String sentAt) {
if (StringUtils.isBlank(sentAt)) {
- return ZonedDateTime.now();
+ return ZonedDateTime.now().with(ChronoField.MILLI_OF_SECOND, 0);
}
return ZonedDateTime.parse(sentAt);
}
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
index 6c6b862..f09c76c 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/antragraum/AntragraumNachrichtMapperTest.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.*;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoField;
import java.time.temporal.ChronoUnit;
import org.apache.commons.lang3.StringUtils;
@@ -136,7 +137,7 @@ class AntragraumNachrichtMapperTest {
assertThat(result.getSentAt()).isCloseTo(PostfachNachrichtTestFactory.SENT_AT, within(2, ChronoUnit.SECONDS));
}
- @DisplayName("should set sentAt to now if value is missing")
+ @DisplayName("should set sentAt to now without milliseconds if value is missing")
@Test
void shouldSetSentAtIfMissing() {
var rueckfrage = GrpcRueckfrageAnswerTestFactory.createBuilder().setSentAt(StringUtils.EMPTY).build();
@@ -144,6 +145,7 @@ class AntragraumNachrichtMapperTest {
var result = mapper.fromRueckfrageAnswer(rueckfrage);
assertThat(result.getSentAt()).isCloseTo(ZonedDateTime.now(), within(2, ChronoUnit.SECONDS));
+ assertThat(result.getSentAt().get(ChronoField.MILLI_OF_SECOND)).isZero();
}
private PostfachNachricht fromRueckfrageAnswer() {
--
GitLab