From bba7124cac88cdd5fad07759a66275436bfcac74 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 7 Jun 2022 15:19:37 +0300 Subject: [PATCH] RED-3842 filesize --- .../dossier/file/FileModel.java | 2 +- .../processor/entity/dossier/FileEntity.java | 2 +- .../migration/MigrationStarterService.java | 21 +++++++------------ 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java index af0bbb66c..2bc7d2fd2 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java @@ -25,7 +25,7 @@ public class FileModel { private ProcessingStatus processingStatus; private WorkflowStatus workflowStatus; private int numberOfPages; - private long fileSize; + private Long fileSize; private OffsetDateTime added; private OffsetDateTime lastUpdated; private OffsetDateTime deleted; diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java index 2c0977d74..00ecffe34 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java @@ -56,7 +56,7 @@ public class FileEntity { private int numberOfPages; @Column - private long fileSize; + private Long fileSize; @Column private OffsetDateTime added; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationStarterService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationStarterService.java index 40aed2a5c..9ab8b8a3f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationStarterService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/migration/MigrationStarterService.java @@ -1,24 +1,16 @@ package com.iqser.red.service.peristence.v1.server.migration; +import com.iqser.red.service.peristence.v1.server.migration.migrations.*; +import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings; +import com.iqser.red.service.persistence.management.v1.processor.service.persistence.MigrationPersistenceService; +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; -import com.iqser.red.service.peristence.v1.server.migration.migrations.DeleteRemovedManualAddRedactions7; -import com.iqser.red.service.peristence.v1.server.migration.migrations.DictionaryToEntityMigration2; -import com.iqser.red.service.peristence.v1.server.migration.migrations.EntityTypesMigration4; -import com.iqser.red.service.peristence.v1.server.migration.migrations.IndexMigration1; -import com.iqser.red.service.peristence.v1.server.migration.migrations.MigrateHighlights3; -import com.iqser.red.service.peristence.v1.server.migration.migrations.RemoveFalsePositiveManualRedactions6; -import com.iqser.red.service.peristence.v1.server.migration.migrations.TypeToEntityMigration5; -import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings; -import com.iqser.red.service.persistence.management.v1.processor.service.persistence.MigrationPersistenceService; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - @Slf4j @Service @RequiredArgsConstructor @@ -40,6 +32,8 @@ public class MigrationStarterService { private final ApplicationContext ctx; private final MigrationPersistenceService migrationPersistenceService; + private final FileSizeMigration8 fileSizeMigration8; + @EventListener(ApplicationReadyEvent.class) public void migrate() { @@ -58,6 +52,7 @@ public class MigrationStarterService { typeToEntityMigration5.run(); removeFalsePositiveManualRedactions6.run(); deleteRemovedManualAddRedactions7.run(); + fileSizeMigration8.run(); log.info("Migration is finished"); System.exit(SpringApplication.exit(ctx, () -> 0));