Pull request #8: RED-2232: Upgraded redaction-report-service and pdftron-redaction-service

Merge in RED/persistence-service from RED-2232 to master

* commit '8bd2ab2ddc78d18609e86c927ffa2b681bf77d91':
  RED-2232: Upgraded redaction-report-service and pdftron-redaction-service

persistence-service-v1/persistence-service-api-v1/src/test/java/com/iqser/red/service/persistence/service/v1/api/model/IdentityTest.java

@@ -9,6 +9,7 @@ public class IdentityTest {
 
     @Test
     public void mockTest(){
-        assertThat(1).isEqualTo(1);
+        int i = 1;
+        assertThat(i).isEqualTo(1);
     }
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/FileStatusPersistenceService.java

@@ -145,12 +145,6 @@ public class FileStatusPersistenceService {
         });
     }
 
-
-    public void updateLastManualRedaction(String fileId) {
-
-        updateLastManualRedaction(fileId, OffsetDateTime.now());
-    }
-
     @Transactional
     public void updateLastManualRedaction(String fileId, OffsetDateTime date) {
 

persistence-service-v1/persistence-service-processor-v1/src/test/java/com/iqser/red/service/persistence/management/v1/processor/service/IdentityTest.java

@@ -8,6 +8,7 @@ public class IdentityTest {
 
     @Test
     public void mockTest(){
-        assertThat(1).isEqualTo(1);
+        int i = 1;
+        assertThat(i).isEqualTo(1);
     }
 }

persistence-service-v1/persistence-service-server-v1/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>redaction-report-service-api-v1</artifactId>
-            <version>2.17.0</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.iqser.red.service</groupId>
@@ -36,18 +36,6 @@
                     <groupId>com.iqser.red.service</groupId>
                     <artifactId>persistence-service-api-v1</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>file-management-service-api-v1</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>pdftron-redaction-service-api-v1</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>configuration-service-api-v1</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -69,16 +57,12 @@
         <dependency>
             <groupId>com.iqser.red.service</groupId>
             <artifactId>pdftron-redaction-service-api-v1</artifactId>
-            <version>2.12.0</version>
+            <version>3.0.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.iqser.red.service</groupId>
                     <artifactId>redaction-service-api-v1</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.iqser.red.service</groupId>
-                    <artifactId>configuration-service-api-v1</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java

@@ -279,7 +279,7 @@ public class DictionaryController implements DictionaryResource {
 
         List<Type> typeResponse = dictionaryPersistenceService.getCumulatedTypes(dossierTemplateId, dossierId);
         for (Type res : typeResponse) {
-            if (typeId != res.getId() && labelToCheck.equals(res.getLabel())) {
+            if (!typeId.equals(res.getId()) && labelToCheck.equals(res.getLabel())) {
                 throw new ConflictException("Label must be unique.");
             }
         }

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesController.java

@@ -68,7 +68,6 @@ public class DossierAttributesController implements DossierAttributesResource {
     }
 
     @Override
-    @Transactional
     public List<DossierAttribute> getDossierAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId) {
         return dossierAttributePersistenceService.getDossierAttributes(dossierId);
     }

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java

@@ -263,7 +263,7 @@ public class FileStatusService {
         fileStatusPersistenceService.updateLastOCRTime(fileId, OffsetDateTime.now());
     }
 
-
+    @Transactional
     public void overwriteFile(String dossierId, String fileId, String uploader, String filename, int length) {
 
         fileStatusPersistenceService.overwriteFile(fileId, uploader, filename);

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionService.java

@@ -4,6 +4,7 @@ import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
 import com.iqser.red.service.peristence.v1.server.controller.DictionaryController;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.*;
 import com.iqser.red.service.persistence.service.v1.api.model.*;
 import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.*;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Service;
 import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
 import java.util.List;
-
+import java.util.Optional;
 
 @Slf4j
 @Service
@@ -253,7 +254,7 @@ public class ManualRedactionService {
             boolean hasSuggestions = calculateHasSuggestions(fileId);
             fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
         } else {
-            fileStatusPersistenceService.updateLastManualRedaction(fileId);
+            fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
         }
     }
 
@@ -272,7 +273,7 @@ public class ManualRedactionService {
             boolean hasSuggestions = calculateHasSuggestions(fileId);
             fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
         } else {
-            fileStatusPersistenceService.updateLastManualRedaction(fileId);
+            fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
         }
     }
 
@@ -287,7 +288,7 @@ public class ManualRedactionService {
             boolean hasSuggestions = calculateHasSuggestions(fileId);
             fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
         } else {
-            fileStatusPersistenceService.updateLastManualRedaction(fileId);
+            fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
         }
     }
 
