hotfix: fixed startup problem

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

@@ -3,6 +3,7 @@ package com.iqser.red.persistence.service.v1.external.api.impl.controller;
 import com.iqser.red.service.persistence.management.v1.processor.entity.migration.SaasMigrationStatusEntity;
 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.migration.SaasMigrationAsyncService;
 import com.iqser.red.service.persistence.management.v1.processor.migration.SaasMigrationService;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusService;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.SaasMigrationStatusPersistenceService;
@@ -34,6 +35,8 @@ public class MigrationStatusController implements MigrationStatusResource {
 
     FileStatusService fileStatusService;
 
+    SaasMigrationAsyncService saasMigrationAsyncService;
+
 
     public MigrationStatusResponse migrationStatus() {
 
@@ -93,14 +96,14 @@ public class MigrationStatusController implements MigrationStatusResource {
             throw new BadRequestException("There are still files processing, please wait until migration has finished to retry!");
         }
 
-        saasMigrationService.requeueErrorFiles();
+        saasMigrationAsyncService.requeueErrorFiles();
 
         return ResponseEntity.ok().build();
     }
 
 
     public void retryZipFiles(){
-        saasMigrationService.restartZipFiles();
+        saasMigrationAsyncService.restartZipFiles();
     }
 
 

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

@@ -0,0 +1,45 @@
+package com.iqser.red.service.persistence.management.v1.processor.migration;
+
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import com.iqser.red.service.persistence.management.v1.processor.service.job.AutomaticAnalysisJob;
+import com.iqser.red.service.persistence.management.v1.processor.service.persistence.SaasMigrationStatusPersistenceService;
+import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.SaasMigrationStatus;
+import com.knecon.fforesight.tenantcommons.TenantContext;
+
+import lombok.AccessLevel;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
+public class SaasMigrationAsyncService {
+
+    AutomaticAnalysisJob automaticAnalysisJob;
+    SaasMigrationStatusPersistenceService saasMigrationStatusPersistenceService;
+    UncompressedFilesMigrationService uncompressedFilesMigrationService;
+    SaasMigrationService saasMigrationService;
+
+    @Async
+    public void requeueErrorFiles() {
+
+        automaticAnalysisJob.stopForTenant(TenantContext.getTenantId());
+        saasMigrationStatusPersistenceService.findAllByStatus(SaasMigrationStatus.ERROR)
+                .forEach(migrationStatus -> saasMigrationService.startMigrationForFile(migrationStatus.getDossierId(), migrationStatus.getFileId()));
+
+    }
+
+
+    @Async
+    public void restartZipFiles(){
+        log.info("Starting uncompressed files migration ...");
+        uncompressedFilesMigrationService.migrateUncompressedFiles(TenantContext.getTenantId());
+        log.info("Finished uncompressed files migration ...");
+    }
+
+
+}

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

@@ -9,7 +9,6 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId;
@@ -163,24 +162,6 @@ public class SaasMigrationService implements TenantSyncService {
     }
 
 
-    @Async
-    public void requeueErrorFiles() {
-
-        automaticAnalysisJob.stopForTenant(TenantContext.getTenantId());
-        saasMigrationStatusPersistenceService.findAllByStatus(SaasMigrationStatus.ERROR)
-                .forEach(migrationStatus -> startMigrationForFile(migrationStatus.getDossierId(), migrationStatus.getFileId()));
-
-    }
-
-
-    @Async
-    public void restartZipFiles(){
-        log.info("Starting uncompressed files migration ...");
-        uncompressedFilesMigrationService.migrateUncompressedFiles(TenantContext.getTenantId());
-        log.info("Finished uncompressed files migration ...");
-    }
-
-
     public void handleLayoutParsingFinished(String dossierId, String fileId) {
 
         if (!layoutParsingFilesExist(dossierId, fileId)) {

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

@@ -57,7 +57,7 @@ import io.micrometer.observation.aop.ObservedAspect;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@EnableAsync(proxyTargetClass=true)
+@EnableAsync
 @EnableRetry
 @EnableScheduling
 @EnableCaching