fixed deploy (#58)

pagopa · Nov 27, 2023 · 1f7bb0b · 1f7bb0b
1 parent e768d70
commit 1f7bb0b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/BpmnBankConfigService.java b/src/main/java/it/gov/pagopa/atmlayer/service/model/service/impl/BpmnBankConfigService.java
@@ -21,7 +21,6 @@
 public class BpmnBankConfigService {
     @Inject
     protected BpmnBankConfigRepository bankConfigRepository;
-
     @Inject
     BpmnConfigMapper bpmnConfigMapper;
 
@@ -45,7 +44,6 @@ public Uni<Optional<BpmnBankConfig>> findByConfigurationsAndFunction(String acqu
                     if (x.size() > 1) {
                         throw new AtmLayerException("Multiple BPMN found for a single configuration.", Response.Status.INTERNAL_SERVER_ERROR, AppErrorCodeEnum.ATMLM_500);
                     }
-
                     return Uni.createFrom().item(x.isEmpty() ? Optional.empty() : Optional.ofNullable(x.get(0)));
                 }));
     }

diff --git a/...n/java/it/gov/pagopa/atmlayer/service/model/service/impl/WorkflowResourceServiceImpl.java b/...n/java/it/gov/pagopa/atmlayer/service/model/service/impl/WorkflowResourceServiceImpl.java
@@ -206,13 +206,11 @@ public Uni<WorkflowResource> setDeployInfo(UUID uuid, DeployResponseDto response
                         DeployedBPMNProcessDefinitionDto deployedProcessInfo = optionalDeployedProcessDefinition.get();
                         workflowResource.setDefinitionVersionCamunda(deployedProcessInfo.getVersion());
                         workflowResource.setDeploymentId(deployedProcessInfo.getDeploymentId());
-                        workflowResource.setCamundaDefinitionId(deployedProcessInfo.getId());
                         workflowResource.setDeployedFileName(deployedProcessInfo.getName());
                         workflowResource.setDescription(deployedProcessInfo.getDescription());
                         workflowResource.setResource(deployedProcessInfo.getResource());
                         workflowResource.setStatus(StatusEnum.DEPLOYED);
-                    }
-                    if (response.getDeployedDecisionDefinitions() != null) {
+                    } else if (response.getDeployedDecisionDefinitions() != null) {
                         Map<String, DeployedDMNDecisionDefinitionDto> deployedDecisionDefinitions = response.getDeployedDecisionDefinitions();
                         Optional<DeployedDMNDecisionDefinitionDto> optionalDeployedDecisionDefinition = deployedDecisionDefinitions.values()
                                 .stream().findFirst();
@@ -222,15 +220,14 @@ public Uni<WorkflowResource> setDeployInfo(UUID uuid, DeployResponseDto response
                         DeployedDMNDecisionDefinitionDto deployedDecisionDefinition = optionalDeployedDecisionDefinition.get();
                         workflowResource.setDefinitionVersionCamunda(deployedDecisionDefinition.getVersion());
                         workflowResource.setDeploymentId(deployedDecisionDefinition.getDeploymentId());
-                        workflowResource.setCamundaDefinitionId(deployedDecisionDefinition.getId());
                         workflowResource.setDeployedFileName(deployedDecisionDefinition.getName());
                         workflowResource.setResource(deployedDecisionDefinition.getResource());
                         workflowResource.setStatus(StatusEnum.DEPLOYED);
                     } else {
-                        workflowResource.setCamundaDefinitionId(response.getId());
                         workflowResource.setDeployedFileName(response.getName());
                         workflowResource.setStatus(StatusEnum.DEPLOYED);
                     }
+                    workflowResource.setCamundaDefinitionId(response.getId());
                     return this.workflowResourceRepository.persist(workflowResource);
                 }));
     }

diff --git a/...va/it/gov/pagopa/atmlayer/service/model/service/impl/WorkflowResourceServiceImplTest.java b/...va/it/gov/pagopa/atmlayer/service/model/service/impl/WorkflowResourceServiceImplTest.java
@@ -204,11 +204,8 @@ void setDeployInfoEmptyProcessDefinitions() {
     void setDeployInfoEmptyDecisionDefinitions() {
         UUID expectedId = UUID.randomUUID();
         WorkflowResource expectedWorkflowResource = new WorkflowResource();
-        Map<String, DeployedBPMNProcessDefinitionDto> deployedProcessDefinitions = new HashMap<>();
-        deployedProcessDefinitions.put("key", new DeployedBPMNProcessDefinitionDto());
         Map<String, DeployedDMNDecisionDefinitionDto> deployedDecisionDefinitions = new HashMap<>();
         DeployResponseDto deployResponseDto = new DeployResponseDto();
-        deployResponseDto.setDeployedProcessDefinitions(deployedProcessDefinitions);
         deployResponseDto.setDeployedDecisionDefinitions(deployedDecisionDefinitions);
         when(workflowResourceRepository.findById(any(UUID.class))).thenReturn(Uni.createFrom().item(expectedWorkflowResource));
         workflowResourceService.setDeployInfo(expectedId, deployResponseDto)