From f68c1cd66165a76c857df84f934f4c559f97c2d5 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Wed, 13 Apr 2022 11:30:43 +0300
Subject: [PATCH] RED-3800 - made search service work with apple silicone.
 Fixed RED-3737

---
 search-service-image-v1/pom.xml                             | 6 +++---
 search-service-v1/pom.xml                                   | 2 +-
 .../iqser/red/service/search/v1/model/MatchedDocument.java  | 3 +++
 search-service-v1/search-service-server-v1/pom.xml          | 2 +-
 .../red/service/search/v1/server/service/SearchService.java | 5 ++++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/search-service-image-v1/pom.xml b/search-service-image-v1/pom.xml
index c5b40e7..a06d541 100644
--- a/search-service-image-v1/pom.xml
+++ b/search-service-image-v1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-docker-dependency</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath />
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -42,7 +42,7 @@
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
-        
+
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -95,4 +95,4 @@
             </plugins>
         </pluginManagement>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/search-service-v1/pom.xml b/search-service-v1/pom.xml
index bbea446..1d03e9f 100644
--- a/search-service-v1/pom.xml
+++ b/search-service-v1/pom.xml
@@ -44,7 +44,7 @@
                     <groupId>org.sonarsource.scanner.maven</groupId>
                     <artifactId>sonar-maven-plugin</artifactId>
                     <version>3.9.0.2155</version>
-                    </plugin>                    
+                    </plugin>
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
diff --git a/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedDocument.java b/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedDocument.java
index 6849d7a..cebed22 100644
--- a/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedDocument.java
+++ b/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/MatchedDocument.java
@@ -27,6 +27,9 @@ public class MatchedDocument {
     private String assignee;
     private Map<String, String> fileAttributes;
     private String workflowStatus;
+    private boolean dossierDeleted;
+    private boolean dossierArchived;
+    private String fileName;
 
     @Builder.Default
     private Map<String, Set<String>> highlights = new HashMap<>();
diff --git a/search-service-v1/search-service-server-v1/pom.xml b/search-service-v1/search-service-server-v1/pom.xml
index a7ccc6f..11fc42a 100644
--- a/search-service-v1/search-service-server-v1/pom.xml
+++ b/search-service-v1/search-service-server-v1/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>1.15.3</version>
+            <version>1.16.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java
index d0022f7..65f39e5 100644
--- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java
+++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java
@@ -233,10 +233,13 @@ public class SearchService {
                 .assignee((String) hit.getSourceAsMap().get("assignee"))
                 .fileAttributes(convertFileAttributes(hit.getSourceAsMap().get("fileAttributes")))
                 .workflowStatus((String) hit.getSourceAsMap().get("workflowStatus"))
+                .fileName((String) hit.getSourceAsMap().get("fileName"))
+                .dossierDeleted((Boolean) hit.getSourceAsMap().get("dossierDeleted"))
+                .dossierArchived((Boolean) hit.getSourceAsMap().get("dossierArchived"))
                 .highlights(hit.getHighlightFields()
                         .entrySet()
                         .stream()
-                        .collect(Collectors.toMap(e -> e.getKey(), e -> Arrays.stream(e.getValue().getFragments())
+                        .collect(Collectors.toMap(Map.Entry::getKey, e -> Arrays.stream(e.getValue().getFragments())
                                 .map(Text::string)
                                 .collect(Collectors.toSet()))))
                 .matchedTerms(matchesTerms)