diff --git a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts index fb09ea2fc..9014d8a1e 100644 --- a/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/com.iqser.red.service.java-conventions.gradle.kts @@ -8,7 +8,7 @@ plugins { val redactionServiceVersion by rootProject.extra { "4.290.0" } val pdftronRedactionServiceVersion by rootProject.extra { "4.48.0" } -val redactionReportServiceVersion by rootProject.extra { "4.64.0" } +val redactionReportServiceVersion by rootProject.extra { "4.81.0" } val searchServiceVersion by rootProject.extra { "2.90.0" } repositories { diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java index db83eb15c..b7704cbd0 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ReportTemplateController.java @@ -76,6 +76,7 @@ public class ReportTemplateController implements ReportTemplateResource { private final FileManagementStorageService fileManagementStorageService; + @Override @PreAuthorize("hasAuthority('" + GET_REPORT_TEMPLATES + "')") public List getReportTemplatesByPlaceholder(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody JSONPrimitive placeholder) { @@ -173,6 +174,7 @@ public class ReportTemplateController implements ReportTemplateResource { var storageId = reportTemplatePersistenceService.find(templateId).getStorageId(); storageService.deleteObject(TenantContext.getTenantId(), storageId); reportTemplatePersistenceService.delete(templateId); + reportTemplatePlaceholderClient.evictReportTemplateCache(); auditPersistenceService.audit(AuditRequest.builder() .userId(KeycloakSecurity.getUserId()) .objectId(templateId) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReportTemplateService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReportTemplateService.java index 5f49cecca..478b8df2f 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReportTemplateService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ReportTemplateService.java @@ -57,7 +57,7 @@ public class ReportTemplateService { .multiFileReport(reportTemplateUploadRequest.isMultiFileReport()) .activeByDefault(reportTemplateUploadRequest.isActiveByDefault()) .build()); - reportTemplatePlaceholderClient.uploadTemplate(templateId); + reportTemplatePlaceholderClient.evictReportTemplateCache(); } else { templateId = UUID.randomUUID().toString(); reportTemplatePersistenceService.insert(reportTemplateUploadRequest.getDossierTemplateId(), diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java index 4cb71c099..4a8b6c7cc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java @@ -52,7 +52,7 @@ public class ReportTemplateTest extends AbstractPersistenceServerServiceTest { @BeforeEach public void setup() { - doNothing().when(reportTemplatePlaceholderClient).uploadTemplate(anyString()); + doNothing().when(reportTemplatePlaceholderClient).evictReportTemplateCache(); }