Pull request #195: RED-3131

Merge in RED/persistence-service from RED-3131 to master

* commit '3575affa4cec2c274656733ad7455d031d64be8b':
  RED-3131
This commit is contained in:
Timo Bejan 2022-01-25 15:22:48 +01:00
commit 713d1fc5bc

View File

@ -9,6 +9,7 @@ import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileAttributeConfigEntity;
import com.iqser.red.service.persistence.management.v1.processor.entity.dossier.FileEntity;
import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileAttributeConfigPersistenceService;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvRequest;
@ -46,7 +47,7 @@ public class FileAttributesController implements FileAttributesResource {
private final FileStatusService fileStatusService;
private final FileAttributeConfigPersistenceService fileAttributeConfigPersistenceService;
private final FileStatusPersistenceService fileStatusPersistenceService;
private final DossierService dossierService;
private final DossierPersistenceService dossierPersistenceService;
private final IndexingService indexingService;
@ -54,7 +55,7 @@ public class FileAttributesController implements FileAttributesResource {
public ImportCsvResponse importCsv(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
@RequestBody ImportCsvRequest importCsvRequest) {
DossierEntity dossier = dossierService.getDossierById(dossierId);
DossierEntity dossier = dossierPersistenceService.getAndValidateDossier(dossierId);
FileAttributesGeneralConfigurationEntity generalConfiguration = fileAttributeConfigPersistenceService.getFileAttributesGeneralConfiguration(dossier.getDossierTemplateId());
List<FileAttributeConfigEntity> configuration = fileAttributeConfigPersistenceService.getFileAttributes(dossier.getDossierTemplateId());