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

RED-8762: do not update addToDictionaryAction for dossier dictionaries when... #451

Merged
ali.oezyetimoglu1 merged 1 commits from RED-8762-bp3 into release/2.349.x 2024-04-15 14:03:13 +02:00
Conversation 8 Commits 1 Files Changed 1 +9 -4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ public class DictionaryService {
updateType(dossierTemplateId, toTypeId(type, dossierTemplateId), typeValue);
var dossierTypes = dictionaryPersistenceService.getAllDossierTypesForDossierTemplateAndType(dossierTemplateId, type, false);
dossierTypes.forEach(t -> this.updateDossierType(t.getType(), dossierTemplateId, typeValue, t.getDossierId()));
dossierTypes.forEach(t -> this.updateDossierType(t.getType(), dossierTemplateId, typeValue, t.getDossierId(), t));
}
@ -155,11 +155,12 @@ public class DictionaryService {
@PreAuthorize("hasAuthority('" + ADD_UPDATE_DOSSIER_DICTIONARY_TYPE + "')")
public void updateDossierType(String type, String dossierTemplateId, UpdateTypeValue typeValue, String dossierId) {
public void updateDossierType(String type, String dossierTemplateId, UpdateTypeValue typeValue, String dossierId, TypeEntity typeEntity) {
accessControlService.verifyUserIsDossierOwner(dossierId);
// we do not set the flag addToDictionaryAction when updating the global type
dictionaryManagementService.updateTypeValue(toTypeId(type, dossierTemplateId, dossierId),
if (typeEntity.isDossierDictionaryOnly()) {
dictionaryManagementService.updateTypeValue(toTypeId(type, dossierTemplateId, dossierId),
Type.builder()
.dossierTemplateId(dossierTemplateId)
.hexColor(typeValue.getHexColor())
@ -170,10 +171,14 @@ public class DictionaryService {
.isCaseInsensitive(typeValue.isCaseInsensitive())
.isRecommendation(typeValue.isRecommendation())
.description(typeValue.getDescription())
.addToDictionaryAction(typeEntity.isAddToDictionaryAction())
.label(typeValue.getLabel())
.hasDictionary(typeValue.isHasDictionary())
.autoHideSkipped(typeValue.isAutoHideSkipped())
.build());
} else {
updateType(dossierTemplateId, toTypeId(type, dossierTemplateId, dossierId), typeValue);
}
}