diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java index c53107fb..5ae18d99 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/mongo/EntityLogMongoService.java @@ -56,8 +56,8 @@ public class EntityLogMongoService { EntityLogDocument newEntityLogDocument = new EntityLogDocument(dossierId, fileId, entityLog); List newEntityLogEntryDocuments = newEntityLogDocument.getEntityLogEntryDocument(); - List toUpdate = new ArrayList<>(oldEntityLogEntryDocuments); - toUpdate.retainAll(newEntityLogEntryDocuments); + List toUpdate = new ArrayList<>(newEntityLogEntryDocuments); + toUpdate.retainAll(oldEntityLogEntryDocuments); List toRemove = new ArrayList<>(oldEntityLogEntryDocuments); toRemove.removeAll(toUpdate); @@ -201,6 +201,7 @@ public class EntityLogMongoService { EntityLogEntry entityLogEntry = new EntityLogEntry(); MagicConverter.copyAllFields(entityLogEntryDocument, entityLogEntry); + entityLogEntry.setId(entityLogEntryDocument.getEntryId()); return entityLogEntry; } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java index 4b44651d..e9037f80 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/AbstractRedactionIntegrationTest.java @@ -44,6 +44,8 @@ import com.iqser.red.service.redaction.v1.server.client.DictionaryClient; import com.iqser.red.service.redaction.v1.server.client.LegalBasisClient; import com.iqser.red.service.redaction.v1.server.client.RulesClient; import com.iqser.red.service.redaction.v1.server.controller.RedactionController; +import com.iqser.red.service.redaction.v1.server.mongo.EntityLogDocumentRepository; +import com.iqser.red.service.redaction.v1.server.mongo.EntityLogEntryDocumentRepository; import com.iqser.red.service.redaction.v1.server.service.AnalyzeService; import com.iqser.red.service.redaction.v1.server.service.UnprocessedChangesService; import com.iqser.red.service.redaction.v1.server.storage.RedactionStorageService; @@ -138,6 +140,11 @@ public abstract class AbstractRedactionIntegrationTest { @Autowired protected UnprocessedChangesService unprocessedChangesService; + @Autowired + protected EntityLogDocumentRepository entityLogDocumentRepository; + @Autowired + protected EntityLogEntryDocumentRepository entityLogEntryDocumentRepository; + @MockBean protected RabbitTemplate rabbitTemplate; @@ -179,6 +186,8 @@ public abstract class AbstractRedactionIntegrationTest { if (this.storageService instanceof FileSystemBackedStorageService) { ((FileSystemBackedStorageService) this.storageService).clearStorage(); } + entityLogDocumentRepository.deleteAll(); + entityLogEntryDocumentRepository.deleteAll(); }