DM-285: add fileName to component endpoint
This commit is contained in:
parent
07c5530631
commit
0b44b5abe7
@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
import com.iqser.red.persistence.service.v1.external.api.impl.controller.DossierTemplateController;
|
import com.iqser.red.persistence.service.v1.external.api.impl.controller.DossierTemplateController;
|
||||||
import com.iqser.red.persistence.service.v1.external.api.impl.controller.StatusController;
|
import com.iqser.red.persistence.service.v1.external.api.impl.controller.StatusController;
|
||||||
import com.iqser.red.service.persistence.management.v1.processor.service.ComponentLogService;
|
import com.iqser.red.service.persistence.management.v1.processor.service.ComponentLogService;
|
||||||
|
import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusService;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntityReference;
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntityReference;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntry;
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntry;
|
||||||
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntryValue;
|
import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntryValue;
|
||||||
@ -27,16 +28,20 @@ import com.iqser.red.service.persistence.service.v2.api.external.model.FileCompo
|
|||||||
import com.iqser.red.service.persistence.service.v2.api.external.resource.ComponentResource;
|
import com.iqser.red.service.persistence.service.v2.api.external.resource.ComponentResource;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.experimental.FieldDefaults;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
@Tag(name = "4. Component endpoints", description = "Provides operations related to components")
|
@Tag(name = "4. Component endpoints", description = "Provides operations related to components")
|
||||||
|
@FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE)
|
||||||
public class ComponentControllerV2 implements ComponentResource {
|
public class ComponentControllerV2 implements ComponentResource {
|
||||||
|
|
||||||
private final DossierTemplateController dossierTemplateController;
|
DossierTemplateController dossierTemplateController;
|
||||||
private final ComponentLogService componentLogService;
|
ComponentLogService componentLogService;
|
||||||
private final StatusController statusController;
|
StatusController statusController;
|
||||||
|
FileStatusService fileStatusService;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -46,7 +51,6 @@ public class ComponentControllerV2 implements ComponentResource {
|
|||||||
@RequestParam(name = INCLUDE_DETAILS_PARAM, defaultValue = "false", required = false) boolean includeDetails) {
|
@RequestParam(name = INCLUDE_DETAILS_PARAM, defaultValue = "false", required = false) boolean includeDetails) {
|
||||||
|
|
||||||
dossierTemplateController.getDossierTemplate(dossierTemplateId);
|
dossierTemplateController.getDossierTemplate(dossierTemplateId);
|
||||||
|
|
||||||
var componentLog = componentLogService.getComponentLog(dossierId, fileId, true);
|
var componentLog = componentLogService.getComponentLog(dossierId, fileId, true);
|
||||||
|
|
||||||
Map<String, List<String>> basicComponent = componentLog.getComponentLogEntries()
|
Map<String, List<String>> basicComponent = componentLog.getComponentLogEntries()
|
||||||
@ -65,6 +69,7 @@ public class ComponentControllerV2 implements ComponentResource {
|
|||||||
return FileComponents.builder()
|
return FileComponents.builder()
|
||||||
.dossierTemplateId(dossierTemplateId)
|
.dossierTemplateId(dossierTemplateId)
|
||||||
.dossierId(dossierId)
|
.dossierId(dossierId)
|
||||||
|
.filename(fileStatusService.getFileName(fileId))
|
||||||
.fileId(fileId)
|
.fileId(fileId)
|
||||||
.components(basicComponent)
|
.components(basicComponent)
|
||||||
.componentDetails(componentsDetails)
|
.componentDetails(componentsDetails)
|
||||||
|
|||||||
@ -741,4 +741,10 @@ public class FileStatusService {
|
|||||||
fileStatusPersistenceService.updateOCRStatus(response);
|
fileStatusPersistenceService.updateOCRStatus(response);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public String getFileName(String fileId) {
|
||||||
|
|
||||||
|
return fileStatusPersistenceService.getFileNameById(fileId);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -554,4 +554,10 @@ public class FileStatusPersistenceService {
|
|||||||
fileRepository.updateLayoutProcessedTime(fileId, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
|
fileRepository.updateLayoutProcessedTime(fileId, OffsetDateTime.now().truncatedTo(ChronoUnit.MILLIS));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public String getFileNameById(String fileId) {
|
||||||
|
|
||||||
|
return fileRepository.getFileNameById(fileId).orElseThrow();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,6 +2,7 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis
|
|||||||
|
|
||||||
import java.time.OffsetDateTime;
|
import java.time.OffsetDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
import org.springframework.data.jpa.repository.Modifying;
|
import org.springframework.data.jpa.repository.Modifying;
|
||||||
@ -225,6 +226,10 @@ public interface FileRepository extends JpaRepository<FileEntity, String> {
|
|||||||
@Query(value = "update FileEntity f set f.lastLayoutProcessed = :offsetDateTime where f.id = :fileId")
|
@Query(value = "update FileEntity f set f.lastLayoutProcessed = :offsetDateTime where f.id = :fileId")
|
||||||
void updateLayoutProcessedTime(String fileId, OffsetDateTime offsetDateTime);
|
void updateLayoutProcessedTime(String fileId, OffsetDateTime offsetDateTime);
|
||||||
|
|
||||||
|
|
||||||
|
@Query("select f.filename from FileEntity f where f.id = :fileId")
|
||||||
|
Optional<String> getFileNameById(String fileId);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user