From bad3c453ddfe56c962bbaa6d865870eb5f028826 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 11 Oct 2021 21:05:14 +0300 Subject: [PATCH 1/2] added transactional --- .../service/persistence/ViewedPagesPersistenceService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java index 52bfbd701..9d4b02cb6 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java @@ -8,7 +8,6 @@ import org.springframework.stereotype.Service; import javax.transaction.Transactional; import java.time.OffsetDateTime; -import java.util.ArrayList; import java.util.List; @Service @@ -50,7 +49,8 @@ public class ViewedPagesPersistenceService { } + @Transactional public void resetViewedPages(String fileId, String currentReviewer, List viewedPagesToReset) { - viewedPagesRepository.deleteSeenPages(fileId,currentReviewer,viewedPagesToReset); + viewedPagesRepository.deleteSeenPages(fileId, currentReviewer, viewedPagesToReset); } } From de5fa8c94641400a90df3b95b24f931a2ff1d723 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 11 Oct 2021 21:09:35 +0300 Subject: [PATCH 2/2] logs for analysis required --- .../service/ReanalysisRequiredStatusService.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java index c4eda84cb..16f0b349f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ReanalysisRequiredStatusService.java @@ -7,6 +7,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist import com.iqser.red.service.persistence.management.v1.processor.service.persistence.RulesPersistenceService; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.Collections; @@ -16,6 +17,7 @@ import java.util.Map; import static com.iqser.red.service.peristence.v1.server.service.ReanalysisRequiredStatusService.VersionType.*; +@Slf4j @Service @RequiredArgsConstructor public class ReanalysisRequiredStatusService { @@ -85,7 +87,16 @@ public class ReanalysisRequiredStatusService { var legalBasisVersionMatches = fileStatus.getLegalBasisVersion() == dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L); var dossierDictionaryVersionMatches = fileStatus.getDossierDictionaryVersion() == dossierDictionaryVersion; - return !(rulesVersionMatches && dictionaryVersionMatches && legalBasisVersionMatches && dossierDictionaryVersionMatches); + var analysisRequired = !(rulesVersionMatches && dictionaryVersionMatches && legalBasisVersionMatches && dossierDictionaryVersionMatches); + + if (analysisRequired) { + log.info("For file: {} analysis is required because -> ruleVersionMatches: {}/{}, dictionaryVersionMatches: {}/{}, legalBasisVersionMatches: {}/{}, dossierDictionaryVersionMatches: {}/{}", + fileStatus.getFilename(), fileStatus.getRulesVersion(), dossierTemplateVersions.getOrDefault(RULES, -1L), + fileStatus.getDictionaryVersion(), dossierTemplateVersions.getOrDefault(DICTIONARY, -1L), + fileStatus.getLegalBasisVersion(), dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L), + fileStatus.getDossierDictionaryVersion(), dossierDictionaryVersion); + } + return analysisRequired; }