- Krrstub datoformat endringer for å unngå minus 2 timer dersom frontend sender 00:00

#deploy-test-dolly-backend

Author: stigus

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/krrstub/mapper/DigitalKontaktMappingStrategy.java

@@ -62,7 +62,7 @@ private String digdirFormatertTlfNummer(String mobil, String landkode) {
 
                     private ZonedDateTime getDato(RsDigitalKontaktdata digitalKontaktdata) {
                         return nonNull(digitalKontaktdata.getGyldigFra()) ?
-                                ZonedDateTime.of(digitalKontaktdata.getGyldigFra(), ZoneId.systemDefault()) :
+                                digitalKontaktdata.getGyldigFra().atStartOfDay(ZoneId.of("UTC")) :
                                 ZonedDateTime.now();
                     }
                 })

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/krrstub/RsDigitalKontaktdata.java

@@ -4,20 +4,16 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.data.elasticsearch.annotations.DateFormat;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class RsDigitalKontaktdata {
 
-    @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
-    private LocalDateTime gyldigFra;
+    private LocalDate gyldigFra;
     private boolean reservert;
     private String mobil;
     private String landkode;

apps/dolly-backend/src/test/java/no/nav/dolly/mapper/strategy/DigitalKontaktMappingStrategyTest.java

@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
@@ -27,8 +27,8 @@ class DigitalKontaktMappingStrategyTest {
     private static final String MOBIL_CORRECT = "+4799990000";
     private static final String SPRAAK = "NO";
     private static final boolean RESERVERT = true;
-    private static final LocalDateTime GYLDIG_FRA = LocalDateTime.of(2018, 1, 1, 0, 0);
-    private static final ZonedDateTime Z_GYLDIG_FRA = ZonedDateTime.of(GYLDIG_FRA, ZoneId.systemDefault());
+    private static final LocalDate GYLDIG_FRA = LocalDate.of(2018, 1, 1);
+    private static final ZonedDateTime Z_GYLDIG_FRA = ZonedDateTime.of(GYLDIG_FRA.atStartOfDay(), ZoneId.of("UTC"));
 
     private MapperFacade mapperFacade;