From d58ac6217dba091320eed866485ebe844e1404a7 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Thu, 28 Jul 2022 15:28:43 +0200
Subject: [PATCH] RED-4843: Fixed datetime conversion

---
 search-service-v1/search-service-server-v1/pom.xml   |  5 +++++
 .../red/service/search/v1/server/Application.java    | 12 ++++++++++++
 .../search/v1/server/model/IndexDocument.java        |  2 ++
 .../src/main/resources/index/mapping.json            |  2 +-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/search-service-v1/search-service-server-v1/pom.xml b/search-service-v1/search-service-server-v1/pom.xml
index 31a2ef2..cd4a865 100644
--- a/search-service-v1/search-service-server-v1/pom.xml
+++ b/search-service-v1/search-service-server-v1/pom.xml
@@ -45,6 +45,11 @@
             <artifactId>metric-commons</artifactId>
         </dependency>
         <!-- other external -->
+        <dependency>
+            <!-- this dependency is necessary to work with java8 zoned timestamps -->
+            <groupId>com.iqser.red.commons</groupId>
+            <artifactId>jackson-commons</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.opensearch.client</groupId>
diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java
index fbb2ace..ac7c1fc 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/Application.java
@@ -1,5 +1,9 @@
 package com.iqser.red.service.search.v1.server;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.iqser.red.commons.jackson.ObjectMapperFactory;
 import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 import com.iqser.red.service.search.v1.server.client.ElasticsearchClient;
 import com.iqser.red.service.search.v1.server.client.FileStatusClient;
@@ -14,6 +18,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
 
 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -43,4 +48,11 @@ public class Application {
         return new TimedAspect(registry);
     }
 
+
+    @Bean
+    @Primary
+    public ObjectMapper objectMapper(){
+        return ObjectMapperFactory.create();
+    }
+
 }
diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocument.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocument.java
index bcd56ee..bf51fe5 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocument.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/model/IndexDocument.java
@@ -7,6 +7,7 @@ import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+
 @Data
 @Builder
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
@@ -18,6 +19,7 @@ public class IndexDocument implements Serializable {
     private String dossierId;
     private String fileId;
     private String filename;
+
     private OffsetDateTime date;
     private String assignee;
     private boolean dossierDeleted;
diff --git a/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json b/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json
index 6af95df..02558d8 100644
--- a/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json
+++ b/search-service-v1/search-service-server-v1/src/main/resources/index/mapping.json
@@ -13,7 +13,7 @@
       "type": "text",
       "term_vector": "with_positions_offsets"
     },
-    "indexTime": {
+    "date": {
       "type": "date"
     },
     "assignee": {