diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageService.java deleted file mode 100644 index 6d9676338..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageService.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.peristence.v1.server.migration.image.model.*; -import com.iqser.red.service.peristence.v1.server.service.FileManagementStorageService; -import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity; -import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException; -import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository; -import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -import javax.transaction.Transactional; - -@Slf4j -@Service -@RequiredArgsConstructor -public class MigrateImageService { - - private final FileManagementStorageService fileManagementStorageService; - private final FileRepository fileRepository; - private final ObjectMapper objectMapper; - - - @SneakyThrows - @Transactional - public void migrateImagesFiles() { - - List files = fileRepository.findAll(); - - for (FileEntity file : files) { - - - try { - fileManagementStorageService.getStoredObjectBytes(file.getDossierId(), file.getId(), FileType.IMAGE_INFO); - } catch (Exception e) { - log.info("Migrating images for file: {}", file.getId()); - // images do not exist - - try { - var redactionLog = fileManagementStorageService.getRedactionLog(file.getDossierId(), file.getId()); - - ImageServiceResponse imageServiceResponse = new ImageServiceResponse(); - imageServiceResponse.setFileId(file.getId()); - imageServiceResponse.setDossierId(file.getDossierId()); - - for (var entry : redactionLog.getRedactionLogEntry()) { - if (entry.isImage() || entry.getType().equals("image")) { - ImageMetadata imageMetadata = new ImageMetadata(); - - Classification classification = new Classification(); - classification.setLabel(entry.getType().equals("ocr") || entry.getType().equals("image") ? "other" : entry.getType()); - imageMetadata.setClassification(classification); - - Position position = new Position(); - position.setX1(entry.getPositions().get(0).getTopLeft().getX()); - position.setY1(entry.getPositions().get(0).getTopLeft().getY()); - position.setPageNumber(entry.getPositions().get(0).getPage()); - imageMetadata.setPosition(position); - - Geometry geometry = new Geometry(); - geometry.setWidth(entry.getPositions().get(0).getWidth()); - geometry.setHeight(entry.getPositions().get(0).getHeight()); - imageMetadata.setGeometry(geometry); - - Filters filters = new Filters(); - filters.setAllPassed(!entry.getType().equals("ocr") && !entry.getType().equals("image")); - imageMetadata.setFilters(filters); - - imageServiceResponse.getImageMetadata().add(imageMetadata); - } - } - - fileManagementStorageService.storeObject(file.getDossierId(), file.getId(), - FileType.IMAGE_INFO, objectMapper.writeValueAsBytes(imageServiceResponse)); - } catch (NotFoundException nfe) { - log.debug("Object not found", nfe); - // Do nothing - } - } - - } - } - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageServiceStarter.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageServiceStarter.java deleted file mode 100644 index 9e0d51931..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageServiceStarter.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image; - -import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.context.ApplicationContext; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -@RequiredArgsConstructor -public class MigrateImageServiceStarter { - - private final MigrateImageService migrateImageService; - private final FileManagementServiceSettings settings; - private final ApplicationContext ctx; - - - @EventListener(ApplicationReadyEvent.class) - public void runMigration() { - - if (settings.isMigrateOnly()) { - migrateImageService.migrateImagesFiles(); - System.exit(SpringApplication.exit(ctx, () -> 0)); - } - } - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Classification.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Classification.java deleted file mode 100644 index 17692cf52..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Classification.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import java.util.HashMap; -import java.util.Map; - -import lombok.Data; - -@Data -public class Classification { - - private Map probabilities = new HashMap<>(); - private String label; - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/FilterGeometry.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/FilterGeometry.java deleted file mode 100644 index 716affbed..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/FilterGeometry.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class FilterGeometry { - - private ImageSize imageSize; - private ImageFormat imageFormat; -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Filters.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Filters.java deleted file mode 100644 index 6141d93fb..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Filters.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class Filters { - - private FilterGeometry geometry; - private Probability probability; - private boolean allPassed; -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Geometry.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Geometry.java deleted file mode 100644 index 9b023c44e..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Geometry.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class Geometry { - private float width; - private float height; -} \ No newline at end of file diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageFormat.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageFormat.java deleted file mode 100644 index 59a91027f..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageFormat.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class ImageFormat { - - private float quotient; - private boolean tooTall; - private boolean tooWide; - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageMetadata.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageMetadata.java deleted file mode 100644 index 3844ee81c..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageMetadata.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class ImageMetadata { - - private Classification classification; - private Position position; - private Geometry geometry; - private Filters filters; -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageServiceResponse.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageServiceResponse.java deleted file mode 100644 index 1f4dd2006..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageServiceResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import java.util.ArrayList; -import java.util.List; - -import lombok.Data; - -@Data -public class ImageServiceResponse { - - private String dossierId; - private String fileId; - private List imageMetadata = new ArrayList<>(); - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageSize.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageSize.java deleted file mode 100644 index e8f0621e5..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageSize.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class ImageSize { - - private float quotient; - private boolean tooLarge; - private boolean tooSmall; - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Position.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Position.java deleted file mode 100644 index 30d46a21e..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Position.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class Position { - private float x1; - private float x2; - private float y1; - private float y2; - private int pageNumber; -} \ No newline at end of file diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Probability.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Probability.java deleted file mode 100644 index 834768a2e..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Probability.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.migration.image.model; - -import lombok.Data; - -@Data -public class Probability { - - private boolean unconfident; - -}