RED-8702: Explore document databases to store entityLog
* remove test logging * refactor misleading naming
This commit is contained in:
parent
489cdff1f6
commit
37232ac18a
@ -49,11 +49,6 @@ tasks.named<Test>("test") {
|
|||||||
|
|
||||||
tasks.test {
|
tasks.test {
|
||||||
finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
|
finalizedBy(tasks.jacocoTestReport) // report is always generated after tests run
|
||||||
// Test Logging
|
|
||||||
|
|
||||||
testLogging {
|
|
||||||
events("standardOut", "started", "passed", "skipped", "failed")
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -70,7 +70,7 @@ public class EntityLogController implements EntityLogResource {
|
|||||||
|
|
||||||
accessControlService.checkViewPermissionsToDossier(dossierId);
|
accessControlService.checkViewPermissionsToDossier(dossierId);
|
||||||
accessControlService.validateFileResourceExistence(fileId);
|
accessControlService.validateFileResourceExistence(fileId);
|
||||||
return entityLogResponseMapper.toLogResponse(entityLogService.getEntityLogWithEntriesHavingAnalysisNumberGreaterEquals(dossierId, fileId, analysisNumber));
|
return entityLogResponseMapper.toLogResponse(entityLogService.getEntityLogWithEntriesWithEntriesByAnalysisNumber(dossierId, fileId, analysisNumber));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -142,9 +142,9 @@ public class EntityLogService {
|
|||||||
|
|
||||||
|
|
||||||
@Observed(name = "EntityLogService", contextualName = "get-entity-log")
|
@Observed(name = "EntityLogService", contextualName = "get-entity-log")
|
||||||
public EntityLog getEntityLogWithEntriesHavingAnalysisNumberGreaterEquals(String dossierId, String fileId, Integer analysisNumber) {
|
public EntityLog getEntityLogWithEntriesWithEntriesByAnalysisNumber(String dossierId, String fileId, Integer analysisNumber) {
|
||||||
|
|
||||||
EntityLog entityLog = fileManagementStorageService.getEntityLogStartingFromAnalysisNumber(dossierId, fileId, analysisNumber);
|
EntityLog entityLog = fileManagementStorageService.getEntityLogWithEntriesByAnalysisNumber(dossierId, fileId, analysisNumber);
|
||||||
postProcessEntityLog(dossierId, fileId, entityLog, false);
|
postProcessEntityLog(dossierId, fileId, entityLog, false);
|
||||||
return entityLog;
|
return entityLog;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -117,9 +117,9 @@ public class FileManagementStorageService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public EntityLog getEntityLogStartingFromAnalysisNumber(String dossierId, String fileId, Integer analysisNumber) {
|
public EntityLog getEntityLogWithEntriesByAnalysisNumber(String dossierId, String fileId, Integer analysisNumber) {
|
||||||
|
|
||||||
return entityLogMongoService.findEntityLogWithEntriesStartingFromAnalysisNumber(dossierId, fileId, analysisNumber)
|
return entityLogMongoService.findEntityLogWithEntriesByAnalysisNumber(dossierId, fileId, analysisNumber)
|
||||||
.orElseThrow(() -> new NotFoundException(getEntityLogNotFoundErrorMessage(dossierId, fileId)));
|
.orElseThrow(() -> new NotFoundException(getEntityLogNotFoundErrorMessage(dossierId, fileId)));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -268,7 +268,7 @@ public class EntityLogMongoService {
|
|||||||
return optionalEntityLog;
|
return optionalEntityLog;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<EntityLog> findEntityLogWithEntriesStartingFromAnalysisNumber(String dossierId, String fileId, Integer analysisNumber) {
|
public Optional<EntityLog> findEntityLogWithEntriesByAnalysisNumber(String dossierId, String fileId, Integer analysisNumber) {
|
||||||
|
|
||||||
String entityLogId = mapper.getLogId(dossierId, fileId);
|
String entityLogId = mapper.getLogId(dossierId, fileId);
|
||||||
Optional<EntityLog> optionalEntityLog = entityLogDocumentRepository.findEntityLogDocumentWithoutEntriesById(entityLogId)
|
Optional<EntityLog> optionalEntityLog = entityLogDocumentRepository.findEntityLogDocumentWithoutEntriesById(entityLogId)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user