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

hotfix: fix component sorting

Browse Source
This commit is contained in:
Kilian Schuettler 2023-11-06 15:36:32 +01:00
parent 3c374baf94
commit c1418d30dc
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
persistence-service-v1/persistence-service-external-api-impl-v2/src/main/java/com/iqser/red/persistence/service/v2/external/api/impl/controller/ComponentControllerV2.java vendored
View File

@ -4,10 +4,9 @@ import static com.iqser.red.service.persistence.service.v2.api.external.resource
import static com.iqser.red.service.persistence.service.v2.api.external.resource.DossierTemplateResource.DOSSIER_TEMPLATE_ID_PARAM;
import static com.iqser.red.service.persistence.service.v2.api.external.resource.FileResource.FILE_ID_PARAM;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
@ -53,17 +52,16 @@ public class ComponentControllerV2 implements ComponentResource {
dossierTemplateController.getDossierTemplate(dossierTemplateId);
var componentLog = componentLogService.getComponentLog(dossierId, fileId, true);
Map<String, List<String>> basicComponent = componentLog.getComponentLogEntries()
.stream()
.collect(Collectors.toMap(ComponentLogEntry::getName,
componentLogEntry -> componentLogEntry.getComponentValues().stream().map(ComponentLogEntryValue::getValue).toList()));
Map<String, Component> componentsDetails = Collections.emptyMap();
Map<String, List<String>> basicComponent = new LinkedHashMap<>();
for (ComponentLogEntry componentLogEntry : componentLog.getComponentLogEntries()) {
basicComponent.put(componentLogEntry.getName(), componentLogEntry.getComponentValues().stream().map(ComponentLogEntryValue::getValue).toList());
}
Map<String, Component> componentsDetails = new LinkedHashMap<>();
if (includeDetails) {
componentsDetails = componentLog.getComponentLogEntries()
.stream()
.collect(Collectors.toMap(ComponentLogEntry::getName, entry -> Component.builder().name(entry.getName()).componentValues(toComponentList(entry)).build()));
for (ComponentLogEntry entry : componentLog.getComponentLogEntries()) {
componentsDetails.put(entry.getName(), Component.builder().name(entry.getName()).componentValues(toComponentList(entry)).build());
}
}
return FileComponents.builder()