Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-8339: Fixes

Browse Source
This commit is contained in:
Ali Oezyetimoglu 2024-05-27 18:39:22 +02:00
parent be4769497d
commit 9c93cd32c1
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ComponentLogService.java
View File

@ -125,11 +125,13 @@ public class ComponentLogService {
if (optionalComponentLogEntry.isPresent()) { if (optionalComponentLogEntry.isPresent()) {
ComponentLogEntry componentToUpdate = optionalComponentLogEntry.get(); ComponentLogEntry componentToUpdate = optionalComponentLogEntry.get();
componentToUpdate.setOverridden(true); componentToUpdate.setOverridden(true);
componentToUpdate.setComponentValues(componentOverride.getComponentValues()); System.out.println("AAAA1: " + componentToUpdate);
componentToUpdate.getComponentValues().addAll(componentOverride.getComponentValues());
saveOverride(dossierId, fileId, componentToUpdate); saveOverride(dossierId, fileId, componentToUpdate);
auditOverride(dossierId, fileId, componentToUpdate); auditOverride(dossierId, fileId, componentToUpdate);
} else { } else {
componentOverride.setOverridden(true); componentOverride.setOverridden(true);
System.out.println("AAAA2: " + componentOverride);
insertOverride(dossierId, fileId, componentOverride); insertOverride(dossierId, fileId, componentOverride);
auditOverride(dossierId, fileId, componentOverride); auditOverride(dossierId, fileId, componentOverride);
} }

8
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java
View File

@ -16,7 +16,6 @@ import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemp
import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider; import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLog;
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
import com.iqser.red.service.persistence.service.v2.api.external.model.Component; import com.iqser.red.service.persistence.service.v2.api.external.model.Component;
import com.iqser.red.service.persistence.service.v2.api.external.model.ComponentValue; import com.iqser.red.service.persistence.service.v2.api.external.model.ComponentValue;
@ -68,10 +67,7 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest
var componentLogJson = new ClassPathResource("files/componentlog/exampleComponentLog.json"); var componentLogJson = new ClassPathResource("files/componentlog/exampleComponentLog.json");
// ComponentLog componentLog = objectMapper.readValue(componentLogJson.getInputStream(), ComponentLog.class);
fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.COMPONENT_LOG, componentLogJson.getInputStream()); fileManagementStorageService.storeObject(dossier.getId(), file.getId(), FileType.COMPONENT_LOG, componentLogJson.getInputStream());
ComponentLog componentLog = fileManagementStorageService.getComponentLog(dossier.getId(), file.getId());
componentClient.addOverride(dossierTemplate.getId(), dossier.getId(), file.getId(), componentOverrideModel); componentClient.addOverride(dossierTemplate.getId(), dossier.getId(), file.getId(), componentOverrideModel);
@ -83,10 +79,6 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest
assertFalse(overrides.getComponentOverrideModels().isEmpty()); assertFalse(overrides.getComponentOverrideModels().isEmpty());
var sth = componentClient.getComponents(dossierTemplate.getId(), dossier.getId(), file.getId(), true);
System.out.println(sth);
System.out.println("See ya");
} }
} }

1
persistence-service-v1/persistence-service-shared-mongo-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/mongo/service/ComponentLogMongoService.java
View File

@ -105,6 +105,7 @@ public class ComponentLogMongoService {
.map(componentLogEntry -> mapper.toComponentDocument(componentLogId, componentLogEntry)) .map(componentLogEntry -> mapper.toComponentDocument(componentLogId, componentLogEntry))
.toList(); .toList();
System.out.println("BBBB: " + componentDocuments);
componentDocumentRepository.insert(componentDocuments); componentDocumentRepository.insert(componentDocuments);
} }