persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierController.java

@@ -381,7 +381,6 @@ public class DossierController implements DossierResource {
             throw new AccessDeniedException("Can not delete dossier that is owned by a different user");
         }
 
-
         dossierManagementService.softDeleteDossier(dossierId);
 
         auditPersistenceService.audit(AuditRequest.builder()
@@ -450,7 +449,7 @@ public class DossierController implements DossierResource {
     @PostFilter("hasPermission(filterObject.id, 'Dossier', 'VIEW_OBJECT')")
     public List<Dossier> getSoftDeletedDossiers() {
 
-        var dossiers =  dossierManagementService.getSoftDeletedDossiers()
+        var dossiers = dossierManagementService.getSoftDeletedDossiers()
                 .stream()
                 .map(dossierACLService::enhanceDossierWithACLData)
                 .collect(Collectors.toList());
@@ -463,7 +462,7 @@ public class DossierController implements DossierResource {
     @PostFilter("hasPermission(filterObject.id, 'Dossier', 'VIEW_OBJECT')")
     public List<Dossier> getArchivedDossiers() {
 
-        var dossiers =  dossierManagementService.getArchivedDossiers()
+        var dossiers = dossierManagementService.getArchivedDossiers()
                 .stream()
                 .map(dossierACLService::enhanceDossierWithACLData)
                 .collect(Collectors.toList());

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java

@@ -24,13 +24,15 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ExportDownloadRequest;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.service.DossierTemplateExportService;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.service.DossierTemplateImportService;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateStatsService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.users.UserService;
 import com.iqser.red.service.persistence.service.v1.api.external.resource.DossierTemplateResource;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AuditCategory;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel;
@@ -42,7 +44,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplateStats;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplateStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ExportDownloadRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.importexport.ImportDossierTemplateRequest;
 import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
 
@@ -61,7 +62,8 @@ public class DossierTemplateController implements DossierTemplateResource {
     private final AuditPersistenceService auditPersistenceService;
     private final DossierManagementService dossierManagementService;
     private final DossierACLService dossierACLService;
-    private final UserService userService;
+    private final DossierTemplateImportService dossierTemplateImportService;
+    private final DossierTemplateExportService dossierTemplateExportService;
 
 
     @Override
@@ -125,7 +127,7 @@ public class DossierTemplateController implements DossierTemplateResource {
             throw new ConflictException("Can not delete dossier template because there are dossiers based on it");
         }
 
-        dossierTemplateManagementService.deleteDossierTemplate(dossierTemplateId, userId);
+        dossierTemplateManagementService.softDeleteDossierTemplate(dossierTemplateId, userId);
         auditPersistenceService.audit(AuditRequest.builder()
                                               .userId(KeycloakSecurity.getUserId())
                                               .objectId(dossierTemplateId)
@@ -150,7 +152,7 @@ public class DossierTemplateController implements DossierTemplateResource {
                     throw new ConflictException("Can not delete dossier template because there are dossiers based on it");
                 }
 
-                dossierTemplateManagementService.deleteDossierTemplate(dossierTemplateId, userId);
+                dossierTemplateManagementService.softDeleteDossierTemplate(dossierTemplateId, userId);
                 auditPersistenceService.audit(AuditRequest.builder()
                                                       .userId(KeycloakSecurity.getUserId())
                                                       .objectId(dossierTemplateId)
@@ -224,15 +226,16 @@ public class DossierTemplateController implements DossierTemplateResource {
 
         try {
             ExportDownloadRequest request = ExportDownloadRequest.builder().dossierTemplateId(dossierTemplateId).userId(KeycloakSecurity.getUserId()).build();
-            var response = dossierTemplateManagementService.prepareExportDownload(request);
+            dossierTemplateManagementService.validateDossierTemplateForDuplicateRanks(request.getDossierTemplateId());
+            String storageId = dossierTemplateExportService.prepareExportDownload(request);
             auditPersistenceService.audit(AuditRequest.builder()
                                                   .userId(KeycloakSecurity.getUserId())
-                                                  .objectId(response.getValue())
+                                                  .objectId(storageId)
                                                   .category(AuditCategory.DOWNLOAD.name())
                                                   .message("Export Download was prepared")
                                                   .details(Map.of("dossierTemplateId", request.getDossierTemplateId()))
                                                   .build());
-            return new DownloadResponse(response.getValue());
+            return new DownloadResponse(storageId);
         } catch (FeignException e) {
             throw processFeignException(e);
         }
@@ -265,15 +268,15 @@ public class DossierTemplateController implements DossierTemplateResource {
                         .userId(KeycloakSecurity.getUserId())
                         .archive(file.getBytes())
                         .build();
-                DossierTemplate loadedDossierTemplate = dossierTemplateManagementService.importDossierTemplate(request);
+                String importedDossierTemplateId = dossierTemplateImportService.importDossierTemplate(request);
                 auditPersistenceService.audit(AuditRequest.builder()
                                                       .userId(KeycloakSecurity.getUserId())
-                                                      .objectId(loadedDossierTemplate.getId())
+                                                      .objectId(importedDossierTemplateId)
                                                       .category(AuditCategory.DOSSIER_TEMPLATE.name())
                                                       .message("Dossier template was imported")
-                                                      .details(Map.of("dossierTemplateId", loadedDossierTemplate.getId()))
+                                                      .details(Map.of("dossierTemplateId", importedDossierTemplateId))
                                                       .build());
-                return convert(loadedDossierTemplate);
+                return convert(dossierTemplateManagementService.getDossierTemplate(importedDossierTemplateId));
             } catch (IOException e) {
                 throw new BadRequestException(e.getMessage(), e);
             } catch (FeignException e) {

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ManualRedactionController.java

@@ -277,11 +277,7 @@ public class ManualRedactionController implements ManualRedactionResource {
         accessControlService.verifyFileIsNotApproved(dossierId, fileId);
         accessControlService.verifyUserIsMemberOrApprover(dossierId);
 
-        List<ManualAddResponse> responseList = manualRedactionService.addRecategorization(dossierId,
-                                                                                          fileId,
-                                                                                          dossier,
-                                                                                          recategorizationRequests,
-                                                                                          includeUnprocessed);
+        List<ManualAddResponse> responseList = manualRedactionService.addRecategorization(dossierId, fileId, dossier, recategorizationRequests, includeUnprocessed);
 
         responseList.forEach(response -> auditPersistenceService.audit(AuditRequest.builder()
                                                                                .userId(KeycloakSecurity.getUserId())

persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java

@@ -76,7 +76,6 @@ public class ReportTemplateController implements ReportTemplateResource {
     private final FileManagementStorageService fileManagementStorageService;
 
 
-
     @Override
     @PreAuthorize("hasAuthority('" + GET_REPORT_TEMPLATES + "')")
     public List<ReportTemplate> getReportTemplatesByPlaceholder(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody JSONPrimitive<String> placeholder) {

persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/DownloadControllerV2.java

@@ -27,34 +27,37 @@ public class DownloadControllerV2 implements DownloadResource {
     private final DownloadController downloadController;
     private final DownloadStatusPersistenceService downloadStatusPersistenceService;
 
+
     @Transactional
     public DownloadStatusList getDownloadStatusList() {
 
         var downloads = downloadStatusPersistenceService.getStatusesByUser(KeycloakSecurity.getUserId());
 
-        return new DownloadStatusList(downloads.stream().map(
-                status ->
-                        DownloadStatus.builder()
-                                .id(status.getUuid()) // This is a workaround the real id is the storageId.
-                                .userId(status.getUserId())
-                                .filename(status.getFilename())
-                                .mimeType(status.getMimeType())
-                                .errorCause(status.getErrorCause())
-                                .status(status.getStatus())
-                                .creationDate(status.getCreationDate())
-                                .lastDownload(status.getLastDownload())
-                                .fileSize(status.getFileSize())
-                                .dossierId(status.getDossier() != null ? status.getDossier().getId() : null)
-                                .fileIds(status.getFiles()
-                                                 .stream()
-                                                 .map(FileEntity::getId)
-                                                 .toList())
-                                .downloadFileTypes(status.getDownloadFileTypes()
-                                                           .stream()
-                                                           .toList())
-                                .reportTemplateIds(status.getReports().stream().map(ReportTemplateEntity::getTemplateId).toList())
-                                .build()).toList()
-        );
+        return new DownloadStatusList(downloads.stream()
+                                              .map(status -> DownloadStatus.builder()
+                                                      .id(status.getUuid()) // This is a workaround the real id is the storageId.
+                                                      .userId(status.getUserId())
+                                                      .filename(status.getFilename())
+                                                      .mimeType(status.getMimeType())
+                                                      .errorCause(status.getErrorCause())
+                                                      .status(status.getStatus())
+                                                      .creationDate(status.getCreationDate())
+                                                      .lastDownload(status.getLastDownload())
+                                                      .fileSize(status.getFileSize())
+                                                      .dossierId(status.getDossier() != null ? status.getDossier().getId() : null)
+                                                      .fileIds(status.getFiles()
+                                                                       .stream()
+                                                                       .map(FileEntity::getId)
+                                                                       .toList())
+                                                      .downloadFileTypes(status.getDownloadFileTypes()
+                                                                                 .stream()
+                                                                                 .toList())
+                                                      .reportTemplateIds(status.getReports()
+                                                                                 .stream()
+                                                                                 .map(ReportTemplateEntity::getTemplateId)
+                                                                                 .toList())
+                                                      .build())
+                                              .toList());
     }
 
 
@@ -81,7 +84,10 @@ public class DownloadControllerV2 implements DownloadResource {
                 .downloadFileTypes(status.getDownloadFileTypes()
                                            .stream()
                                            .toList())
-                .reportTemplateIds(status.getReports().stream().map(ReportTemplateEntity::getTemplateId).toList())
+                .reportTemplateIds(status.getReports()
+                                           .stream()
+                                           .map(ReportTemplateEntity::getTemplateId)
+                                           .toList())
                 .build();
     }
 

persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/mapper/ComponentMapper.java

@@ -34,11 +34,13 @@ public interface ComponentMapper {
 
     List<ComponentLogEntryValue> toComponentLogEntries(List<ComponentValue> values);
 
+
     Component toComponent(ComponentLogEntry entry);
 
 
     List<Component> toComponents(List<ComponentLogEntry> entries);
 
+
     ComponentLogEntry toComponentLogEntry(Component component);
 
 

persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/ComponentLogResource.java

@@ -49,9 +49,7 @@ public interface ComponentLogResource {
     @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Adds overrides for components", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")})
-    void addOverride(@PathVariable(DOSSIER_ID) String dossierId,
-                     @PathVariable(FILE_ID) String fileId,
-                     @RequestBody ComponentsOverrides componentsOverrides);
+    void addOverride(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody ComponentsOverrides componentsOverrides);
 
 
     @ResponseBody
@@ -59,8 +57,7 @@ public interface ComponentLogResource {
     @GetMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Gets overrides for components", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found")})
-    ComponentsOverrides getOverrides(@PathVariable(DOSSIER_ID) String dossierId,
-                                     @PathVariable(FILE_ID) String fileId);
+    ComponentsOverrides getOverrides(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId);
 
 
     @ResponseBody
@@ -68,8 +65,6 @@ public interface ComponentLogResource {
     @PostMapping(value = COMPONENT_LOG_PATH + OVERRIDE_PATH + "/revert" + DOSSIER_ID_PATH_VARIABLE + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Reverts overrides for components", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "OK"), @ApiResponse(responseCode = "404", description = "Not found"), @ApiResponse(responseCode = "403", description = "Forbidden")})
-    void revertOverrides(@PathVariable(DOSSIER_ID) String dossierId,
-                         @PathVariable(FILE_ID) String fileId,
-                         @RequestBody RevertOverrideRequest revertOverrideRequest);
+    void revertOverrides(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody RevertOverrideRequest revertOverrideRequest);
 
 }

persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/SupportResource.java

@@ -56,15 +56,15 @@ public interface SupportResource {
     @PostMapping(value = REANALYSIS_REST_PATH + DOSSIER_TEMPLATE_DOSSIER_TEMPLATE_ID_PATH_VARIABLE)
     @Operation(summary = "Reanalyze all files in dossier template", description = """
             ## Reanalyze Files Endpoint
-            
+                        
             Use this endpoint to reanalyze all files in a specified Dossier Template. The reanalysis process can be tailored using various filtering options provided in the request body.
-            
+                        
             ### Parameters
-            
+                        
             - **DossierTemplateId**: Specifies the Dossier Template whose files need to be reanalyzed.
-            
+                        
             ### Request Body Configuration Options
-            
+                        
             - **dossierIds**: List of dossier IDs to filter. If empty, all dossiers are selected for reanalysis.
             - **fileIds**: List of file IDs to filter. If empty, all files are selected for reanalysis.
             - **repeatStructureAnalysis**: Boolean. If true, layout parsing and named entity recognition will be repeated.
@@ -120,16 +120,16 @@ public interface SupportResource {
                          + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Exports all dossiers and files from a given Dossier Template.", description = """
             ## Export Files Endpoint
-            
+                        
             Use this endpoint to export a full Dossier Template, including all configurations, dossiers, and files.
             The endpoint returns a String storageId, which is used to query the DownloadController for the export zip archive's status and to download the archive.
-            
+                        
             ### Parameters
-            
+                        
             - **DossierTemplateId**: Specifies the Dossier Template to be exported.
-            
+                        
             ### Request Body Configuration Options
-            
+                        
             - **dossierIds**: List of dossier IDs to filter. If empty, all dossiers are selected.
             - **fileIds**: List of file IDs to filter. If empty, all files are selected.
             - **excludeLayoutFiles**: Boolean. If true, excludes DOCUMENT_STRUCTURE/_PAGES/_TEXT/_POSITIONS, SIMPLIFIED_TEXT, and NER_ENTITIES files.

persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/BulkDownloadRequest.java

@@ -22,4 +22,5 @@ public class BulkDownloadRequest {
     private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
     private String redactionPreviewColor;
     private List<String> fileIds = new ArrayList<>();
+
 }

persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/ComponentOverrideList.java

@@ -19,4 +19,5 @@ public class ComponentOverrideList {
     String fileId;
 
     List<Component> componentOverrides = new ArrayList<>();
+
 }

persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/DossierAttributeDefinitionList.java

@@ -14,5 +14,6 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class DossierAttributeDefinitionList {
 
-    private List<DossierAttributeDefinition> dossierAttributeDefinitions= new ArrayList<>();
+    private List<DossierAttributeDefinition> dossierAttributeDefinitions = new ArrayList<>();
+
 }

persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/model/DossierStatusDefinitionList.java

@@ -15,4 +15,5 @@ import lombok.NoArgsConstructor;
 public class DossierStatusDefinitionList {
 
     private List<DossierStatusDefinition> dossierStatusDefinitions = new ArrayList<>();
+
 }

persistence-service-v1/persistence-service-external-api-v2/src/main/java/com/iqser/red/service/persistence/service/v2/api/external/resource/DossierResource.java

@@ -89,8 +89,8 @@ public interface DossierResource {
     @Operation(summary = "Update or set attributes for a specific dossier.", description = "None")
     @ApiResponses(value = {@ApiResponse(responseCode = "204", description = "Dossier attributes successfully updated."), @ApiResponse(responseCode = "404", description = "Not found")})
     void setDossierAttributes(@Parameter(name = DOSSIER_TEMPLATE_ID_PARAM, description = "The identifier of a dossier template", required = true) @PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId,
-                                                 @Parameter(name = DOSSIER_ID_PARAM, description = "The identifier of a dossier", required = true) @PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                                 @RequestBody DossierAttributes dossierAttributes);
+                              @Parameter(name = DOSSIER_ID_PARAM, description = "The identifier of a dossier", required = true) @PathVariable(DOSSIER_ID_PARAM) String dossierId,
+                              @RequestBody DossierAttributes dossierAttributes);
 
 
     @ResponseBody

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/acl/custom/dossier/ViewObjectDossierObjectPermissionService.java

@@ -1,6 +1,5 @@
 package com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Set;
 import java.util.stream.Collectors;

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

@@ -73,7 +73,6 @@ public class MessagingConfiguration {
     public static final String X_ERROR_INFO_HEADER = "x-error-message";
     public static final String X_ERROR_INFO_TIMESTAMP_HEADER = "x-error-message-timestamp";
 
-
     public static final String LAYOUT_PARSING_DLQ = "layout_parsing_dead_letter_queue";
 
     // --- Saas Migration, can be removed later ----
@@ -251,19 +250,18 @@ public class MessagingConfiguration {
                 .build();
     }
 
+
     @Bean
     public Queue ocrResponseQueue() {
 
-        return QueueBuilder.durable(OCR_RESPONSE_QUEUE)
-                .build();
+        return QueueBuilder.durable(OCR_RESPONSE_QUEUE).build();
     }
 
 
     @Bean
     public Queue ocrDLQ() {
 
-        return QueueBuilder.durable(OCR_DLQ)
-                .build();
+        return QueueBuilder.durable(OCR_DLQ).build();
     }
 
 

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

@@ -21,18 +21,24 @@ public class RedisPubsubConfiguration {
     private final ObjectMapper mapper;
     private final RedisConnectionFactory connectionFactory;
 
+
     @Bean
     public RedisPubsubReceiver redisPubsubReceiver() {
+
         return new RedisPubsubReceiver(template, mapper);
     }
 
+
     @Bean
     public MessageListenerAdapter redisPubsubListenerAdapter() {
+
         return new MessageListenerAdapter(redisPubsubReceiver(), "receiveMessage");
     }
 
+
     @Bean
     public RedisMessageListenerContainer redisPubsubContainer() {
+
         RedisMessageListenerContainer container = new RedisMessageListenerContainer();
         container.setConnectionFactory(connectionFactory);
         container.addMessageListener(redisPubsubListenerAdapter(), new PatternTopic("persistence-service-websocket-messages"));

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

@@ -73,6 +73,7 @@ public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBro
 
     }
 
+
     private Optional<String> extractTenantId(Message<?> message) {
 
         StompHeaderAccessor sha = StompHeaderAccessor.wrap(message);

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

@@ -11,6 +11,7 @@ import com.iqser.red.service.persistence.management.v1.processor.dataexchange.mo
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierCreatorService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
 

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

@@ -17,6 +17,10 @@ import org.springframework.util.FileSystemUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportDownloadMessage;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportFilename;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ExportDownloadRequest;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.RulesExportModel;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ColorsEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisEntity;
@@ -30,10 +34,6 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ReportTemplateEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.download.DownloadStatusEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportDownloadMessage;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ExportDownloadRequest;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportFilename;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.RulesExportModel;
 import com.iqser.red.service.persistence.management.v1.processor.model.ComponentMapping;
 import com.iqser.red.service.persistence.management.v1.processor.service.ColorsService;
 import com.iqser.red.service.persistence.management.v1.processor.service.ComponentMappingService;
@@ -100,18 +100,17 @@ public class DossierTemplateExportService {
     RabbitTemplate rabbitTemplate;
 
 
-    public JSONPrimitive<String> prepareExportDownload(ExportDownloadRequest request) {
+    public String prepareExportDownload(ExportDownloadRequest request) {
 
         var mimeType = "application/zip";
 
-        dossierTemplatePersistenceService.validateDossierTemplateForDuplicateRanks(request.getDossierTemplateId());
         String downloadFilename = request.getDossierTemplateId() + ".zip";
         String storageId = StorageIdUtils.getStorageId(request.getUserId(), request.getDossierTemplateId());
 
         downloadStatusPersistenceService.createStatus(request.getUserId(), storageId, downloadFilename, mimeType);
         addToExportDownloadQueue(ExportDownloadMessage.builder().dossierTemplateId(request.getDossierTemplateId()).storageId(storageId).userId(request.getUserId()).build(), 1);
 
-        return new JSONPrimitive<>(storageId);
+        return storageId;
     }
 
 
@@ -123,6 +122,7 @@ public class DossierTemplateExportService {
         });
     }
 
+
     @Observed(name = "DossierTemplateExportService", contextualName = "export-dossier-template")
     public long createDownloadArchive(ExportDownloadMessage downloadJob) throws IOException {
 
@@ -142,6 +142,7 @@ public class DossierTemplateExportService {
 
     }
 
+
     @Observed(name = "DossierTemplateExportService", contextualName = "write-dossier-template-to-archive")
     public void addDossierTemplateToArchive(FileSystemBackedArchiver fileSystemBackedArchiver, String folder, DossierTemplateEntity dossierTemplate) throws IOException {
 

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

@@ -21,6 +21,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ComponentMappingImportModel;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ImportTemplateResult;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.TemplateImportInfo;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.zipreaders.DossierTemplateArchiveReader;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.zipreaders.ZipEntryIterator;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.ColorsEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity;
@@ -29,15 +34,12 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierStatusEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ReportTemplateEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ComponentMappingImportModel;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ImportTemplateResult;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.TemplateImportInfo;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.zipreaders.DossierTemplateArchiveReader;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.zipreaders.ZipEntryIterator;
 import com.iqser.red.service.persistence.management.v1.processor.service.ColorsService;
 import com.iqser.red.service.persistence.management.v1.processor.service.ComponentMappingService;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.ReportTemplateService;
 import com.iqser.red.service.persistence.management.v1.processor.service.RulesValidationService;
 import com.iqser.red.service.persistence.management.v1.processor.service.WatermarkService;
@@ -56,11 +58,14 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.WatermarkMo
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentDefinition;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentDefinitionAddRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentMappingMetadata;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplate;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplateStatus;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.ReportTemplateUploadRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.CreateOrUpdateDossierStatusRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierStatusInfo;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeConfig;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.importexport.ImportDossierTemplateRequest;
 import com.iqser.red.service.redaction.v1.model.DroolsValidation;
 import com.iqser.red.storage.commons.service.StorageService;
@@ -84,6 +89,7 @@ public class DossierTemplateImportService {
     LegalBasisMappingPersistenceService legalBasisMappingPersistenceService;
     RulesPersistenceService rulesPersistenceService;
     DossierTemplatePersistenceService dossierTemplatePersistenceService;
+    DossierTemplateManagementService dossierTemplateManagementService;
     DossierAttributeConfigPersistenceService dossierAttributeConfigPersistenceService;
     FileAttributeConfigPersistenceService fileAttributeConfigPersistenceService;
     ColorsService colorsService;
@@ -103,7 +109,9 @@ public class DossierTemplateImportService {
 
         ImportTemplateResult archiveResult = readDossierTemplateImportArchive(request);
 
-        return importDossierTemplate(archiveResult).getDossierTemplateId();
+        TemplateImportInfo templateImportInfo = importDossierTemplate(archiveResult);
+
+        return templateImportInfo.getDossierTemplateId();
     }
 
 
@@ -121,11 +129,13 @@ public class DossierTemplateImportService {
         return dossierTemplateArchiveReader.buildResult();
     }
 
+
     @Observed(name = "DossierTemplateImportService", contextualName = "import-template")
     public TemplateImportInfo importDossierTemplate(ImportTemplateResult request) {
 
         long start = System.currentTimeMillis();
-        String dossierTemplateId;
+        String dossierTemplateId = null;
+
         var dossierTemplateMeta = request.getDossierTemplate();
 
         TemplateImportInfo templateImportInfo = TemplateImportInfo.builder().build();
@@ -137,221 +147,277 @@ public class DossierTemplateImportService {
         }
 
         if (existingDossierTemplate != null) {
-            dossierTemplateId = existingDossierTemplate.getId();
+            dossierTemplateId = updateExistingDossierTemplate(request, existingDossierTemplate, dossierTemplateMeta, templateImportInfo);
+            templateImportInfo.setDossierTemplateId(dossierTemplateId);
 
-            // override the existing dossier template
-            updateDossierTemplateMeta(existingDossierTemplate, dossierTemplateMeta, request.getUserId());
-            dossierTemplateRepository.save(existingDossierTemplate);
+            long elapsedTime = System.currentTimeMillis() - start;
+            log.info("Finished update of existing dossier template in {} ms for: {}", elapsedTime, dossierTemplateId);
+            return templateImportInfo;
+        }
 
-            existingDossierTemplate.setDossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplatePersistenceService.computeDossierTemplateStatus(existingDossierTemplate)
-                                                                                                   .name()));
+        try {
+            importNewDossierTemplate(request, dossierTemplateMeta, templateImportInfo);
+            long elapsedTime = System.currentTimeMillis() - start;
+            log.info("Finished import dossier template in {} ms for: {}", elapsedTime, templateImportInfo.getDossierTemplateId());
 
-            // set colors
-            this.setColors(dossierTemplateId, request.getColors());
-
-            // set watermarks
-            if (CollectionUtils.isNotEmpty(request.getWatermarks())) {
-                Set<String> toSetWatermarks = request.getWatermarks()
-                        .stream()
-                        .map(WatermarkModel::getName)
-                        .filter(Objects::nonNull)
-                        .collect(Collectors.toSet());
-                var currentWatermarkConfigs = watermarkService.getWatermarksForDossierTemplateId(dossierTemplateId);
-                Set<WatermarkEntity> configsToRemove = currentWatermarkConfigs.stream()
-                        .filter(c -> !toSetWatermarks.contains(c.getName()))
-                        .collect(Collectors.toSet());
-                var watermarkNameToEntity = currentWatermarkConfigs.stream()
-                        .collect(Collectors.toMap(WatermarkEntity::getName, Function.identity()));
-
-                request.getWatermarks()
-                        .forEach(watermark -> {
-                            log.info("watermark to add: " + watermark.getName());
-                            Long initialId = watermark.getId();
-                            if (!watermarkNameToEntity.isEmpty() && watermarkNameToEntity.get(watermark.getName()) != null) {
-
-                                watermark.setId(watermarkNameToEntity.get(watermark.getName()).getId());
-                            } else {
-                                watermark.setId(null);
-                            }
-                            watermark.setDossierTemplateId(dossierTemplateId);
-                            var entity = watermarkService.createOrUpdateWatermark(watermark);
-                            templateImportInfo.getLongMapping().put(initialId, entity.getId());
-                        });
-                configsToRemove.forEach(watermark -> watermarkService.deleteWatermark(watermark.getId()));
+        } catch (Exception e) {
+            log.error("Error with message: {} occurred during import, undo import", e.getMessage(), e);
+            if (templateImportInfo != null && templateImportInfo.getDossierTemplateId() != null) {
+                dossierTemplateManagementService.deleteDossierTemplateCompletely(templateImportInfo.getDossierTemplateId());
             }
+            throw e;
+        }
+        return templateImportInfo;
+    }
 
-            // dossier status
-            if (CollectionUtils.isNotEmpty(request.getDossierStatusInfos())) {
-                this.updateDossierStates(request, dossierTemplateId);
-            } else { // no states to add, delete current states
-                List<DossierStatusInfo> currentStates = dossierStatusPersistenceService.getAllDossierStatusForTemplate(dossierTemplateId);
-                currentStates.forEach(state -> dossierStatusPersistenceService.deleteDossierStatus(state.getId(), null));
-            }
 
-            // update dossier attributes
-            if (CollectionUtils.isNotEmpty(request.getDossierAttributesConfigs())) {
-                this.updateDossierAttributes(request, dossierTemplateId, templateImportInfo);
-            } else { // no dossier attributes to add, but delete existing ones
-                var currentConfigs = dossierAttributeConfigPersistenceService.getDossierAttributes(dossierTemplateId);
-                currentConfigs.forEach(da -> dossierAttributeConfigPersistenceService.deleteDossierAttribute(da.getId()));
-            }
+    private void importNewDossierTemplate(ImportTemplateResult request, DossierTemplate dossierTemplateMeta, TemplateImportInfo templateImportInfo) {
 
-            //update file attributes
-            if (CollectionUtils.isNotEmpty(request.getFileAttributesConfigs())) {
-                this.updateFileAttributes(request, dossierTemplateId, templateImportInfo);
-            } else { // no file attributes to add, but delete existing
-                var currentConfigs = fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId);
-                currentConfigs.forEach(fa -> fileAttributeConfigPersistenceService.deleteFileAttribute(fa.getId()));
-            }
+        String dossierTemplateId;
+        // creates new dossier template
+        if (StringUtils.isEmpty(dossierTemplateMeta.getName())) {
+            throw new ConflictException("DossierTemplate name must be set");
+        }
+        dossierTemplateMeta.setId("");
+        this.validateDossierTemplateName(dossierTemplateMeta);
+        DossierTemplateEntity dossierTemplateEntity = new DossierTemplateEntity();
 
-            entityTypeImportService.updateTypes(dossierTemplateId, null, request.getEntityTypeImportModel());
+        // order is important
+        BeanUtils.copyProperties(dossierTemplateMeta, dossierTemplateEntity);
+        dossierTemplateEntity.setId(UUID.randomUUID().toString());
+        dossierTemplateEntity.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
+        dossierTemplateEntity.setCreatedBy(request.getUserId());
+        //set rules
 
-            if (CollectionUtils.isNotEmpty(request.getComponentDefinitions())) {
-                this.updateComponents(request, dossierTemplateId);
-            } else { // no components to add, but remove existing ones
-                List<ComponentDefinitionEntity> currentComponents = componentDefinitionPersistenceService.findComponentsByDossierTemplateId(dossierTemplateId);
-                this.deleteComponents(currentComponents);
-            }
+        var loadedDossierTemplate = dossierTemplateRepository.save(dossierTemplateEntity);
+        loadedDossierTemplate.setDossierTemplateStatus(dossierTemplatePersistenceService.computeDossierTemplateStatus(loadedDossierTemplate));
+        dossierTemplateId = loadedDossierTemplate.getId();
+        templateImportInfo.setDossierTemplateId(dossierTemplateId);
+        // set colors
+        this.updateColors(dossierTemplateId, request.getColors());
 
-            //set report templates
-            var existingReports = reportTemplatePersistenceService.findByDossierTemplateId(dossierTemplateId);
-
-            List<String> reportsUpdated = new ArrayList<>();
-            if (CollectionUtils.isNotEmpty(request.getReportTemplateUploadRequests())) {
-                request.getReportTemplateUploadRequests()
-                        .forEach(reportRequest -> {
-                            reportRequest.setDossierTemplateId(dossierTemplateId);
-                            var report = reportTemplateService.uploadTemplate(reportRequest);
-                            reportsUpdated.add(report.getTemplateId());
-                        });
-            }
-
-            // delete the reports that were not in the import
-            existingReports.forEach(r -> {
-                String storageId = r.getStorageId();
-                if (!reportsUpdated.contains(r.getTemplateId())) {
-                    storageService.deleteObject(TenantContext.getTenantId(), storageId);
-                    reportTemplatePersistenceService.delete(r.getTemplateId());
-                }
-            });
-
-            // set legal basis
-            if (CollectionUtils.isNotEmpty(request.getLegalBases())) {
-                legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, request.getLegalBases());
-            } else { // delete existing
-                legalBasisMappingPersistenceService.deleteLegalBasis(dossierTemplateId);
-            }
-
-        } else {
-            // creates new dossier template
-            if (StringUtils.isEmpty(dossierTemplateMeta.getName())) {
-                throw new ConflictException("DossierTemplate name must be set");
-            }
-            dossierTemplateMeta.setId("");
-            this.validateDossierTemplateName(dossierTemplateMeta);
-            DossierTemplateEntity dossierTemplateEntity = new DossierTemplateEntity();
-
-            // order is important
-            BeanUtils.copyProperties(dossierTemplateMeta, dossierTemplateEntity);
-            dossierTemplateEntity.setId(UUID.randomUUID().toString());
-            dossierTemplateEntity.setDateAdded(OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
-            dossierTemplateEntity.setCreatedBy(request.getUserId());
-            //set rules
-
-            var loadedDossierTemplate = dossierTemplateRepository.save(dossierTemplateEntity);
-            loadedDossierTemplate.setDossierTemplateStatus(dossierTemplatePersistenceService.computeDossierTemplateStatus(loadedDossierTemplate));
-
-            dossierTemplateId = loadedDossierTemplate.getId();
-            // set colors
-            this.setColors(dossierTemplateId, request.getColors());
-
-            // set watermarks
-            if (CollectionUtils.isNotEmpty(request.getWatermarks())) {
-                request.getWatermarks()
-                        .forEach(watermark -> {
-                            Long initialId = watermark.getId();
-                            watermark.setDossierTemplateId(dossierTemplateId);
-                            watermark.setId(null);
-                            var en = watermarkService.createOrUpdateWatermark(watermark);
-                            templateImportInfo.getLongMapping().put(initialId, en.getId());
-                        });
-            }
-
-            // dossier status
-            if (CollectionUtils.isNotEmpty(request.getDossierStatusInfos())) {
-                request.getDossierStatusInfos()
-                        .forEach(state -> {
-                            state.setId(null);
-                            this.updateDossierStatus(dossierTemplateId, state);
-                        });
-            }
-
-            //set dossier attributes
-            if (CollectionUtils.isNotEmpty(request.getDossierAttributesConfigs())) {
-                request.getDossierAttributesConfigs()
-                        .forEach(da -> {
-                            String initialId = da.getId();
-                            da.setId(null); // in order to create a new dossier attribute
-                            var e = dossierAttributeConfigPersistenceService.addOrUpdateDossierAttribute(dossierTemplateId, convert(da, DossierAttributeConfigEntity.class));
-                            templateImportInfo.getIdMapping().put(initialId, e.getId());
-                        });
-            }
-
-            //set file attributes
-            if (CollectionUtils.isNotEmpty(request.getFileAttributesConfigs())) {
-                request.getFileAttributesConfigs()
-                        .forEach(fa -> {
-                            String initialId = fa.getId();
-                            fa.setId(null); // in order to force creation of new file attribute
-                            var e = fileAttributeConfigPersistenceService.addOrUpdateFileAttribute(dossierTemplateId, convert(fa, FileAttributeConfigEntity.class));
-                            templateImportInfo.getIdMapping().put(initialId, e.getId());
-                        });
-            }
-
-            //set types
-            entityTypeImportService.importEntityTypes(dossierTemplateId, null, request.getEntityTypeImportModel());
-
-            // set components
-            if (CollectionUtils.isNotEmpty(request.getComponentDefinitions())) {
-                for (ComponentDefinition componentDefinition : request.getComponentDefinitions()) {
-                    ComponentDefinitionAddRequest componentDefinitionAddRequest = ComponentDefinitionAddRequest.builder()
-                            .displayName(componentDefinition.getDisplayName())
-                            .description(componentDefinition.getDescription())
-                            .technicalName(componentDefinition.getTechnicalName())
-                            .build();
-                    componentDefinitionPersistenceService.insert(componentDefinitionAddRequest, componentDefinition.getRank(), dossierTemplateId);
-                }
-            }
-
-            //set report templates
-            if (CollectionUtils.isNotEmpty(request.getReportTemplateUploadRequests())) {
-                request.getReportTemplateUploadRequests()
-                        .forEach(reportRequest -> {
-                            reportRequest.setDossierTemplateId(dossierTemplateId);
-                            reportTemplateService.uploadTemplate(reportRequest);
-                        });
-            }
-            // set legal basis
-            if (CollectionUtils.isNotEmpty(request.getLegalBases())) {
-                legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, request.getLegalBases());
+        // set watermarks
+        if (CollectionUtils.isNotEmpty(request.getWatermarks())) {
+            for (WatermarkModel watermark : request.getWatermarks()) {
+                Long initialId = watermark.getId();
+                watermark.setDossierTemplateId(dossierTemplateId);
+                watermark.setId(null);
+                var en = watermarkService.createOrUpdateWatermark(watermark);
+                templateImportInfo.getLongMapping().put(initialId, en.getId());
             }
         }
 
+        // dossier status
+        if (CollectionUtils.isNotEmpty(request.getDossierStatusInfos())) {
+            for (DossierStatusInfo state : request.getDossierStatusInfos()) {
+                state.setId(null);
+                this.updateDossierStatus(dossierTemplateId, state);
+            }
+        }
+
+        //set dossier attributes
+        if (CollectionUtils.isNotEmpty(request.getDossierAttributesConfigs())) {
+            for (DossierAttributeConfig da : request.getDossierAttributesConfigs()) {
+                String initialId = da.getId();
+                da.setId(null); // in order to create a new dossier attribute
+                var e = dossierAttributeConfigPersistenceService.addOrUpdateDossierAttribute(dossierTemplateId, convert(da, DossierAttributeConfigEntity.class));
+                templateImportInfo.getIdMapping().put(initialId, e.getId());
+            }
+        }
+
+        //set file attributes
+        if (CollectionUtils.isNotEmpty(request.getFileAttributesConfigs())) {
+            for (FileAttributeConfig fa : request.getFileAttributesConfigs()) {
+                String initialId = fa.getId();
+                fa.setId(null); // in order to force creation of new file attribute
+                var e = fileAttributeConfigPersistenceService.addOrUpdateFileAttribute(dossierTemplateId, convert(fa, FileAttributeConfigEntity.class));
+                templateImportInfo.getIdMapping().put(initialId, e.getId());
+            }
+        }
+
+        //set types
+        entityTypeImportService.importEntityTypes(dossierTemplateId, null, request.getEntityTypeImportModel());
+
+        // set components
+        if (CollectionUtils.isNotEmpty(request.getComponentDefinitions())) {
+            for (ComponentDefinition componentDefinition : request.getComponentDefinitions()) {
+                ComponentDefinitionAddRequest componentDefinitionAddRequest = ComponentDefinitionAddRequest.builder()
+                        .displayName(componentDefinition.getDisplayName())
+                        .description(componentDefinition.getDescription())
+                        .technicalName(componentDefinition.getTechnicalName())
+                        .build();
+                componentDefinitionPersistenceService.insert(componentDefinitionAddRequest, componentDefinition.getRank(), dossierTemplateId);
+            }
+        }
+
+        //set report templates
+        if (CollectionUtils.isNotEmpty(request.getReportTemplateUploadRequests())) {
+            for (ReportTemplateUploadRequest reportRequest : request.getReportTemplateUploadRequests()) {
+                reportRequest.setDossierTemplateId(dossierTemplateId);
+                reportTemplateService.uploadTemplate(reportRequest);
+            }
+        }
+        // set legal basis
+        if (CollectionUtils.isNotEmpty(request.getLegalBases())) {
+            legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, request.getLegalBases());
+        }
+        setRulesWhenCompiled(request, dossierTemplateId);
+        setComponentMappings(dossierTemplateId, request.getComponentMappings());
+        setFileAttributeGeneralConfig(request, dossierTemplateId);
+
+    }
+
+
+    private void setFileAttributeGeneralConfig(ImportTemplateResult request, String dossierTemplateId) {
         // file attribute general configuration
         if (request.getFileAttributesGeneralConfiguration() != null) {
             fileAttributeConfigPersistenceService.setFileAttributesGeneralConfig(dossierTemplateId,
                                                                                  convert(request.getFileAttributesGeneralConfiguration(),
                                                                                          FileAttributesGeneralConfigurationEntity.class));
         }
+    }
 
+
+    private String updateExistingDossierTemplate(ImportTemplateResult request,
+                                                 DossierTemplateEntity existingDossierTemplate,
+                                                 DossierTemplate dossierTemplateMeta,
+                                                 TemplateImportInfo templateImportInfo) {
+
+        String dossierTemplateId;
+        dossierTemplateId = existingDossierTemplate.getId();
+        updateDossierTemplateMeta(existingDossierTemplate, dossierTemplateMeta, request.getUserId());
+        dossierTemplateRepository.save(existingDossierTemplate);
+        existingDossierTemplate.setDossierTemplateStatus(DossierTemplateStatus.valueOf(dossierTemplatePersistenceService.computeDossierTemplateStatus(existingDossierTemplate)
+                                                                                               .name()));
+        updateColors(dossierTemplateId, request.getColors());
+        updateWatermarks(request, templateImportInfo, dossierTemplateId);
+        updateDossiers(request, dossierTemplateId);
+        updateDossierAttributes(request, templateImportInfo, dossierTemplateId);
+        updateFileAttributes(request, templateImportInfo, dossierTemplateId);
+        entityTypeImportService.updateTypes(dossierTemplateId, null, request.getEntityTypeImportModel());
+        updateComponents(request, dossierTemplateId);
+        var existingReports = reportTemplatePersistenceService.findByDossierTemplateId(dossierTemplateId);
+        updateReports(request, dossierTemplateId, existingReports);
+        updateLegalBasis(request, dossierTemplateId);
         setRulesWhenCompiled(request, dossierTemplateId);
         setComponentMappings(dossierTemplateId, request.getComponentMappings());
+        setFileAttributeGeneralConfig(request, dossierTemplateId);
+        return dossierTemplateId;
+    }
 
-        templateImportInfo.setDossierTemplateId(dossierTemplateId);
 
-        long elapsedTime = System.currentTimeMillis() - start;
-        log.info("Finished import dossier template : {} for: {}", elapsedTime, dossierTemplateId);
-        return templateImportInfo;
+    private void updateLegalBasis(ImportTemplateResult request, String dossierTemplateId) {
+        // set legal basis
+        if (CollectionUtils.isNotEmpty(request.getLegalBases())) {
+            legalBasisMappingPersistenceService.setLegalBasisMapping(dossierTemplateId, request.getLegalBases());
+        } else { // delete existing
+            legalBasisMappingPersistenceService.deleteLegalBasis(dossierTemplateId);
+        }
+    }
+
+
+    private void updateReports(ImportTemplateResult request, String dossierTemplateId, List<ReportTemplateEntity> existingReports) {
+
+        List<String> reportsUpdated = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(request.getReportTemplateUploadRequests())) {
+            for (ReportTemplateUploadRequest reportRequest : request.getReportTemplateUploadRequests()) {
+                reportRequest.setDossierTemplateId(dossierTemplateId);
+                var report = reportTemplateService.uploadTemplate(reportRequest);
+                reportsUpdated.add(report.getTemplateId());
+            }
+        }
+
+        // delete the reports that were not in the import
+        existingReports.forEach(r -> {
+            String storageId = r.getStorageId();
+            if (!reportsUpdated.contains(r.getTemplateId())) {
+                storageService.deleteObject(TenantContext.getTenantId(), storageId);
+                reportTemplatePersistenceService.delete(r.getTemplateId());
+            }
+        });
+    }
+
+
+    private void updateComponents(ImportTemplateResult request, String dossierTemplateId) {
+
+        if (CollectionUtils.isNotEmpty(request.getComponentDefinitions())) {
+            request.getComponentDefinitions()
+                    .forEach(componentDefinition -> {
+                        componentDefinition.setDossierTemplateId(dossierTemplateId);
+                        componentDefinitionPersistenceService.insert(MagicConverter.convert(componentDefinition, ComponentDefinitionEntity.class));
+                    });
+        } else { // no components to add, but remove existing ones
+            List<ComponentDefinitionEntity> currentComponents = componentDefinitionPersistenceService.findComponentsByDossierTemplateId(dossierTemplateId);
+            currentComponents.forEach(componentDefinition -> {
+                componentDefinitionPersistenceService.delete(componentDefinition.getId());
+            });
+        }
+    }
+
+
+    private void updateFileAttributes(ImportTemplateResult request, TemplateImportInfo templateImportInfo, String dossierTemplateId) {
+        //update file attributes
+        if (CollectionUtils.isNotEmpty(request.getFileAttributesConfigs())) {
+            this.updateFileAttributes(request, dossierTemplateId, templateImportInfo);
+        } else { // no file attributes to add, but delete existing
+            var currentConfigs = fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId);
+            currentConfigs.forEach(fa -> fileAttributeConfigPersistenceService.deleteFileAttribute(fa.getId()));
+        }
+    }
+
+
+    private void updateWatermarks(ImportTemplateResult request, TemplateImportInfo templateImportInfo, String dossierTemplateId) {
+        // set watermarks
+        if (CollectionUtils.isNotEmpty(request.getWatermarks())) {
+            Set<String> toSetWatermarks = request.getWatermarks()
+                    .stream()
+                    .map(WatermarkModel::getName)
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.toSet());
+            var currentWatermarkConfigs = watermarkService.getWatermarksForDossierTemplateId(dossierTemplateId);
+            Set<WatermarkEntity> configsToRemove = currentWatermarkConfigs.stream()
+                    .filter(c -> !toSetWatermarks.contains(c.getName()))
+                    .collect(Collectors.toSet());
+            var watermarkNameToEntity = currentWatermarkConfigs.stream()
+                    .collect(Collectors.toMap(WatermarkEntity::getName, Function.identity()));
+
+            for (WatermarkModel watermarkModel : request.getWatermarks()) {
+                log.info("watermark to add: " + watermarkModel.getName());
+                Long initialId = watermarkModel.getId();
+                if (!watermarkNameToEntity.isEmpty() && watermarkNameToEntity.get(watermarkModel.getName()) != null) {
+
+                    watermarkModel.setId(watermarkNameToEntity.get(watermarkModel.getName()).getId());
+                } else {
+                    watermarkModel.setId(null);
+                }
+                watermarkModel.setDossierTemplateId(dossierTemplateId);
+                var entity = watermarkService.createOrUpdateWatermark(watermarkModel);
+                templateImportInfo.getLongMapping().put(initialId, entity.getId());
+            }
+            configsToRemove.forEach(watermark -> watermarkService.deleteWatermark(watermark.getId()));
+        }
+    }
+
+
+    private void updateDossiers(ImportTemplateResult request, String dossierTemplateId) {
+        // dossier status
+        if (CollectionUtils.isNotEmpty(request.getDossierStatusInfos())) {
+            this.updateDossierStates(request, dossierTemplateId);
+        } else { // no states to add, delete current states
+            List<DossierStatusInfo> currentStates = dossierStatusPersistenceService.getAllDossierStatusForTemplate(dossierTemplateId);
+            currentStates.forEach(state -> dossierStatusPersistenceService.deleteDossierStatus(state.getId(), null));
+        }
+    }
+
+
+    private void updateDossierAttributes(ImportTemplateResult request, TemplateImportInfo templateImportInfo, String dossierTemplateId) {
+
+        if (CollectionUtils.isNotEmpty(request.getDossierAttributesConfigs())) {
+            this.updateDossierAttributes(request, dossierTemplateId, templateImportInfo);
+        } else { // no dossier attributes to add, but delete existing ones
+            var currentConfigs = dossierAttributeConfigPersistenceService.getDossierAttributes(dossierTemplateId);
+            currentConfigs.forEach(da -> dossierAttributeConfigPersistenceService.deleteDossierAttribute(da.getId()));
+        }
     }
 
 
@@ -435,7 +501,7 @@ public class DossierTemplateImportService {
     }
 
 
-    private void setColors(String dossierTemplateId, Colors requestedColors) {
+    private void updateColors(String dossierTemplateId, Colors requestedColors) {
         // set colors
         if (requestedColors != null) {
             ColorsEntity colorsEntity = convert(requestedColors, ColorsEntity.class);
@@ -530,24 +596,6 @@ public class DossierTemplateImportService {
     }
 
 
-    private void updateComponents(ImportTemplateResult request, String dossierTemplateId) {
-
-        request.getComponentDefinitions()
-                .forEach(componentDefinition -> {
-                    componentDefinition.setDossierTemplateId(dossierTemplateId);
-                    componentDefinitionPersistenceService.insert(MagicConverter.convert(componentDefinition, ComponentDefinitionEntity.class));
-                });
-    }
-
-
-    private void deleteComponents(List<ComponentDefinitionEntity> componentDefinitionEntities) {
-
-        componentDefinitionEntities.forEach(componentDefinition -> {
-            componentDefinitionPersistenceService.delete(componentDefinition.getId());
-        });
-    }
-
-
     private void validateDossierTemplateName(DossierTemplate dossierTemplateMeta) {
 
         int nameSuffix = 0;

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

@@ -15,9 +15,9 @@ import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportFilename;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.BaseDictionaryEntry;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportFilename;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.EntryPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.utils.FileSystemBackedArchiver;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType;
@@ -41,6 +41,7 @@ public class EntityTypeExportService {
     ObjectMapper mapper;
     EntryPersistenceService entryPersistenceService;
 
+
     @Observed(name = "EntityTypeExportService", contextualName = "export-entity-type")
     public void addEntityTypeToArchive(FileSystemBackedArchiver fileSystemBackedArchiver, TypeEntity typeEntity, String folder) throws JsonProcessingException {
 

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

@@ -9,9 +9,9 @@ import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.EntityTypeImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.BaseDictionaryEntry;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.EntityTypeImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DictionaryPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierTemplatePersistenceService;

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

@@ -8,9 +8,9 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.management.v1.processor.configuration.MessagingConfiguration;
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportDownloadMessage;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.FileExchangeNames;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierIdFileIdRequestValidator;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService;

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

@@ -10,6 +10,7 @@ import com.iqser.red.service.persistence.management.v1.processor.dataexchange.mo
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.TemplateImportInfo;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.ReportTemplateEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ReportTemplatePersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.ImportResponse;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
@@ -32,6 +33,7 @@ public class FileExchangeImportService {
     FileExchangeArchivalService fileExchangeArchivalService;
     ReportTemplatePersistenceService reportTemplateService;
     ObservationRegistry registry;
+    DossierTemplateManagementService dossierTemplateManagementService;
 
 
     @Observed(name = "FileExchangeImportService", contextualName = "import-files")
@@ -68,11 +70,18 @@ public class FileExchangeImportService {
                 .stream()
                 .map(ReportTemplateEntity::getTemplateId)
                 .toList();
-
-        for (Dossier dossierToImport : fileExchangeImportModel.getDossiers()) {
-            dossierImportService.importDossier(fileExchangeImportModel, userId, dossierToImport, templateImportInfo, allReportTemplateIds);
+        try {
+            for (Dossier dossierToImport : fileExchangeImportModel.getDossiers()) {
+                dossierImportService.importDossier(fileExchangeImportModel, userId, dossierToImport, templateImportInfo, allReportTemplateIds);
+            }
+            return templateImportInfo.getDossierTemplateId();
+        } catch (Exception e) {
+            log.error("Error with message {} ocurred, deleting imported dossier template again.", e.getMessage());
+            if (templateImportInfo.getDossierTemplateId() != null) {
+                dossierTemplateManagementService.deleteDossierTemplateCompletely(templateImportInfo.getDossierTemplateId());
+            }
+            throw e;
         }
-        return templateImportInfo.getDossierTemplateId();
     }
 
 
@@ -90,5 +99,4 @@ public class FileExchangeImportService {
         }
     }
 
-
 }

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

@@ -4,9 +4,9 @@ import java.util.Map;
 
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.FileExchangeImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.TemplateImportInfo;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.management.v1.processor.service.UploadService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
 import com.iqser.red.service.persistence.management.v1.processor.utils.FileEntityMapper;

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

@@ -2,9 +2,9 @@ package com.iqser.red.service.persistence.management.v1.processor.dataexchange.s
 
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualChangesExportModel;
 import com.iqser.red.service.persistence.management.v1.processor.mapper.ManualChangesExportMapper;
 import com.iqser.red.service.persistence.management.v1.processor.model.ManualChangesQueryOptions;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualChangesExportModel;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.AddRedactionPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ForceRedactionPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.LegalBasisChangePersistenceService;
@@ -39,29 +39,29 @@ public class ManualChangesExportService {
 
         ManualChangesExportModel exportModel = new ManualChangesExportModel();
         exportModel.setManualAddExportModels(addRedactionPersistenceService.findEntriesByFileIdAndOptions(fileId, ManualChangesQueryOptions.all())
-                                               .stream()
-                                               .map(mapper::toModel)
-                                               .toList());
+                                                     .stream()
+                                                     .map(mapper::toModel)
+                                                     .toList());
         exportModel.setManualRemoveExportModels(removeRedactionPersistenceService.findEntriesByFileIdAndOptions(fileId, ManualChangesQueryOptions.all())
-                                                  .stream()
-                                                  .map(mapper::toModel)
-                                                  .toList());
+                                                        .stream()
+                                                        .map(mapper::toModel)
+                                                        .toList());
         exportModel.setManualForceExportModels(forceRedactionPersistenceService.findEntriesByFileIdAndOptions(fileId, ManualChangesQueryOptions.all())
-                                                 .stream()
-                                                 .map(mapper::toModel)
-                                                 .toList());
+                                                       .stream()
+                                                       .map(mapper::toModel)
+                                                       .toList());
         exportModel.setManualLegalBasisChangeExportModels(legalBasisChangePersistenceService.findEntriesByFileIdAndOptions(fileId, ManualChangesQueryOptions.all())
-                                                            .stream()
-                                                            .map(mapper::toModel)
-                                                            .toList());
+                                                                  .stream()
+                                                                  .map(mapper::toModel)
+                                                                  .toList());
         exportModel.setManualRecategorizationExportModels(recategorizationPersistenceService.findEntriesByFileIdAndOptions(fileId, ManualChangesQueryOptions.all())
-                                                            .stream()
-                                                            .map(mapper::toModel)
-                                                            .toList());
+                                                                  .stream()
+                                                                  .map(mapper::toModel)
+                                                                  .toList());
         exportModel.setManualResizeExportModels(resizeRedactionPersistenceService.findEntriesByFileIdAndOptions(fileId, ManualChangesQueryOptions.all())
-                                                  .stream()
-                                                  .map(mapper::toModel)
-                                                  .toList());
+                                                        .stream()
+                                                        .map(mapper::toModel)
+                                                        .toList());
         return exportModel;
 
     }

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

@@ -2,9 +2,9 @@ package com.iqser.red.service.persistence.management.v1.processor.dataexchange.s
 
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualChangesExportModel;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.management.v1.processor.mapper.ManualChangesExportMapper;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualChangesExportModel;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.ForceRedactionRepository;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.LegalBasisChangeRepository;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/zipreaders/DossierTemplateArchiveReader.java

@@ -11,11 +11,11 @@ import org.apache.commons.compress.utils.FileNameUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.commons.jackson.ObjectMapperFactory;
-import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ComponentMappingImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportFilename;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ComponentMappingImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ImportTemplateResult;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.RulesExportModel;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.WatermarkModel;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentDefinition;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentMappingMetadata;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/zipreaders/EntityTypeArchiveReader.java

@@ -10,9 +10,9 @@ import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.commons.jackson.ObjectMapperFactory;
-import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.EntityTypeImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.ExportFilename;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.EntityTypeImportModel;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
 
 import lombok.AccessLevel;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/zipreaders/FileExchangeArchiveReader.java

@@ -13,8 +13,8 @@ import java.util.regex.Pattern;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.commons.jackson.ObjectMapperFactory;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.FileExchangeImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.FileExchangeNames;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.FileExchangeImportModel;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.FileWithType;
 import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualChangesExportModel;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribute;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/dataexchange/zipreaders/ZipEntryIterator.java

@@ -1,6 +1,10 @@
 package com.iqser.red.service.persistence.management.v1.processor.dataexchange.zipreaders;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.UUID;
@@ -70,7 +74,7 @@ public class ZipEntryIterator implements Iterator<ZipEntryData>, AutoCloseable {
 
                 double compressionRatio = (double) totalSizeEntry / nextEntry.getCompressedSize();
                 if (compressionRatio > compressionThresholdRatio) {
-                    throw new BadRequestException("ZIP-Bomb detected (compressionRatio). " + compressionRatio + "/" + compressionThresholdRatio );
+                    throw new BadRequestException("ZIP-Bomb detected (compressionRatio). " + compressionRatio + "/" + compressionThresholdRatio);
                 }
             }
 

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

@@ -4,7 +4,6 @@ import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.annotations.Fetch;
 import org.springframework.data.annotation.LastModifiedDate;
 
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/AnnotationEntityId.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/CommentEntity.java

@@ -2,6 +2,8 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.annotat
 
 import java.time.OffsetDateTime;
 
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -9,9 +11,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/RectangleEntity.java

@@ -1,7 +1,6 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.annotations;
 
 import jakarta.persistence.Embeddable;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ViewedPageEntity.java

@@ -3,6 +3,8 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.annotat
 import java.io.Serializable;
 import java.time.OffsetDateTime;
 
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
@@ -11,9 +13,6 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/audit/AuditEntity.java

@@ -4,6 +4,8 @@ import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.iqser.red.service.persistence.management.v1.processor.utils.JSONMapConverter;
+
 import jakarta.persistence.Basic;
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
@@ -13,9 +15,6 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.management.v1.processor.utils.JSONMapConverter;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ApplicationConfigurationEntity.java

@@ -4,7 +4,6 @@ import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/ColorsEntity.java

@@ -8,7 +8,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.PrePersist;
 import jakarta.persistence.PreUpdate;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DictionaryEntryEntity.java

@@ -6,7 +6,6 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DictionaryFalseRecommendationEntryEntity.java

@@ -6,7 +6,6 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DigitalSignatureEntity.java

@@ -1,13 +1,12 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DigitalSignatureKmsEntity.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
+
 import jakarta.persistence.Basic;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -7,9 +9,6 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Lob;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/DigitalSignatureTypeEntity.java

@@ -1,15 +1,14 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignatureType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignatureType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/FileAttributesGeneralConfigurationEntity.java

@@ -1,15 +1,14 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.configuration;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisEntity.java

@@ -2,7 +2,6 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.configu
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/LegalBasisMappingEntity.java

@@ -3,11 +3,15 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.configu
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.persistence.*;
-
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/TypeEntity.java

@@ -2,6 +2,9 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.configu
 
 import java.time.OffsetDateTime;
 
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -9,10 +12,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/configuration/WatermarkEntity.java

@@ -2,6 +2,11 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.configu
 
 import java.time.OffsetDateTime;
 
+import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.HorizontalTextAlignment;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.VerticalTextAlignment;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.WatermarkOrientation;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -13,12 +18,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierTemplateEntity;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.HorizontalTextAlignment;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.VerticalTextAlignment;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.WatermarkOrientation;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/ComponentDefinitionEntity.java

@@ -4,8 +4,6 @@ import java.time.OffsetDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeConfigEntity.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttributeType;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -7,9 +9,6 @@ import jakarta.persistence.Enumerated;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttributeType;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierAttributeEntity.java

@@ -7,7 +7,6 @@ import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierEntity.java

@@ -6,6 +6,17 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity;
+import com.iqser.red.service.persistence.management.v1.processor.utils.JSONDownloadFileTypeConverter;
+import com.iqser.red.service.persistence.management.v1.processor.utils.JSONStringSetConverter;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierVisibility;
+
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
@@ -19,18 +30,6 @@ import jakarta.persistence.ManyToMany;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
-import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.WatermarkEntity;
-import com.iqser.red.service.persistence.management.v1.processor.utils.JSONDownloadFileTypeConverter;
-import com.iqser.red.service.persistence.management.v1.processor.utils.JSONStringSetConverter;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierVisibility;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/DossierStatusEntity.java

@@ -3,6 +3,9 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.dossier
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -11,10 +14,6 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeConfigEntity.java

@@ -1,5 +1,8 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.dossier;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeType;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
@@ -7,10 +10,6 @@ import jakarta.persistence.Enumerated;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeType;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileAttributeEntity.java

@@ -7,7 +7,6 @@ import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/ReportTemplateEntity.java

@@ -4,6 +4,8 @@ import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -11,9 +13,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.ManyToMany;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadRedactionFileStatusEntity.java

@@ -1,17 +1,21 @@
 package com.iqser.red.service.persistence.management.v1.processor.entity.download;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionResultDetail;
 import com.iqser.red.service.persistence.management.v1.processor.utils.JSONDownloadRedactionFileDetailsConverter;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Data
 @Entity
 @Builder

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/index/IndexInformationEntity.java

@@ -2,13 +2,12 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.index;
 
 import java.time.OffsetDateTime;
 
+import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.utils.SuppressFBWarnings;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/migration/MigrationEntity.java

@@ -6,7 +6,6 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/migration/SaasMigrationStatusEntity.java

@@ -2,7 +2,12 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.migrati
 
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.SaasMigrationStatus;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/notification/NotificationEntity.java

@@ -4,6 +4,8 @@ import java.time.OffsetDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.iqser.red.service.persistence.management.v1.processor.utils.JSONMapConverter;
+
 import jakarta.persistence.Basic;
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
@@ -12,11 +14,7 @@ import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
-
-import com.iqser.red.service.persistence.management.v1.processor.utils.JSONMapConverter;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/notification/NotificationPreferencesEntity.java

@@ -3,18 +3,17 @@ package com.iqser.red.service.persistence.management.v1.processor.entity.notific
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+
+import com.iqser.red.service.persistence.service.v1.api.shared.model.notification.EmailNotificationType;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
-import com.iqser.red.service.persistence.service.v1.api.shared.model.notification.EmailNotificationType;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/permissions/CustomPermissionEntity.java

@@ -7,7 +7,6 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

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

@@ -2,8 +2,6 @@ package com.iqser.red.service.persistence.management.v1.processor.jobs;
 
 import java.text.ParseException;
 
-import com.iqser.red.service.persistence.management.v1.processor.service.job.*;
-
 import org.quartz.CronExpression;
 import org.quartz.CronScheduleBuilder;
 import org.quartz.JobBuilder;
@@ -13,6 +11,15 @@ import org.quartz.TriggerBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.iqser.red.service.persistence.management.v1.processor.service.job.AnalysisFlagCalculationSchedulerJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.job.AutomaticAnalysisJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.job.DeletedFilesCleanupJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.job.DownloadCleanupJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.job.DownloadReadyJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.job.KeyCloakUserSyncJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.job.SendNotificationEmailJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.job.SyncUserPermissionsJob;
+
 @Configuration
 public class CreateJobsConfiguration {
 

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

@@ -13,4 +13,5 @@ import lombok.NoArgsConstructor;
 public class LifecycleProperties {
 
     private String basePackage;
+
 }

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

@@ -8,6 +8,12 @@ import org.mapstruct.MappingTarget;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
 
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualAddExportModel;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualForceExportModel;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualLegalBasisChangeExportModel;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualRecategorizationExportModel;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualRemoveExportModel;
+import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualResizeExportModel;
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.IdRemovalEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualForceRedactionEntity;
@@ -16,12 +22,6 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.annotati
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualResizeRedactionEntity;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualAddExportModel;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualForceExportModel;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualLegalBasisChangeExportModel;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualRecategorizationExportModel;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualRemoveExportModel;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.manualchanges.ManualResizeExportModel;
 
 @Mapper
 public interface ManualChangesExportMapper {
@@ -74,7 +74,8 @@ public interface ManualChangesExportMapper {
     @AfterMapping
     default void setFileStatusAndId(ManualLegalBasisChangeExportModel model,
                                     @MappingTarget ManualLegalBasisChangeEntity.ManualLegalBasisChangeEntityBuilder entity,
-                                    @Context FileEntity file, @Context String userId) {
+                                    @Context FileEntity file,
+                                    @Context String userId) {
 
         AnnotationEntityId annotationEntityId = new AnnotationEntityId(model.getAnnotationId(), file.getId());
         entity.id(annotationEntityId);
@@ -86,7 +87,8 @@ public interface ManualChangesExportMapper {
     @AfterMapping
     default void setFileStatusAndId(ManualRecategorizationExportModel model,
                                     @MappingTarget ManualRecategorizationEntity.ManualRecategorizationEntityBuilder entity,
-                                    @Context FileEntity file, @Context String userId) {
+                                    @Context FileEntity file,
+                                    @Context String userId) {
 
         AnnotationEntityId annotationEntityId = new AnnotationEntityId(model.getAnnotationId(), file.getId());
         entity.id(annotationEntityId);
@@ -96,7 +98,10 @@ public interface ManualChangesExportMapper {
 
 
     @AfterMapping
-    default void setFileStatusAndId(ManualAddExportModel model, @MappingTarget ManualRedactionEntryEntity.ManualRedactionEntryEntityBuilder entity, @Context FileEntity file, @Context String userId) {
+    default void setFileStatusAndId(ManualAddExportModel model,
+                                    @MappingTarget ManualRedactionEntryEntity.ManualRedactionEntryEntityBuilder entity,
+                                    @Context FileEntity file,
+                                    @Context String userId) {
 
         AnnotationEntityId annotationEntityId = new AnnotationEntityId(model.getAnnotationId(), file.getId());
         entity.id(annotationEntityId);
@@ -106,7 +111,10 @@ public interface ManualChangesExportMapper {
 
 
     @AfterMapping
-    default void setFileStatusAndId(ManualResizeExportModel model, @MappingTarget ManualResizeRedactionEntity.ManualResizeRedactionEntityBuilder entity, @Context FileEntity file, @Context String userId) {
+    default void setFileStatusAndId(ManualResizeExportModel model,
+                                    @MappingTarget ManualResizeRedactionEntity.ManualResizeRedactionEntityBuilder entity,
+                                    @Context FileEntity file,
+                                    @Context String userId) {
 
         AnnotationEntityId annotationEntityId = new AnnotationEntityId(model.getAnnotationId(), file.getId());
         entity.id(annotationEntityId);
@@ -116,7 +124,10 @@ public interface ManualChangesExportMapper {
 
 
     @AfterMapping
-    default void setFileStatusAndId(ManualForceExportModel model, @MappingTarget ManualForceRedactionEntity.ManualForceRedactionEntityBuilder entity, @Context FileEntity file, @Context String userId) {
+    default void setFileStatusAndId(ManualForceExportModel model,
+                                    @MappingTarget ManualForceRedactionEntity.ManualForceRedactionEntityBuilder entity,
+                                    @Context FileEntity file,
+                                    @Context String userId) {
 
         AnnotationEntityId annotationEntityId = new AnnotationEntityId(model.getAnnotationId(), file.getId());
         entity.id(annotationEntityId);

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

@@ -1,9 +1,23 @@
 package com.iqser.red.service.persistence.management.v1.processor.migration;
 
-import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.*;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.IdRemovalEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualForceRedactionEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualLegalBasisChangeEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRecategorizationEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualResizeRedactionEntity;
+import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.RectangleEntity;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.CommentRepository;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.*;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.ForceRedactionRepository;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.LegalBasisChangeRepository;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.ManualRedactionRepository;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.RecategorizationRepository;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.RemoveRedactionRepository;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.ResizeRedactionRepository;
 import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 
 import jakarta.transaction.Transactional;
@@ -12,8 +26,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.stereotype.Service;
-
 @Slf4j
 @Service
 @Transactional

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

@@ -12,8 +12,6 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.annotati
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity;
 import com.iqser.red.service.persistence.management.v1.processor.model.ManualChangesQueryOptions;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.AddRedactionPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.RemoveRedactionPersistenceService;
-import com.iqser.red.service.persistence.management.v1.processor.service.persistence.annotations.ResizeRedactionPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType;
 
 import lombok.RequiredArgsConstructor;

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

@@ -2,19 +2,16 @@ package com.iqser.red.service.persistence.management.v1.processor.migration;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.nio.file.Files;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.commons.io.IOUtils;
 import org.springframework.stereotype.Service;
 
 import com.azure.storage.blob.BlobClient;
-import com.azure.storage.blob.BlobContainerClient;
-import com.iqser.red.storage.commons.exception.StorageException;
 import com.iqser.red.storage.commons.exception.StorageObjectDoesNotExist;
 import com.iqser.red.storage.commons.service.StorageClientCache;
 import com.iqser.red.storage.commons.service.StorageService;
@@ -23,9 +20,6 @@ import com.iqser.red.storage.commons.service.azure.AzureBlobClient;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-
-import org.apache.commons.io.IOUtils;
-
 import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/migrations/FixDossierDictionaryEntryInRedactionLog14.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.management.v1.processor.migration.migrations;
 
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.management.v1.processor.migration.Migration;
 
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.stereotype.Service;
-
 @Slf4j
 @Setter
 @Service

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/migrations/MigrateImportedRedactionsFiles17.java

@@ -1,6 +1,5 @@
 package com.iqser.red.service.persistence.management.v1.processor.migration.migrations;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -14,7 +13,6 @@ import com.iqser.red.service.persistence.management.v1.processor.service.FileMan
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported.ImportedRedaction;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported.ImportedRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.imported.ImportedRedactionsPerPage;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/migration/migrations/MissingFileSizeMigration13.java

@@ -1,5 +1,10 @@
 package com.iqser.red.service.persistence.management.v1.processor.migration.migrations;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
 import com.iqser.red.service.persistence.management.v1.processor.migration.Migration;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService;
@@ -9,11 +14,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
 @Slf4j
 @Setter
 @Service

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

@@ -18,4 +18,5 @@ public class ComponentOverride {
 
     String name;
     List<ComponentLogEntryValue> componentOverrideValues = new ArrayList<>();
+
 }

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

@@ -43,6 +43,7 @@ public class ManualChangesQueryOptions {
         return ManualChangesQueryOptions.builder().includeDeletions(false).includeDictChanges(true).includeOnlyUnprocessed(true).build();
     }
 
+
     public static ManualChangesQueryOptions unprocessedOnlyForIds(List<String> annotationIds) {
 
         return ManualChangesQueryOptions.builder().includeDeletions(false).includeDictChanges(true).includeOnlyUnprocessed(true).annotationIds(annotationIds).build();

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/websocket/AnalyseEvent.java

@@ -21,7 +21,9 @@ public class AnalyseEvent {
     private int numberOfPagesToOCR;
     private int numberOfOCRedPages;
 
+
     public AnalyseEvent(String dossierId, String fileId, AnalyseStatus analyseStatus, Integer analysisNumber, OffsetDateTime timestamp) {
+
         this.dossierId = dossierId;
         this.fileId = fileId;
         this.analyseStatus = analyseStatus;

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/websocket/DossierEvent.java

@@ -10,6 +10,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class DossierEvent {
+
     private String dossierId;
     private DossierEventType dossierEventType;
+
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/websocket/DossierEventType.java

@@ -1,5 +1,11 @@
 package com.iqser.red.service.persistence.management.v1.processor.model.websocket;
 
 public enum DossierEventType {
-    CREATE, UPDATE, SOFT_DELETE, HARD_DELETE, UNDELETE, ARCHIVE, UNARCHIVE
+    CREATE,
+    UPDATE,
+    SOFT_DELETE,
+    HARD_DELETE,
+    UNDELETE,
+    ARCHIVE,
+    UNARCHIVE
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/websocket/DownloadEvent.java

@@ -16,4 +16,5 @@ public class DownloadEvent {
     private String downloadId;
     private String userId;
     private DownloadStatusValue status;
+
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/websocket/FileEvent.java

@@ -15,5 +15,4 @@ public class FileEvent {
     private String fileId;
     private FileEventType fileEventType;
 
-
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/websocket/FileEventType.java

@@ -1,5 +1,9 @@
 package com.iqser.red.service.persistence.management.v1.processor.model.websocket;
 
 public enum FileEventType {
-    CREATE, UPDATE, SOFT_DELETE, HARD_DELETE, UNDELETE
+    CREATE,
+    UPDATE,
+    SOFT_DELETE,
+    HARD_DELETE,
+    UNDELETE
 }

persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/model/websocket/NotificationEvent.java

@@ -12,4 +12,5 @@ import lombok.NoArgsConstructor;
 public class NotificationEvent {
 
     private String userId;
+
 }

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

@@ -47,7 +47,8 @@ public class ComponentDefinitionService {
         validateAddRequest(componentDefinitionAddRequests);
 
         List<ComponentDefinitionEntity> componentEntities = new ArrayList<>();
-        componentDefinitionAddRequests.forEach(componentDefinitionAddRequest -> componentEntities.add(componentDefinitionPersistenceService.insert(componentDefinitionAddRequest, dossierTemplateId)));
+        componentDefinitionAddRequests.forEach(componentDefinitionAddRequest -> componentEntities.add(componentDefinitionPersistenceService.insert(componentDefinitionAddRequest,
+                                                                                                                                                   dossierTemplateId)));
         return componentEntities.stream()
                 .map(componentDefinitionEntity -> MagicConverter.convert(componentDefinitionEntity, ComponentDefinition.class))
                 .sorted(Comparator.comparing(ComponentDefinition::getRank))
@@ -57,7 +58,9 @@ public class ComponentDefinitionService {
 
     private void validateAddRequest(List<ComponentDefinitionAddRequest> componentDefinitionAddRequests) {
 
-        long nrOfComponentsWithEmptyTechnicalName = componentDefinitionAddRequests.stream().filter(c -> StringUtils.isEmpty(c.getTechnicalName())).count();
+        long nrOfComponentsWithEmptyTechnicalName = componentDefinitionAddRequests.stream()
+                .filter(c -> StringUtils.isEmpty(c.getTechnicalName()))
+                .count();
         if (nrOfComponentsWithEmptyTechnicalName != 0) {
             throw new BadRequestException("Technical name can not be empty for a component.");
         }
@@ -193,4 +196,5 @@ public class ComponentDefinitionService {
             throw new NotFoundException(String.format("DossierTemplate with Id %s not found.", dossierTemplateId));
         }
     }
+
 }

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

@@ -48,7 +48,8 @@ public class ComponentLogService {
 
     public ComponentLog getComponentLog(String dossierId, String fileId, boolean includeOverrides) {
 
-        List<ComponentDefinitionEntity> orderedEntities = componentDefinitionPersistenceService.findByDossierTemplateIdAndNotSoftDeleted(dossierRepository.findDossierTemplateId(dossierId))
+        List<ComponentDefinitionEntity> orderedEntities = componentDefinitionPersistenceService.findByDossierTemplateIdAndNotSoftDeleted(dossierRepository.findDossierTemplateId(
+                        dossierId))
                 .stream()
                 .sorted(Comparator.comparing(ComponentDefinitionEntity::getRank))
                 .toList();

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

@@ -17,6 +17,7 @@ import java.util.List;
 import java.util.UUID;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.iqser.red.service.persistence.management.v1.processor.entity.ComponentMappingEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
@@ -229,6 +230,13 @@ public class ComponentMappingService {
         return dossierTemplateId + "/" + id + "_" + name + "_" + fileName;
     }
 
+    @Transactional
+    public void deleteByDossierTemplateId(String dossierTemplateId) {
+
+        componentMappingPersistenceService.getByDossierTemplateId(dossierTemplateId)
+                .forEach(cm -> componentMappingPersistenceService.deleteById(dossierTemplateId, cm.getId()));
+    }
+
 
     private static class CSVSorter implements Comparator<String[]> {
 

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

@@ -33,6 +33,7 @@ import com.iqser.red.service.persistence.management.v1.processor.utils.TypeMappe
 import com.iqser.red.service.persistence.management.v1.processor.validation.DictionaryValidator;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.Type;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.TypeRankSummary;
 import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 
 import jakarta.transaction.Transactional;
@@ -237,10 +238,11 @@ public class DictionaryManagementService {
 
     @Transactional
     public void addEntries(String typeId, List<String> entries, boolean removeCurrent, boolean ignoreInvalidEntries, DictionaryEntryType dictionaryEntryType) {
+
         addEntries(typeId, entries, removeCurrent, ignoreInvalidEntries, dictionaryEntryType, false);
     }
-    
-    
+
+
     @Transactional
     public void addEntries(String typeId, List<String> entries, boolean removeCurrent, boolean ignoreInvalidEntries, DictionaryEntryType dictionaryEntryType, boolean isImport) {
 
@@ -403,6 +405,13 @@ public class DictionaryManagementService {
     }
 
 
+    @Transactional
+    public void hardDeleteByDossierTemplateId(String dossierTemplateId) {
+
+        dictionaryPersistenceService.hardDeleteTypesByDossierTemplateId(dossierTemplateId);
+    }
+
+
     public long getCurrentVersion(String typeId) {
 
         Type typeResult = MagicConverter.convert(dictionaryPersistenceService.getType(typeId), Type.class);
@@ -432,4 +441,16 @@ public class DictionaryManagementService {
 
     }
 
+
+    public List<TypeRankSummary> getTypeRankSummaryList(String dossierTemplateId) {
+
+        return dictionaryPersistenceService.getTypeRankSummaryList(dossierTemplateId);
+    }
+
+
+    public void hardDeleteByDossierId(String dossierId) {
+
+        dictionaryPersistenceService.hardDeleteTypesByDossierId(dossierId);
+    }
+
 }

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

@@ -132,7 +132,8 @@ public class DictionaryService {
         if (entriesToDelete != null && !entriesToDelete.isEmpty()) {
             deleteGlobalEntries(type, dossierTemplateId, entriesToDelete, dictionaryEntryType);
         }
-        if (entriesToAdd != null && !entriesToAdd.isEmpty() && !entriesToAdd.stream().allMatch(String::isEmpty)) {
+        if (entriesToAdd != null && !entriesToAdd.isEmpty() && !entriesToAdd.stream()
+                .allMatch(String::isEmpty)) {
             addGlobalEntries(type, dossierTemplateId, entriesToAdd, false, dictionaryEntryType);
         }
     }
@@ -150,7 +151,8 @@ public class DictionaryService {
         if (entriesToDelete != null && !entriesToDelete.isEmpty()) {
             deleteDossierEntries(type, dossierTemplateId, entriesToDelete, dossierId, dictionaryEntryType);
         }
-        if (entriesToAdd != null && !entriesToAdd.isEmpty() && !entriesToAdd.stream().allMatch(String::isEmpty)) {
+        if (entriesToAdd != null && !entriesToAdd.isEmpty() && !entriesToAdd.stream()
+                .allMatch(String::isEmpty)) {
             addDossierEntries(type, dossierTemplateId, entriesToAdd, false, dossierId, dictionaryEntryType);
         }
     }
@@ -487,6 +489,7 @@ public class DictionaryService {
         return MagicConverter.convert(colorsService.getColors(dossierTemplateId), Colors.class);
     }
 
+
     @PreAuthorize("hasAuthority('" + ADD_UPDATE_DICTIONARY_TYPE + "')")
     public void changeAddToDictionary(String type, String dossierTemplateId, String dossierId, boolean addToDictionary) {
 

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

@@ -1,7 +1,5 @@
 package com.iqser.red.service.persistence.management.v1.processor.service;
 
-import jakarta.transaction.Transactional;
-
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -10,11 +8,12 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.configur
 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.repository.DigitalSignatureRepository;
-import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignature;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignatureType;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 import com.knecon.fforesight.tenantcommons.EncryptionDecryptionService;
 
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 

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

@@ -13,12 +13,11 @@ import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
-import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributeConfigPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributePersistenceService;
-import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttribute;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttributeType;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 
 import lombok.RequiredArgsConstructor;
 

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

@@ -1,5 +1,9 @@
 package com.iqser.red.service.persistence.management.v1.processor.service;
 
+import java.util.Set;
+
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService;
 import com.iqser.red.service.persistence.management.v1.processor.utils.DossierMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.CreateOrUpdateDossierRequest;
@@ -11,10 +15,6 @@ import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.stereotype.Service;
-
-import java.util.Set;
-
 @Slf4j
 @Service
 @RequiredArgsConstructor

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

@@ -5,6 +5,10 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributeConfigPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributePersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierAttributeConfigRepository;
+
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 
@@ -14,6 +18,10 @@ public class DossierDeletionService {
 
     private final FileDeletionService fileDeletionService;
     private final DossierService dossierService;
+    private final DictionaryManagementService dictionaryManagementService;
+    private final DossierAttributePersistenceService dossierAttributePersistenceService;
+    private final DossierAttributeConfigRepository dossierAttributeConfigRepository;
+    private final DossierAttributeConfigPersistenceService dossierAttributeConfigPersistenceService;
 
 
     @Transactional
@@ -44,6 +52,19 @@ public class DossierDeletionService {
     }
 
 
+    public void deleteAllDossiersInTemplate(String dossierTemplateId) {
+
+        for (String dossierId : dossierService.getAllDossierIdsForDossierTemplateId(dossierTemplateId)) {
+
+            fileDeletionService.hardDeleteFilesAndDataByDossierId(dossierId);
+            dictionaryManagementService.hardDeleteByDossierId(dossierId);
+            dossierAttributePersistenceService.deleteDossierAttribute(dossierId);
+            dossierService.hardDeleteDossier(dossierId);
+        }
+
+    }
+
+
     public void hardDeleteFileDataAndIndexUpdates(String dossierId, List<String> fileIds) {
 
         fileDeletionService.hardDeleteFileDataAndIndexUpdates(dossierId, fileIds);

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

@@ -1,6 +1,5 @@
 package com.iqser.red.service.persistence.management.v1.processor.service;
 
-import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -23,6 +22,7 @@ public class DossierIdFileIdRequestValidator {
     DossierManagementService dossierManagementService;
     FileStatusManagementService fileStatusManagementService;
 
+
     @Observed(name = "DossierIdFileIdRequestValidator", contextualName = "validate-request")
     public void validateRequestOrThrow404(String dossierTemplateId, Set<String> dossierIds, Set<String> fileIds) {
 

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

@@ -1,5 +1,16 @@
 package com.iqser.red.service.persistence.management.v1.processor.service;
 
+import static com.iqser.red.service.persistence.management.v1.processor.exception.DossierNotFoundException.DOSSIER_NOT_FOUND_MESSAGE;
+
+import java.time.OffsetDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.DossierNotFoundException;
 import com.iqser.red.service.persistence.management.v1.processor.utils.DossierMapper;
@@ -16,17 +27,6 @@ import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.stereotype.Service;
-
-import java.time.OffsetDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static com.iqser.red.service.persistence.management.v1.processor.exception.DossierNotFoundException.DOSSIER_NOT_FOUND_MESSAGE;
-
 @Slf4j
 @Service
 @RequiredArgsConstructor
@@ -64,8 +64,9 @@ public class DossierManagementService {
 
         List<FileModel> fileStatuses = fileStatusService.getDossierStatus(dossierId);
         var relevantFileIds = fileStatuses.stream()
-                .filter(fileStatus -> fileStatus.getDeleted() == null).map(FileModel::getId).toList();
-
+                .filter(fileStatus -> fileStatus.getDeleted() == null)
+                .map(FileModel::getId)
+                .toList();
 
         dossierDeletionService.softDeleteDossier(dossierId, relevantFileIds, now);
         fileDeletionService.reindexDeletedFiles(dossierId, relevantFileIds);
@@ -119,6 +120,7 @@ public class DossierManagementService {
 
     }
 
+
     @Transactional
     public Set<String> getAllDossierIdsForDossierTemplateId(String dossierTemplateId) {
 
@@ -208,7 +210,10 @@ public class DossierManagementService {
 
         for (String dossierId : dossierIds) {
 
-            List<String> fileIds = fileStatusService.getDossierStatus(dossierId).stream().map(FileModel::getId).collect(Collectors.toList());
+            List<String> fileIds = fileStatusService.getDossierStatus(dossierId)
+                    .stream()
+                    .map(FileModel::getId)
+                    .collect(Collectors.toList());
             dossierDeletionService.hardDeleteDossier(dossierId, fileIds);
             dossierDeletionService.hardDeleteFileDataAndIndexUpdates(dossierId, fileIds);
         }
@@ -221,10 +226,13 @@ public class DossierManagementService {
         for (String dossierId : dossierIds) {
             var dossier = dossierService.getDossierById(dossierId);
             List<FileModel> fileStatuses = fileStatusService.getDossierStatus(dossierId);
-            var relevantFileIds = fileStatuses.stream().filter(fileStatus -> fileStatus.getDeleted() != null && (fileStatus.getDeleted().equals(dossier.getSoftDeletedTime()) || fileStatus.getDeleted()
-                        .isAfter(dossier.getSoftDeletedTime()))).map(FileModel::getId).collect(Collectors.toList());
+            var relevantFileIds = fileStatuses.stream()
+                    .filter(fileStatus -> fileStatus.getDeleted() != null && (fileStatus.getDeleted().equals(dossier.getSoftDeletedTime()) || fileStatus.getDeleted()
+                            .isAfter(dossier.getSoftDeletedTime())))
+                    .map(FileModel::getId)
+                    .collect(Collectors.toList());
 
-            dossierDeletionService.undeleteDossier(dossierId,relevantFileIds,dossier.getSoftDeletedTime());
+            dossierDeletionService.undeleteDossier(dossierId, relevantFileIds, dossier.getSoftDeletedTime());
             dossierDeletionService.reindexUndeletedFiles(dossier.getDossierTemplateId(), dossierId, relevantFileIds);
 
         }

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

@@ -6,6 +6,7 @@ import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
+import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService;
 import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierEntity;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
@@ -118,6 +119,7 @@ public class DossierService {
     }
 
 
+    @Transactional
     public void hardDeleteDossier(String dossierId) {
 
         dossierPersistenceService.hardDelete(dossierId);

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

@@ -92,7 +92,6 @@ public class DossierTemplateCloneService {
         }
 
         DossierTemplateEntity clonedDossierTemplate = DossierTemplateEntity.copyDossierTemplateEntityWithoutChildEntities(dossierTemplate.get());
-        dossierTemplatePersistenceService.validateDossierTemplateForDuplicateRanks(dossierTemplateId);
         OffsetDateTime now = OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS);
         clonedDossierTemplate.setId(UUID.randomUUID().toString());
         clonedDossierTemplate.setName(cloneDossierTemplateRequest.getName());

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

@@ -3,18 +3,19 @@ package com.iqser.red.service.persistence.management.v1.processor.service;
 import static com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter.convert;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.service.DossierTemplateExportService;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.service.DossierTemplateImportService;
+import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributeConfigPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributePersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierTemplatePersistenceService;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileAttributeConfigPersistenceService;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ReportTemplatePersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.CloneDossierTemplateRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplate;
-import com.iqser.red.service.persistence.management.v1.processor.dataexchange.models.ExportDownloadRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.importexport.ImportDossierTemplateRequest;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -24,10 +25,15 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class DossierTemplateManagementService {
 
-    private final DossierTemplateExportService dossierTemplateExportService;
-    private final DossierTemplateImportService dossierTemplateImportService;
     private final DossierTemplatePersistenceService dossierTemplatePersistenceService;
     private final DossierTemplateCloneService dossierTemplateCloneService;
+    private final DossierDeletionService dossierDeletionService;
+    private final DictionaryManagementService dictionaryManagementService;
+    private final ComponentMappingService componentMappingService;
+    private final FileAttributeConfigPersistenceService fileAttributeConfigPersistenceService;
+    private final DossierAttributeConfigPersistenceService dossierAttributeConfigPersistenceService;
+    private final ReportTemplatePersistenceService reportTemplatePersistenceService;
+    private final WatermarkService watermarkService;
 
 
     public DossierTemplate createOrUpdateDossierTemplate(CreateOrUpdateDossierTemplateRequest dossierTemplate) {
@@ -48,29 +54,44 @@ public class DossierTemplateManagementService {
     }
 
 
-    public void deleteDossierTemplate(String dossierTemplateId, String deletingUserId) {
+    public void deleteDossierTemplateCompletely(String dossierTemplateId) {
 
-        dossierTemplatePersistenceService.deleteDossierTemplate(dossierTemplateId, deletingUserId);
+        watermarkService.deleteByDossierTemplateId(dossierTemplateId);
+        reportTemplatePersistenceService.deleteAllByDossierTemplateId(dossierTemplateId);
+        fileAttributeConfigPersistenceService.deleteByDossierTemplateId(dossierTemplateId);
+        dictionaryManagementService.hardDeleteByDossierTemplateId(dossierTemplateId);
+        componentMappingService.deleteByDossierTemplateId(dossierTemplateId);
+        dossierDeletionService.deleteAllDossiersInTemplate(dossierTemplateId);
+        dossierAttributeConfigPersistenceService.deleteAllDossierAttributeConfigsInTemplate(dossierTemplateId);
+        dossierTemplatePersistenceService.deleteDossierTemplate(dossierTemplateId);
+    }
+
+
+    public void softDeleteDossierTemplate(String dossierTemplateId, String userId) {
+
+        dossierTemplatePersistenceService.softDeleteDossierTemplate(dossierTemplateId, userId);
     }
 
 
     public DossierTemplate cloneDossierTemplate(String dossierTemplateId, CloneDossierTemplateRequest cloneDossierTemplateRequest) {
 
+        validateDossierTemplateForDuplicateRanks(dossierTemplateId);
         return convert(dossierTemplateCloneService.cloneDossierTemplate(dossierTemplateId, cloneDossierTemplateRequest), DossierTemplate.class);
     }
 
 
-    public JSONPrimitive<String> prepareExportDownload(ExportDownloadRequest request) {
+    public void validateDossierTemplateForDuplicateRanks(String dossierTemplateId) {
 
-        return dossierTemplateExportService.prepareExportDownload(request);
-    }
-
-
-
-    public DossierTemplate importDossierTemplate(ImportDossierTemplateRequest request) {
-
-        String dossierTemplateId = dossierTemplateImportService.importDossierTemplate(request);
-        return convert(dossierTemplatePersistenceService.getDossierTemplate(dossierTemplateId), DossierTemplate.class);
+        var duplicateRanks = dictionaryManagementService.getTypeRankSummaryList(dossierTemplateId)
+                .stream()
+                .filter(t -> t.getTypesCount() > 1)
+                .toList();
+        if (!duplicateRanks.isEmpty()) {
+            String errorMessage = "Duplicate ranks found in dossier template " + dossierTemplateId + "\n" + duplicateRanks.stream()
+                    .map(t -> String.format(" Rank %d has %d entries", t.getRank(), t.getTypesCount()))
+                    .collect(Collectors.joining("\n"));
+            throw new BadRequestException(errorMessage);
+        }
     }
 
 }

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

@@ -20,14 +20,14 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ReportTemplateRepository;
 import com.iqser.red.service.persistence.management.v1.processor.service.websocket.WebsocketService;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadStatusValue;
-import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadStatus;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadStatusValue;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.download.DownloadWithOptionRequest;
+import com.knecon.fforesight.databasetenantcommons.providers.utils.MagicConverter;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

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

@@ -4,14 +4,6 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.util.Properties;
 
-import jakarta.mail.Address;
-import jakarta.mail.Message;
-import jakarta.mail.Multipart;
-import jakarta.mail.internet.AddressException;
-import jakarta.mail.internet.InternetAddress;
-import jakarta.mail.internet.MimeBodyPart;
-import jakarta.mail.internet.MimeMultipart;
-
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.stereotype.Service;
@@ -19,6 +11,13 @@ import org.springframework.stereotype.Service;
 import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.SMTPConfiguration;
 
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.Multipart;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMultipart;
 import lombok.extern.slf4j.Slf4j;
 
 /*

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

@@ -37,7 +37,12 @@ public class EntityLogMongoWrapperService {
         if (includeUnprocessed) {
             DossierEntity dossier = dossierService.getDossierById(dossierId);
             ManualRedactions unprocessedManualRedactions = manualRedactionProviderService.getManualRedactions(fileId, ManualChangesQueryOptions.unprocessedOnlyForIds(ids));
-            entityLogEntries = entityLogMergeService.mergeEntityLogEntries(unprocessedManualRedactions, entityLogEntries.stream().map(EntityLogEntry::getId).toList(), dossier, fileId);
+            entityLogEntries = entityLogMergeService.mergeEntityLogEntries(unprocessedManualRedactions,
+                                                                           entityLogEntries.stream()
+                                                                                   .map(EntityLogEntry::getId)
+                                                                                   .toList(),
+                                                                           dossier,
+                                                                           fileId);
         }
         return entityLogEntries;
     }
@@ -47,4 +52,5 @@ public class EntityLogMongoWrapperService {
 
         return String.format("EntityLogEntry does not exist for annotationId ID \"%s\"!", annotationId);
     }
+
 }

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

@@ -45,6 +45,7 @@ public class EntityLogService {
         return entityLog;
     }
 
+
     @Observed(name = "EntityLogService", contextualName = "get-entity-log")
     public EntityLog getEntityLog(String dossierId, String fileId, boolean includeUnProcessed) {
 
@@ -52,6 +53,8 @@ public class EntityLogService {
         postProcessEntityLog(dossierId, fileId, entityLog, includeUnProcessed);
         return entityLog;
     }
+
+
     @Observed(name = "EntityLogService", contextualName = "get-entity-log")
     public EntityLog getEntityLog(String dossierId, String fileId, List<String> excludedTypes, boolean includeUnProcessed) {