Added equalsIgnoreCase fileattributes methods for rules

Merge in RED/redaction-service from RED-1755-2 to release/2.52.x

* commit 'dd585a13fd8d37319ce695eeb39a87ff197bec15':
  RED-1755: Calculate falgs in file-management-service async

redaction-service-v1/redaction-service-api-v1/src/main/java/com/iqser/red/service/redaction/v1/model/AnalyzeResult.java

@@ -15,10 +15,6 @@ public class AnalyzeResult {
     private String fileId;
     private long duration;
     private int numberOfPages;
-    private boolean hasHints;
-    private boolean hasRequests;
-    private boolean hasRedactions;
-    private boolean hasImages;
     private boolean hasUpdates;
     private long dictionaryVersion;
     private long dossierDictionaryVersion;

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/model/Section.java

@@ -72,6 +72,19 @@ public class Section {
     }
 
 
+    public boolean fileAttributeByIdEqualsIgnoreCase(String id, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> id.equals(attribute.getId()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByPlaceholderEqualsIgnoreCase(String placeholder, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> placeholder.equals(attribute.getPlaceholder()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+    public boolean fileAttributeByLabelEqualsIgnoreCase(String label, String value){
+        return fileAttributes != null && fileAttributes.stream().filter(attribute -> label.equals(attribute.getLabel()) && value.equalsIgnoreCase(attribute.getValue())).findFirst().isPresent();
+    }
+
+
     public boolean rowEquals(String headerName, String value) {
 
         String cleanHeaderName = headerName.replaceAll("\n", "").replaceAll(" ", "").replaceAll("-", "");

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/AnalyzeResponseService.java

@@ -19,27 +19,6 @@ public class AnalyzeResponseService {
     public AnalyzeResult createAnalyzeResponse(String dossierId, String fileId, long duration, int pageCount,
                                                RedactionLog redactionLog, RedactionChangeLog redactionChangeLog) {
 
-        boolean hasHints = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isHint() && !entry.getType().equals("false_positive"));
-
-        boolean hasRequests = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.REQUESTED));
-
-        boolean hasRedactions = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isRedacted() && !entry.isManual() || entry.isManual() && entry.getStatus()
-                        .equals(com.iqser.red.service.redaction.v1.model.Status.APPROVED));
-
-        boolean hasImages = redactionLog.getRedactionLogEntry()
-                .stream()
-                .filter(entry -> !entry.isExcluded())
-                .anyMatch(entry -> entry.isHint() && entry.getType().equals("image") || entry.isImage());
 
         boolean hasUpdates = redactionChangeLog != null && redactionChangeLog.getRedactionLogEntry() != null && !redactionChangeLog
                 .getRedactionLogEntry()
@@ -52,10 +31,6 @@ public class AnalyzeResponseService {
                 .fileId(fileId)
                 .duration(duration)
                 .numberOfPages(pageCount)
-                .hasHints(hasHints)
-                .hasRedactions(hasRedactions)
-                .hasRequests(hasRequests)
-                .hasImages(hasImages)
                 .hasUpdates(hasUpdates)
                 .analysisVersion(redactionServiceSettings.getAnalysisVersion())
                 .rulesVersion(redactionLog.getRulesVersion())