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

Merge branch 'RED-9573-bp' into 'release/2.465.x'

Browse Source 
RED-9573: updated redaction-report-service version to enable updated cache mechanism

See merge request redactmanager/persistence-service!582
This commit is contained in:
Ali Oezyetimoglu 2024-07-11 09:55:13 +02:00
commit 7ab65b311d
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts
View File

@ -8,7 +8,7 @@ plugins {
val redactionServiceVersion by rootProject.extra { "4.290.0" } val redactionServiceVersion by rootProject.extra { "4.290.0" }
val pdftronRedactionServiceVersion by rootProject.extra { "4.48.0" } val pdftronRedactionServiceVersion by rootProject.extra { "4.48.0" }
val redactionReportServiceVersion by rootProject.extra { "4.64.0" } val redactionReportServiceVersion by rootProject.extra { "4.73.6" }
val searchServiceVersion by rootProject.extra { "2.90.0" } val searchServiceVersion by rootProject.extra { "2.90.0" }
repositories { repositories {

2
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java vendored
View File

@ -109,6 +109,7 @@ public class ReportTemplateController implements ReportTemplateResource {
.multiFileReport(multiFileReport) .multiFileReport(multiFileReport)
.build(); .build();
var reportTemplate = reportTemplateService.uploadTemplate(reportTemplateUploadRequest); var reportTemplate = reportTemplateService.uploadTemplate(reportTemplateUploadRequest);
reportTemplatePlaceholderClient.evictReportTemplateCache();
auditPersistenceService.audit(AuditRequest.builder() auditPersistenceService.audit(AuditRequest.builder()
.userId(KeycloakSecurity.getUserId()) .userId(KeycloakSecurity.getUserId())
.objectId(reportTemplate.getTemplateId()) .objectId(reportTemplate.getTemplateId())
@ -173,6 +174,7 @@ public class ReportTemplateController implements ReportTemplateResource {
var storageId = reportTemplatePersistenceService.find(templateId).getStorageId(); var storageId = reportTemplatePersistenceService.find(templateId).getStorageId();
storageService.deleteObject(TenantContext.getTenantId(), storageId); storageService.deleteObject(TenantContext.getTenantId(), storageId);
reportTemplatePersistenceService.delete(templateId); reportTemplatePersistenceService.delete(templateId);
reportTemplatePlaceholderClient.evictReportTemplateCache();
auditPersistenceService.audit(AuditRequest.builder() auditPersistenceService.audit(AuditRequest.builder()
.userId(KeycloakSecurity.getUserId()) .userId(KeycloakSecurity.getUserId())
.objectId(templateId) .objectId(templateId)

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

@ -57,7 +57,7 @@ public class ReportTemplateService {
.multiFileReport(reportTemplateUploadRequest.isMultiFileReport()) .multiFileReport(reportTemplateUploadRequest.isMultiFileReport())
.activeByDefault(reportTemplateUploadRequest.isActiveByDefault()) .activeByDefault(reportTemplateUploadRequest.isActiveByDefault())
.build()); .build());
reportTemplatePlaceholderClient.uploadTemplate(templateId); reportTemplatePlaceholderClient.evictReportTemplateCache();
} else { } else {
templateId = UUID.randomUUID().toString(); templateId = UUID.randomUUID().toString();
reportTemplatePersistenceService.insert(reportTemplateUploadRequest.getDossierTemplateId(), reportTemplatePersistenceService.insert(reportTemplateUploadRequest.getDossierTemplateId(),

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

@ -52,7 +52,7 @@ public class ReportTemplateTest extends AbstractPersistenceServerServiceTest {
@BeforeEach @BeforeEach
public void setup() { public void setup() {
doNothing().when(reportTemplatePlaceholderClient).uploadTemplate(anyString()); doNothing().when(reportTemplatePlaceholderClient).evictReportTemplateCache();
} }