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

hotfix: Fixed scheduling for non existing dossierDictionaries #30

Merged
dominique.eiflaender1 merged 1 commits from dossierDictSchedulingFix into master 2023-06-26 11:25:28 +02:00
Conversation 3 Commits 1 Files Changed 2 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,9 +160,9 @@ public class FileAttributesManagementService {
} }
@Transactional
public void setFileAttributes(String dossierId, String fileId, Map<String, String> fileAttributesMap) { public void setFileAttributes(String dossierId, String fileId, Map<String, String> fileAttributesMap) {
fileStatusPersistenceService.updateProcessingStatus(fileId, ProcessingStatus.REPROCESS);
fileStatusPersistenceService.setFileAttributes(dossierId, fileId, fileAttributesMap); fileStatusPersistenceService.setFileAttributes(dossierId, fileId, fileAttributesMap);
fileStatusService.setStatusReprocess(dossierId, fileId, true); fileStatusService.setStatusReprocess(dossierId, fileId, true);
indexingService.addToIndexingQueue(IndexMessageType.UPDATE, null, dossierId, fileId, 2); indexingService.addToIndexingQueue(IndexMessageType.UPDATE, null, dossierId, fileId, 2);

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

@ -121,7 +121,7 @@ public class ReanalysisRequiredStatusService {
var rulesVersionMatches = fileStatus.getRulesVersion() == dossierTemplateVersions.getOrDefault(RULES, -1L); var rulesVersionMatches = fileStatus.getRulesVersion() == dossierTemplateVersions.getOrDefault(RULES, -1L);
var dictionaryVersionMatches = fileStatus.getDictionaryVersion() == dossierTemplateVersions.getOrDefault(DICTIONARY, -1L); var dictionaryVersionMatches = fileStatus.getDictionaryVersion() == dossierTemplateVersions.getOrDefault(DICTIONARY, -1L);
var legalBasisVersionMatches = fileStatus.getLegalBasisVersion() == dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L); var legalBasisVersionMatches = fileStatus.getLegalBasisVersion() == dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L);
var dossierDictionaryVersionMatches = fileStatus.getDossierDictionaryVersion() == dossierDictionaryVersion; var dossierDictionaryVersionMatches = Math.max(fileStatus.getDossierDictionaryVersion(), 0) == dossierDictionaryVersion;
var reanalysisRequired = !dictionaryVersionMatches || !dossierDictionaryVersionMatches; var reanalysisRequired = !dictionaryVersionMatches || !dossierDictionaryVersionMatches;
var fullAnalysisRequired = !rulesVersionMatches || !legalBasisVersionMatches; var fullAnalysisRequired = !rulesVersionMatches || !legalBasisVersionMatches;
@ -135,7 +135,7 @@ public class ReanalysisRequiredStatusService {
dossierTemplateVersions.getOrDefault(DICTIONARY, -1L), dossierTemplateVersions.getOrDefault(DICTIONARY, -1L),
fileStatus.getLegalBasisVersion(), fileStatus.getLegalBasisVersion(),
dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L), dossierTemplateVersions.getOrDefault(LEGAL_BASIS, -1L),
fileStatus.getDossierDictionaryVersion(), Math.max(fileStatus.getDossierDictionaryVersion(), 0),
dossierDictionaryVersion); dossierDictionaryVersion);
} }
return new AnalysisRequiredResult(reanalysisRequired, fullAnalysisRequired); return new AnalysisRequiredResult(reanalysisRequired, fullAnalysisRequired);