From 96eef1a7a28bd897cb16ccc66448bdc29f6ff2b6 Mon Sep 17 00:00:00 2001 From: yhampe Date: Fri, 9 Aug 2024 10:10:06 +0200 Subject: [PATCH] RED-5624: migration working on migration --- .../persistence/LegalBasisMappingPersistenceService.java | 7 ------- .../service/persistence/LegalBasisMigrationService.java | 9 +++++++++ .../api/shared/mongo/service/EntityLogMongoService.java | 6 ------ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java index 04f7089dd..7bfbe9b3a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMappingPersistenceService.java @@ -54,13 +54,6 @@ public class LegalBasisMappingPersistenceService { } - @Transactional - public List getAllLegalBasisMappingEntities() { - - return this.legalBasisMappingRepository.findAll(); - } - - private LegalBasisMappingEntity getLegalBasisMappingOrCreate(String dossierTemplateId) { return legalBasisMappingRepository.findById(dossierTemplateId) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMigrationService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMigrationService.java index b04afbb9e..da4e084fe 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMigrationService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/LegalBasisMigrationService.java @@ -11,6 +11,7 @@ import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; 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.LegalBasisMappingRepository; +import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.annotationentity.LegalBasisChangeRepository; import com.iqser.red.service.persistence.service.v1.api.shared.mongo.repository.EntityLogDocumentRepository; import jakarta.transaction.Transactional; @@ -50,6 +51,7 @@ public class LegalBasisMigrationService { private final LegalBasisMappingRepository legalBasisMappingRepository; private final EntityLogDocumentRepository entityLogDocumentRepository; private final FileRepository fileRepository; + private final LegalBasisChangeRepository legalBasisChangeRepository; public void migrate() { @@ -83,6 +85,13 @@ public class LegalBasisMigrationService { lb.setTechnicalName(getOrDefault(lb.getName())); })) .forEach(entityLogDocumentRepository::save); + this.legalBasisChangeRepository.findAll() + .stream() + .peek(entry -> { + entry.setLegalBasis(technicalNameMapping.getOrDefault(entry.getLegalBasis(), entry.getLegalBasis())); + }) + .forEach(legalBasisChangeRepository::save); + log.info("Finishing migration: Adding technical names to legal basis"); } diff --git a/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/service/EntityLogMongoService.java b/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/service/EntityLogMongoService.java index 625b1eced..cac1b8925 100644 --- a/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/service/EntityLogMongoService.java +++ b/persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/service/EntityLogMongoService.java @@ -197,12 +197,6 @@ public class EntityLogMongoService { } - public List findAllEntityLogDocuments() { - - return this.entityLogDocumentRepository.findAll(); - } - - public boolean entityLogDocumentExists(String dossierId, String fileId) { return entityLogDocumentRepository.existsById(mapper.getLogId(dossierId, fileId));