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 @@
com.iqser.red
platform-docker-dependency
- 1.1.0
+ 1.2.0
4.0.0
@@ -42,7 +42,7 @@
docker-maven-plugin
-
+
@@ -95,4 +95,4 @@
-
\ No newline at end of file
+
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 @@
org.sonarsource.scanner.maven
sonar-maven-plugin
3.9.0.2155
-
+
org.owasp
dependency-check-maven
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 fileAttributes;
private String workflowStatus;
+ private boolean dossierDeleted;
+ private boolean dossierArchived;
+ private String fileName;
@Builder.Default
private Map> 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 @@
org.testcontainers
elasticsearch
- 1.15.3
+ 1.16.3
test
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)