Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
21eaf02a36 | ||
|
|
996aa6f35c | ||
|
|
a45440abb8 |
@ -357,9 +357,9 @@ public class DictionaryController implements DictionaryResource {
|
|||||||
public void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type,
|
public void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type,
|
||||||
@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
|
@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
|
||||||
@PathVariable(value = DOSSIER_ID_PARAMETER_NAME) String dossierId,
|
@PathVariable(value = DOSSIER_ID_PARAMETER_NAME) String dossierId,
|
||||||
@RequestParam(value = "addToDictionary") boolean addToDictionary) {
|
@RequestParam(value = "addToDictionaryAction") boolean addToDictionaryAction) {
|
||||||
|
|
||||||
dictionaryService.changeAddToDictionary(type, dossierTemplateId, dossierId, addToDictionary);
|
dictionaryService.changeAddToDictionary(type, dossierTemplateId, dossierId, addToDictionaryAction);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.utils.DossierAttributeConfigMapper;
|
||||||
import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
|
import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
|
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.AccessControlService;
|
||||||
@ -52,7 +53,7 @@ public class DossierAttributesController implements DossierAttributesResource {
|
|||||||
var result = MagicConverter.convert(dossierAttributeConfigPersistenceService.setDossierAttributesConfig(dossierTemplateId,
|
var result = MagicConverter.convert(dossierAttributeConfigPersistenceService.setDossierAttributesConfig(dossierTemplateId,
|
||||||
MagicConverter.convert(dossierAttributesConfig.getDossierAttributeConfigs(),
|
MagicConverter.convert(dossierAttributesConfig.getDossierAttributeConfigs(),
|
||||||
DossierAttributeConfigEntity.class)),
|
DossierAttributeConfigEntity.class)),
|
||||||
DossierAttributeConfig.class);
|
DossierAttributeConfig.class, new DossierAttributeConfigMapper());
|
||||||
auditPersistenceService.insertRecord(AuditRequest.builder()
|
auditPersistenceService.insertRecord(AuditRequest.builder()
|
||||||
.userId(KeycloakSecurity.getUserId())
|
.userId(KeycloakSecurity.getUserId())
|
||||||
.objectId(dossierTemplateId)
|
.objectId(dossierTemplateId)
|
||||||
@ -72,7 +73,7 @@ public class DossierAttributesController implements DossierAttributesResource {
|
|||||||
var result = MagicConverter.convert(dossierAttributeConfigPersistenceService.addOrUpdateDossierAttribute(dossierTemplateId,
|
var result = MagicConverter.convert(dossierAttributeConfigPersistenceService.addOrUpdateDossierAttribute(dossierTemplateId,
|
||||||
MagicConverter.convert(dossierAttribute,
|
MagicConverter.convert(dossierAttribute,
|
||||||
DossierAttributeConfigEntity.class)),
|
DossierAttributeConfigEntity.class)),
|
||||||
DossierAttributeConfig.class);
|
DossierAttributeConfig.class, new DossierAttributeConfigMapper());
|
||||||
auditPersistenceService.insertRecord(AuditRequest.builder()
|
auditPersistenceService.insertRecord(AuditRequest.builder()
|
||||||
.userId(KeycloakSecurity.getUserId())
|
.userId(KeycloakSecurity.getUserId())
|
||||||
.objectId(dossierTemplateId)
|
.objectId(dossierTemplateId)
|
||||||
@ -118,7 +119,7 @@ public class DossierAttributesController implements DossierAttributesResource {
|
|||||||
public DossierAttributesConfig getDossierAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
|
public DossierAttributesConfig getDossierAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
|
||||||
|
|
||||||
var result = dossierAttributeConfigPersistenceService.getDossierAttributes(dossierTemplateId);
|
var result = dossierAttributeConfigPersistenceService.getDossierAttributes(dossierTemplateId);
|
||||||
return new DossierAttributesConfig(MagicConverter.convert(result, DossierAttributeConfig.class));
|
return new DossierAttributesConfig(MagicConverter.convert(result, DossierAttributeConfig.class, new DossierAttributeConfigMapper()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
|
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.model.websocket.FileEventType;
|
import com.iqser.red.service.persistence.management.v1.processor.model.websocket.FileEventType;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.websocket.WebsocketService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.websocket.WebsocketService;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.utils.FileAttributeConfigMapper;
|
||||||
import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
|
import com.knecon.fforesight.keycloakcommons.security.KeycloakSecurity;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
|
import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
|
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
|
||||||
@ -74,7 +75,9 @@ public class FileAttributesController implements FileAttributesResource {
|
|||||||
.filenameMappingColumnHeaderName(fileAttributesConfig.getFilenameMappingColumnHeaderName())
|
.filenameMappingColumnHeaderName(fileAttributesConfig.getFilenameMappingColumnHeaderName())
|
||||||
.delimiter(fileAttributesConfig.getDelimiter())
|
.delimiter(fileAttributesConfig.getDelimiter())
|
||||||
.encoding(fileAttributesConfig.getEncoding())
|
.encoding(fileAttributesConfig.getEncoding())
|
||||||
.fileAttributeConfigs(MagicConverter.convert(fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId), FileAttributeConfig.class))
|
.fileAttributeConfigs(MagicConverter.convert(fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId),
|
||||||
|
FileAttributeConfig.class,
|
||||||
|
new FileAttributeConfigMapper()))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -96,7 +99,7 @@ public class FileAttributesController implements FileAttributesResource {
|
|||||||
dossierTemplateId))
|
dossierTemplateId))
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
return MagicConverter.convert(result, FileAttributeConfig.class);
|
return MagicConverter.convert(result, FileAttributeConfig.class, new FileAttributeConfigMapper());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -145,7 +148,7 @@ public class FileAttributesController implements FileAttributesResource {
|
|||||||
.filenameMappingColumnHeaderName(generalConfig.getFilenameMappingColumnHeaderName())
|
.filenameMappingColumnHeaderName(generalConfig.getFilenameMappingColumnHeaderName())
|
||||||
.delimiter(generalConfig.getDelimiter())
|
.delimiter(generalConfig.getDelimiter())
|
||||||
.encoding(generalConfig.getEncoding())
|
.encoding(generalConfig.getEncoding())
|
||||||
.fileAttributeConfigs(MagicConverter.convert(fileAttributeConfigs, FileAttributeConfig.class))
|
.fileAttributeConfigs(MagicConverter.convert(fileAttributeConfigs, FileAttributeConfig.class, new FileAttributeConfigMapper()))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -223,7 +223,7 @@ public interface DictionaryResource {
|
|||||||
void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type,
|
void changeFlags(@PathVariable(TYPE_PARAMETER_NAME) String type,
|
||||||
@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
|
@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
|
||||||
@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId,
|
@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId,
|
||||||
@RequestParam(value = "addToDictionary") boolean addToDictionary);
|
@RequestParam(value = "addToDictionaryAction") boolean addToDictionaryAction);
|
||||||
|
|
||||||
|
|
||||||
@PostMapping(value = DICTIONARY_REST_PATH + DIFFERENCE + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
@PostMapping(value = DICTIONARY_REST_PATH + DIFFERENCE + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
|
||||||
|
|||||||
@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
|
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
|
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributeConfigPersistenceService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierAttributeConfigPersistenceService;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.utils.DossierAttributeConfigMapper;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.internal.resources.DossierAttributesConfigResource;
|
import com.iqser.red.service.persistence.service.v1.api.internal.resources.DossierAttributesConfigResource;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig;
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig;
|
||||||
|
|
||||||
@ -27,7 +28,7 @@ public class DossierAttributesConfigInternalController implements DossierAttribu
|
|||||||
@Override
|
@Override
|
||||||
public List<DossierAttributeConfig> getDossierAttributes(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
|
public List<DossierAttributeConfig> getDossierAttributes(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
|
||||||
|
|
||||||
return convert(dossierAttributeConfigPersistenceService.getDossierAttributes(dossierTemplateId), DossierAttributeConfig.class);
|
return convert(dossierAttributeConfigPersistenceService.getDossierAttributes(dossierTemplateId), DossierAttributeConfig.class, new DossierAttributeConfigMapper());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PathVariable;
|
|||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileAttributeConfigPersistenceService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileAttributeConfigPersistenceService;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.utils.FileAttributeConfigMapper;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.internal.resources.FileAttributesConfigResource;
|
import com.iqser.red.service.persistence.service.v1.api.internal.resources.FileAttributesConfigResource;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeConfig;
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeConfig;
|
||||||
|
|
||||||
@ -25,7 +26,7 @@ public class FileAttributesConfigInternalController implements FileAttributesCon
|
|||||||
@Override
|
@Override
|
||||||
public List<FileAttributeConfig> getFileAttributeConfigs(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
|
public List<FileAttributeConfig> getFileAttributeConfigs(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId) {
|
||||||
|
|
||||||
return convert(fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId), FileAttributeConfig.class);
|
return convert(fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplateId), FileAttributeConfig.class, new FileAttributeConfigMapper());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,6 +53,8 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
|
|||||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.LegalBasisMappingPersistenceService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.LegalBasisMappingPersistenceService;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ReportTemplatePersistenceService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ReportTemplatePersistenceService;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.RulesPersistenceService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.RulesPersistenceService;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.utils.DossierAttributeConfigMapper;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.utils.FileAttributeConfigMapper;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.utils.FileSystemBackedArchiver;
|
import com.iqser.red.service.persistence.management.v1.processor.utils.FileSystemBackedArchiver;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils;
|
import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
|
||||||
@ -183,13 +185,16 @@ public class DossierTemplateExportService {
|
|||||||
fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(folder,
|
fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(folder,
|
||||||
getFilename(ExportFilename.DOSSIER_ATTRIBUTES_CONFIG, JSON_EXT),
|
getFilename(ExportFilename.DOSSIER_ATTRIBUTES_CONFIG, JSON_EXT),
|
||||||
objectMapper.writeValueAsBytes(convert(dossierAttributesConfig,
|
objectMapper.writeValueAsBytes(convert(dossierAttributesConfig,
|
||||||
DossierAttributeConfig.class))));
|
DossierAttributeConfig.class,
|
||||||
|
new DossierAttributeConfigMapper()))));
|
||||||
|
|
||||||
// add file attribute configs
|
// add file attribute configs
|
||||||
List<FileAttributeConfigEntity> fileAttributeConfigList = fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplate.getId());
|
List<FileAttributeConfigEntity> fileAttributeConfigList = fileAttributeConfigPersistenceService.getFileAttributes(dossierTemplate.getId());
|
||||||
fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(folder,
|
fileSystemBackedArchiver.addEntries(new FileSystemBackedArchiver.ArchiveModel(folder,
|
||||||
getFilename(ExportFilename.FILE_ATTRIBUTE_CONFIG, JSON_EXT),
|
getFilename(ExportFilename.FILE_ATTRIBUTE_CONFIG, JSON_EXT),
|
||||||
objectMapper.writeValueAsBytes(convert(fileAttributeConfigList, FileAttributeConfig.class))));
|
objectMapper.writeValueAsBytes(convert(fileAttributeConfigList,
|
||||||
|
FileAttributeConfig.class,
|
||||||
|
new FileAttributeConfigMapper()))));
|
||||||
|
|
||||||
// add legal basis mapping
|
// add legal basis mapping
|
||||||
List<LegalBasisEntity> legalBasisMappingList = legalBasisMappingPersistenceService.getLegalBasisMapping(dossierTemplate.getId());
|
List<LegalBasisEntity> legalBasisMappingList = legalBasisMappingPersistenceService.getLegalBasisMapping(dossierTemplate.getId());
|
||||||
|
|||||||
@ -494,9 +494,9 @@ public class DictionaryService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@PreAuthorize("hasAuthority('" + ADD_UPDATE_DICTIONARY_TYPE + "')")
|
@PreAuthorize("hasAuthority('" + ADD_UPDATE_DICTIONARY_TYPE + "')")
|
||||||
public void changeAddToDictionary(String type, String dossierTemplateId, String dossierId, boolean addToDictionary) {
|
public void changeAddToDictionary(String type, String dossierTemplateId, String dossierId, boolean addToDictionaryAction) {
|
||||||
|
|
||||||
dictionaryPersistenceService.updateAddToDictionary(toTypeId(type, dossierTemplateId, dossierId), addToDictionary);
|
dictionaryPersistenceService.updateAddToDictionary(toTypeId(type, dossierTemplateId, dossierId), addToDictionaryAction);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
|
import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
|
import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
|
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository;
|
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository;
|
||||||
@ -357,12 +358,14 @@ public class DictionaryPersistenceService {
|
|||||||
|
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void updateAddToDictionary(String typeId, boolean addToDictionary) {
|
public void updateAddToDictionary(String typeId, boolean addToDictionaryAction) {
|
||||||
|
|
||||||
var typeEntity = getType(typeId);
|
var typeEntity = getType(typeId);
|
||||||
if (typeEntity.isDossierDictionaryOnly()) {
|
if (typeEntity.isDossierDictionaryOnly()) {
|
||||||
typeEntity.setAddToDictionaryAction(addToDictionary);
|
typeEntity.setAddToDictionaryAction(addToDictionaryAction);
|
||||||
typeRepository.saveAndFlush(typeEntity);
|
typeRepository.saveAndFlush(typeEntity);
|
||||||
|
} else {
|
||||||
|
throw new BadRequestException("The addToDictionaryAction flag can only be adjusted for dossierDictionaryOnly-types.");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,16 @@
|
|||||||
|
package com.iqser.red.service.persistence.management.v1.processor.utils;
|
||||||
|
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.DossierAttributeConfigEntity;
|
||||||
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig;
|
||||||
|
|
||||||
|
public class DossierAttributeConfigMapper implements BiConsumer<DossierAttributeConfigEntity, DossierAttributeConfig> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void accept(DossierAttributeConfigEntity dossierAttributeConfigEntity, DossierAttributeConfig dossierAttributeConfig) {
|
||||||
|
|
||||||
|
dossierAttributeConfig.setDossierTemplateId(dossierAttributeConfigEntity.getDossierTemplate().getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
package com.iqser.red.service.persistence.management.v1.processor.utils;
|
||||||
|
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
|
||||||
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeConfig;
|
||||||
|
|
||||||
|
public class FileAttributeConfigMapper implements BiConsumer<FileAttributeConfigEntity, FileAttributeConfig> {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void accept(FileAttributeConfigEntity fileAttributeConfigEntity, FileAttributeConfig fileAttributeConfig) {
|
||||||
|
|
||||||
|
fileAttributeConfig.setDossierTemplateId(fileAttributeConfigEntity.getDossierTemplate().getId());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1183,7 +1183,7 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest {
|
|||||||
|
|
||||||
var type = dictionaryClient.addType(createTypeValue);
|
var type = dictionaryClient.addType(createTypeValue);
|
||||||
|
|
||||||
List<TypeValue> customTypes = dictionaryClient.getAllTypes(dossierTemplate.getId(), dossier.getId(), false).getTypes()
|
List<TypeValue> customTypes = dictionaryClient.getAllTypes(dossierTemplate.getId(), dossier.getId(), false).getTypes()
|
||||||
.stream()
|
.stream()
|
||||||
.filter(t -> !t.isSystemManaged())
|
.filter(t -> !t.isSystemManaged())
|
||||||
.toList();
|
.toList();
|
||||||
@ -1213,7 +1213,7 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest {
|
|||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testRecreateTypeAndCheckMergedDictionary() {
|
void testRecreateTypeAndCheckMergedDictionary() {
|
||||||
|
|
||||||
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
|
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
|
||||||
var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate, "TestDossier");
|
var dossier = dossierTesterAndProvider.provideTestDossier(dossierTemplate, "TestDossier");
|
||||||
@ -1240,7 +1240,10 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest {
|
|||||||
UpdateEntries updateEntries = new UpdateEntries(newDossierEntries, allEntries);
|
UpdateEntries updateEntries = new UpdateEntries(newDossierEntries, allEntries);
|
||||||
dictionaryClient.updateEntries(type.getType(), type.getDossierTemplateId(), updateEntries, dossier.getId(), DictionaryEntryType.ENTRY);
|
dictionaryClient.updateEntries(type.getType(), type.getDossierTemplateId(), updateEntries, dossier.getId(), DictionaryEntryType.ENTRY);
|
||||||
|
|
||||||
List<DictionaryEntryEntity> deleted = entryRepository.findAll().stream().filter(DictionaryEntryEntity::isDeleted).toList();
|
List<DictionaryEntryEntity> deleted = entryRepository.findAll()
|
||||||
|
.stream()
|
||||||
|
.filter(DictionaryEntryEntity::isDeleted)
|
||||||
|
.toList();
|
||||||
assertEquals(3, deleted.size());
|
assertEquals(3, deleted.size());
|
||||||
|
|
||||||
var updatedDossierDictionary = dictionaryClient.getDictionaryForType(type.getType(), dossierTemplate.getId(), dossier.getId());
|
var updatedDossierDictionary = dictionaryClient.getDictionaryForType(type.getType(), dossierTemplate.getId(), dossier.getId());
|
||||||
@ -1257,7 +1260,10 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest {
|
|||||||
|
|
||||||
assertEquals(2, deletedType1Entities.size());
|
assertEquals(2, deletedType1Entities.size());
|
||||||
|
|
||||||
deleted = entryRepository.findAll().stream().filter(DictionaryEntryEntity::isDeleted).toList();
|
deleted = entryRepository.findAll()
|
||||||
|
.stream()
|
||||||
|
.filter(DictionaryEntryEntity::isDeleted)
|
||||||
|
.toList();
|
||||||
assertEquals(2, deleted.size());
|
assertEquals(2, deleted.size());
|
||||||
|
|
||||||
// recreation
|
// recreation
|
||||||
@ -1265,7 +1271,10 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest {
|
|||||||
|
|
||||||
dictionaryClient.addEntry(type2.getType(), type2.getDossierTemplateId(), templateEntries, false, null, DictionaryEntryType.ENTRY);
|
dictionaryClient.addEntry(type2.getType(), type2.getDossierTemplateId(), templateEntries, false, null, DictionaryEntryType.ENTRY);
|
||||||
|
|
||||||
deleted = entryRepository.findAll().stream().filter(DictionaryEntryEntity::isDeleted).toList();
|
deleted = entryRepository.findAll()
|
||||||
|
.stream()
|
||||||
|
.filter(DictionaryEntryEntity::isDeleted)
|
||||||
|
.toList();
|
||||||
assertEquals(0, deleted.size());
|
assertEquals(0, deleted.size());
|
||||||
|
|
||||||
deletedType1Entities = typeRepository.findAllTypesByDossierTemplateIdOrDossierId(dossierTemplate.getId(), dossier.getId())
|
deletedType1Entities = typeRepository.findAllTypesByDossierTemplateIdOrDossierId(dossierTemplate.getId(), dossier.getId())
|
||||||
@ -1292,6 +1301,72 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testChangeFlagsSuccessful() {
|
||||||
|
|
||||||
|
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
|
||||||
|
var dossier1 = dossierTesterAndProvider.provideTestDossier(dossierTemplate, "Dossier1");
|
||||||
|
|
||||||
|
var type1 = dictionaryClient.addType(CreateTypeValue.builder()
|
||||||
|
.type("test_change_flags_true")
|
||||||
|
.label("Test Change Flags True")
|
||||||
|
.hexColor("#123456")
|
||||||
|
.rank(100)
|
||||||
|
.hint(false)
|
||||||
|
.hasDictionary(true)
|
||||||
|
.caseInsensitive(false)
|
||||||
|
.recommendation(false)
|
||||||
|
.addToDictionaryAction(false)
|
||||||
|
.dossierTemplateId(dossierTemplate.getId())
|
||||||
|
.dossierDictionaryOnly(true)
|
||||||
|
.build());
|
||||||
|
dictionaryClient.getAllTypes(dossierTemplate.getId(), dossier1.getId(), false);
|
||||||
|
|
||||||
|
|
||||||
|
dictionaryClient.changeFlags(type1.getType(), dossierTemplate.getId(), dossier1.getId(), true);
|
||||||
|
|
||||||
|
String compositeTypeId1 = type1.getType() + ":" + dossierTemplate.getId() + ":" + dossier1.getId();
|
||||||
|
var updatedTypeEntity1 = typeRepository.findById(compositeTypeId1)
|
||||||
|
.orElseThrow(() -> new AssertionError("Type entity not found in repository"));
|
||||||
|
|
||||||
|
assertThat(updatedTypeEntity1.isAddToDictionaryAction()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testChangeFlagsUnsuccessful() {
|
||||||
|
|
||||||
|
var dossierTemplate = dossierTemplateTesterAndProvider.provideTestTemplate();
|
||||||
|
var dossier2 = dossierTesterAndProvider.provideTestDossier(dossierTemplate, "Dossier2");
|
||||||
|
|
||||||
|
var type2 = dictionaryClient.addType(CreateTypeValue.builder()
|
||||||
|
.type("test_change_flags_false")
|
||||||
|
.label("Test Change Flags False")
|
||||||
|
.hexColor("#654321")
|
||||||
|
.rank(101)
|
||||||
|
.hint(false)
|
||||||
|
.hasDictionary(true)
|
||||||
|
.caseInsensitive(false)
|
||||||
|
.recommendation(false)
|
||||||
|
.addToDictionaryAction(false)
|
||||||
|
.dossierTemplateId(dossierTemplate.getId())
|
||||||
|
.dossierDictionaryOnly(false)
|
||||||
|
.build());
|
||||||
|
dictionaryClient.getAllTypes(dossierTemplate.getId(), dossier2.getId(), false);
|
||||||
|
|
||||||
|
|
||||||
|
assertThatThrownBy(() -> dictionaryClient.changeFlags(type2.getType(), dossierTemplate.getId(), dossier2.getId(), true))
|
||||||
|
.isInstanceOf(FeignException.BadRequest.class)
|
||||||
|
.hasMessageContaining("The addToDictionaryAction flag can only be adjusted for dossierDictionaryOnly-types.");
|
||||||
|
|
||||||
|
String compositeTypeId2 = type2.getType() + ":" + dossierTemplate.getId() + ":" + dossier2.getId();
|
||||||
|
var typeEntity2 = typeRepository.findById(compositeTypeId2)
|
||||||
|
.orElseThrow(() -> new AssertionError("Type entity not found in repository"));
|
||||||
|
|
||||||
|
assertThat(typeEntity2.isAddToDictionaryAction()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private static final class ListContentWithoutOrderAndWithoutDuplicatesComparator<T> implements Comparator<List<? extends T>> {
|
private static final class ListContentWithoutOrderAndWithoutDuplicatesComparator<T> implements Comparator<List<? extends T>> {
|
||||||
|
|
||||||
@SuppressWarnings("SuspiciousMethodCalls")
|
@SuppressWarnings("SuspiciousMethodCalls")
|
||||||
|
|||||||
@ -55,6 +55,7 @@ public class DossierAttributeTest extends AbstractPersistenceServerServiceTest {
|
|||||||
assertThat(created.getPlaceholder()).isEqualTo("{{dossier.attribute.Test}}");
|
assertThat(created.getPlaceholder()).isEqualTo("{{dossier.attribute.Test}}");
|
||||||
loadedAttributes = dossierAttributeConfigClient.getDossierAttributesConfig(dossier.getDossierTemplateId());
|
loadedAttributes = dossierAttributeConfigClient.getDossierAttributesConfig(dossier.getDossierTemplateId());
|
||||||
assertThat(loadedAttributes.getDossierAttributeConfigs()).isNotEmpty();
|
assertThat(loadedAttributes.getDossierAttributeConfigs()).isNotEmpty();
|
||||||
|
assertThat(loadedAttributes.getDossierAttributeConfigs().get(0).getDossierTemplateId()).isEqualTo(dossier.getDossierTemplateId());
|
||||||
|
|
||||||
attribute.setId(created.getId());
|
attribute.setId(created.getId());
|
||||||
attribute.setLabel("updated test");
|
attribute.setLabel("updated test");
|
||||||
|
|||||||
@ -124,6 +124,7 @@ public class FileAttributeTest extends AbstractPersistenceServerServiceTest {
|
|||||||
|
|
||||||
loadedConfigs = fileAttributeConfigClient.getFileAttributesConfiguration(dossier.getDossierTemplateId()).getFileAttributeConfigs();
|
loadedConfigs = fileAttributeConfigClient.getFileAttributesConfiguration(dossier.getDossierTemplateId()).getFileAttributeConfigs();
|
||||||
assertThat(loadedConfigs.size()).isEqualTo(3);
|
assertThat(loadedConfigs.size()).isEqualTo(3);
|
||||||
|
assertThat(loadedConfigs.get(0).getDossierTemplateId()).isEqualTo(dossier.getDossierTemplateId());
|
||||||
|
|
||||||
FileAttributeConfig newConfig = new FileAttributeConfig();
|
FileAttributeConfig newConfig = new FileAttributeConfig();
|
||||||
newConfig.setPrimaryAttribute(true);
|
newConfig.setPrimaryAttribute(true);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user