Pull request #249: RED-3452: Code to create IMAGE_INFO.json from redactionLog

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

* commit 'd008f1f7853a55861891260f07fd1793e0374303':
  removed image liquibase task
  only create image info if it doesnt already exist
  RED-3452: Code to create IMAGE_INFO.json from redactionLog

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageService.java

@@ -0,0 +1,86 @@
+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;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MigrateImageService {
+
+    private final FileManagementStorageService fileManagementStorageService;
+    private final FileRepository fileRepository;
+    private final ObjectMapper objectMapper;
+
+
+    @SneakyThrows
+    public void migrateImagesFiles() {
+
+        List<FileEntity> 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());
+                            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("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
+                }
+            }
+
+        }
+    }
+
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/MigrateImageServiceStarter.java

@@ -0,0 +1,31 @@
+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));
+        }
+    }
+
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Classification.java

@@ -0,0 +1,14 @@
+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<String, Float> probabilities = new HashMap<>();
+    private String label;
+
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/FilterGeometry.java

@@ -0,0 +1,10 @@
+package com.iqser.red.service.peristence.v1.server.migration.image.model;
+
+import lombok.Data;
+
+@Data
+public class FilterGeometry {
+
+    private ImageSize imageSize;
+    private ImageFormat imageFormat;
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Filters.java

@@ -0,0 +1,11 @@
+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;
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Geometry.java

@@ -0,0 +1,9 @@
+package com.iqser.red.service.peristence.v1.server.migration.image.model;
+
+import lombok.Data;
+
+@Data
+public class Geometry {
+    private float width;
+    private float height;
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageFormat.java

@@ -0,0 +1,12 @@
+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;
+
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageMetadata.java

@@ -0,0 +1,12 @@
+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;
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageServiceResponse.java

@@ -0,0 +1,15 @@
+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> imageMetadata = new ArrayList<>();
+
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/ImageSize.java

@@ -0,0 +1,12 @@
+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;
+
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Position.java

@@ -0,0 +1,12 @@
+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;
+}

persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/image/model/Probability.java

@@ -0,0 +1,10 @@
+package com.iqser.red.service.peristence.v1.server.migration.image.model;
+
+import lombok.Data;
+
+@Data
+public class Probability {
+
+    private boolean unconfident;
+
+}

persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -17,5 +17,3 @@ databaseChangeLog:
       file: db/changelog/sql/7.1-set-json-fields.sql
   - include:
       file: db/changelog/sql/7.2-set-dossier-status.sql
-  - include:
-      file: db/changelog/8-remove-old-dossier-status-column.changelog.yaml