@@ -301,7 +302,7 @@ public class ManualRedactionService {
             boolean hasSuggestions = calculateHasSuggestions(fileId);
             fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
         } else {
-            fileStatusPersistenceService.updateLastManualRedaction(fileId);
+            fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
         }
     }
 
@@ -316,7 +317,7 @@ public class ManualRedactionService {
             boolean hasSuggestions = calculateHasSuggestions(fileId);
             fileStatusPersistenceService.setUpdateLastManualRedactionAndHasSuggestions(fileId, OffsetDateTime.now(), hasSuggestions);
         } else {
-            fileStatusPersistenceService.updateLastManualRedaction(fileId);
+            fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
             fileStatusService.setStatusReprocess(dossierId, fileId, 100);
         }
     }
@@ -324,7 +325,7 @@ public class ManualRedactionService {
 
     public void deleteComment(String fileId, long commentId) {
 
-        fileStatusPersistenceService.updateLastManualRedaction(fileId);
+        fileStatusPersistenceService.updateLastManualRedaction(fileId, OffsetDateTime.now());
         commentPersistenceService.softDelete(commentId, OffsetDateTime.now());
 
         // update indicator
@@ -341,11 +342,17 @@ public class ManualRedactionService {
         if (idRemoval.isRemoveFromDictionary()) {
 
             RedactionLog redactionLog = fileManagementStorageService.getRedactionLog(dossierId, fileId);
-            RedactionLogEntry redactionLogEntry = redactionLog.getRedactionLogEntry()
+            Optional<RedactionLogEntry> redactionLogEntryOptional = redactionLog.getRedactionLogEntry()
                     .stream()
                     .filter(entry -> entry.getId().equals(idRemoval.getId().getId()))
-                    .findFirst()
+                    .findFirst();
-                    .get();
+
+            if(!redactionLogEntryOptional.isPresent()) {
+                throw new NotFoundException("Annotation does not exist in redaction log.");
+            }
+
+            var redactionLogEntry = redactionLogEntryOptional.get();
+
 
             if (annotationStatus == AnnotationStatus.APPROVED) {
                 removeFromDictionary(redactionLogEntry.getTypeId(), redactionLogEntry.getValue(), dossierId, fileId);
@@ -460,11 +467,17 @@ public class ManualRedactionService {
 
             if (removeFromDictionary) {
                 RedactionLog redactionLog = fileManagementStorageService.getRedactionLog(dossierId, fileId);
-                RedactionLogEntry redactionLogEntry = redactionLog.getRedactionLogEntry()
+                Optional<RedactionLogEntry> redactionLogEntryOptional = redactionLog.getRedactionLogEntry()
                         .stream()
                         .filter(entry -> entry.getId().equals(annotationId))
-                        .findFirst()
+                        .findFirst();
-                        .get();
+
+                if(!redactionLogEntryOptional.isPresent()) {
+                    throw new NotFoundException("Annotation does not exist in redaction log.");
+                }
+
+                var redactionLogEntry = redactionLogEntryOptional.get();
+
                 if (revert) {
                     addToDictionary(redactionLogEntry.getTypeId(), redactionLogEntry.getValue(), dossierId, fileId);
                 } else {