Merge branch 'main' of https://github.com/pagopa/selfcare-onboarding …

…into bugfix/SELC-5547 � Conflicts: � apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/registry/RegistryManagerADE.java � apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/registry/RegistryManagerInfocamere.java
pagopa · Dec 12, 2024 · 13791b4 · 13791b4
2 parents 324c493 + 8f5acbc
commit 13791b4
Show file tree

Hide file tree

Showing 43 changed files with 994 additions and 717 deletions.
diff --git a/apps/onboarding-cdc/pom.xml b/apps/onboarding-cdc/pom.xml
@@ -14,7 +14,7 @@
     <version>1.0.0-SNAPSHOT</version>
     <properties>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
-        <lombok.version>1.18.28</lombok.version>
+        <lombok.version>1.18.36</lombok.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/apps/onboarding-functions/pom.xml b/apps/onboarding-functions/pom.xml
@@ -22,7 +22,7 @@
     <skipITs>true</skipITs>
     <surefire-plugin.version>3.1.2</surefire-plugin.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
-    <commons-sdk-version>0.5.1</commons-sdk-version>
+    <commons-sdk-version>0.6.2</commons-sdk-version>
   </properties>
 
   <dependencyManagement>

diff --git a/...onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/BusinessData.java b/...onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/BusinessData.java
@@ -5,6 +5,7 @@ public class BusinessData {
     private String businessRegisterNumber;
     private String legalRegisterNumber;
     private String legalRegisterName;
+    private boolean longTermPayments;
 
     public String getBusinessRegisterNumber() {
         return businessRegisterNumber;
@@ -29,4 +30,12 @@ public String getLegalRegisterName() {
     public void setLegalRegisterName(String legalRegisterName) {
         this.legalRegisterName = legalRegisterName;
     }
+
+    public boolean isLongTermPayments() {
+        return longTermPayments;
+    }
+
+    public void setLongTermPayments(boolean longTermPayments) {
+        this.longTermPayments = longTermPayments;
+    }
 }
diff --git a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/Token.java b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/entity/Token.java
@@ -15,6 +15,7 @@ public class Token {
     private TokenType type;
     private String onboardingId;
     private String productId;
+    private String name;
     private String checksum;
     private String contractVersion;
     private String contractTemplate;
@@ -129,5 +130,9 @@ public String getContractFilename() {
     public void setContractFilename(String contractFilename) {
         this.contractFilename = contractFilename;
     }
+
+    public String getName() { return name; }
+
+    public void setName(String name) { this.name = name; }
 }
 
diff --git a/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java b/...ding-functions/src/main/java/it/pagopa/selfcare/onboarding/service/OnboardingService.java
@@ -157,7 +157,7 @@ public void saveTokenWithAttachment(OnboardingAttachment onboardingAttachment) {
 
   private boolean checkTokenExist(Onboarding onboarding) {
     // Skip if token already exists
-    Optional<Token> optToken = tokenRepository.findByOnboardingId(onboarding.getId());
+    Optional<Token> optToken = tokenRepository.findByIdOptional(onboarding.getId());
     if (optToken.isPresent()) {
       log.debug("Token has already exists for onboarding {}", onboarding.getId());
       return true;
@@ -191,6 +191,7 @@ private void saveTokenAttachment(
     // Persist token entity
     Token token = buildBaseToken(onboarding, digest);
     token.setId(UUID.randomUUID().toString());
+    token.setName(attachmentTemplate.getName());
     token.setContractTemplate(attachmentTemplate.getTemplatePath());
     token.setContractVersion(attachmentTemplate.getTemplateVersion());
     token.setContractFilename(

diff --git a/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/PdfMapper.java b/apps/onboarding-functions/src/main/java/it/pagopa/selfcare/onboarding/utils/PdfMapper.java
@@ -6,9 +6,18 @@
 import it.pagopa.selfcare.onboarding.common.InstitutionType;
 import it.pagopa.selfcare.onboarding.common.Origin;
 import it.pagopa.selfcare.onboarding.common.PricingPlan;
-import it.pagopa.selfcare.onboarding.entity.*;
+import it.pagopa.selfcare.onboarding.entity.Billing;
+import it.pagopa.selfcare.onboarding.entity.GeographicTaxonomy;
+import it.pagopa.selfcare.onboarding.entity.Institution;
+import it.pagopa.selfcare.onboarding.entity.Onboarding;
+import it.pagopa.selfcare.onboarding.entity.User;
 import it.pagopa.selfcare.onboarding.exception.GenericOnboardingException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import org.apache.commons.lang3.StringUtils;
 import org.openapi.quarkus.user_registry_json.model.CertifiableFieldResourceOfstring;
 import org.openapi.quarkus.user_registry_json.model.UserResource;
@@ -100,6 +109,9 @@ public static Map<String, Object> setUpCommonData(
 
   public static Map<String, Object> setUpAttachmentData(Onboarding onboarding) {
     Map<String, Object> map = new HashMap<>();
+    map.put(INSTITUTION_NAME, onboarding.getInstitution().getDescription());
+    map.put("institutionTaxCode", Optional.ofNullable(onboarding.getInstitution().getTaxCode()).orElse(UNDERSCORE));
+    map.put("institutionMail", onboarding.getInstitution().getDigitalAddress());
     if (Objects.nonNull(onboarding.getInstitution().getGpuData())) {
       map.put(
           "businessRegisterNumber",
@@ -113,19 +125,12 @@ public static Map<String, Object> setUpAttachmentData(Onboarding onboarding) {
           "legalRegisterName",
           Optional.ofNullable(onboarding.getInstitution().getGpuData().getLegalRegisterName())
               .orElse(UNDERSCORE));
-      map.put("manager", onboarding.getInstitution().getGpuData().isManager() ? "Si" : "No");
-      map.put(
-          "managerAuthorized",
-          onboarding.getInstitution().getGpuData().isManagerAuthorized() ? "Si" : "No");
-      map.put(
-          "managerEligible",
-          onboarding.getInstitution().getGpuData().isManagerEligible() ? "Si" : "No");
-      map.put(
-          "managerProsecution",
-          onboarding.getInstitution().getGpuData().isManagerProsecution() ? "Si" : "No");
-      map.put(
-          "institutionCourtMeasures",
-          onboarding.getInstitution().getGpuData().isInstitutionCourtMeasures() ? "Si" : "No");
+      map.put("businessRegisterCheckbox1", StringUtils.isNotEmpty(onboarding.getInstitution().getGpuData().getBusinessRegisterNumber()) ? "X" : "");
+      map.put("businessRegisterCheckbox2", StringUtils.isEmpty(onboarding.getInstitution().getGpuData().getBusinessRegisterNumber()) ? "X" : "");
+      map.put("publicServicesCheckbox1", StringUtils.isNotEmpty(onboarding.getInstitution().getGpuData().getLegalRegisterName()) ? "X" : "");
+      map.put("publicServicesCheckbox2", StringUtils.isEmpty(onboarding.getInstitution().getGpuData().getLegalRegisterName()) ? "X" : "");
+      map.put("longTermPaymentsCheckbox1", onboarding.getInstitution().getGpuData().isLongTermPayments() ? "X" : "");
+      map.put("longTermPaymentsCheckbox2", !onboarding.getInstitution().getGpuData().isLongTermPayments() ? "X" : "");
     }
     return map;
   }
@@ -202,6 +207,8 @@ public static void setupPRVData(
           Optional.ofNullable(onboarding.getBilling().getRecipientCode()).orElse(UNDERSCORE));
     }
 
+    map.put("isAggregatorCheckbox", Boolean.TRUE.equals(onboarding.getIsAggregator()) ? "X" : "");
+
     setECData(map, onboarding);
     addAggregatesCsvLink(onboarding, map, baseUrl);
   }

diff --git a/...ns/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorConfirmation.java b/...ns/src/main/java/it/pagopa/selfcare/onboarding/workflow/WorkflowExecutorConfirmation.java
@@ -11,12 +11,18 @@
 import java.util.Optional;
 
 import static it.pagopa.selfcare.onboarding.entity.OnboardingWorkflowType.INSTITUTION;
+import static it.pagopa.selfcare.onboarding.functions.utils.ActivityName.*;
+import static it.pagopa.selfcare.onboarding.utils.Utils.getOnboardingWorkflowString;
 
-public record WorkflowExecutorConfirmation(ObjectMapper objectMapper, TaskOptions optionsRetry) implements WorkflowExecutor {
+public record WorkflowExecutorConfirmation(ObjectMapper objectMapper,
+                                           TaskOptions optionsRetry) implements WorkflowExecutor {
 
     @Override
     public Optional<OnboardingStatus> executeRequestState(TaskOrchestrationContext ctx, OnboardingWorkflow onboardingWorkflow) {
-        return Optional.empty();
+        String onboardingWorkflowString = getOnboardingWorkflowString(objectMapper, onboardingWorkflow);
+        ctx.callActivity(BUILD_CONTRACT_ACTIVITY_NAME, onboardingWorkflowString, optionsRetry, String.class).await();
+        ctx.callActivity(SAVE_TOKEN_WITH_CONTRACT_ACTIVITY_NAME, onboardingWorkflowString, optionsRetry, String.class).await();
+        return Optional.of(OnboardingStatus.PENDING);
     }
 
     @Override

diff --git a/...-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java b/...-functions/src/test/java/it/pagopa/selfcare/onboarding/service/OnboardingServiceTest.java
@@ -251,27 +251,18 @@ private static AttachmentTemplate createDummyAttachmentTemplate() {
     return attachmentTemplate;
   }
 
-  private static Map<String, ContractTemplate> createDummyContractTemplateUser() {
-    Map<String, ContractTemplate> institutionTemplate = new HashMap<>();
-    ContractTemplate conctractTemplate = new ContractTemplate();
-    conctractTemplate.setContractTemplatePath("example");
-    conctractTemplate.setContractTemplateVersion("version");
-    institutionTemplate.put("default", conctractTemplate);
-    return institutionTemplate;
-  }
-
   @Test
   void saveToken_shouldSkipIfTokenExists() {
     OnboardingWorkflow onboardingWorkflow = new OnboardingWorkflowInstitution();
     Onboarding onboarding = createOnboarding();
     Token token = createDummyToken();
     onboardingWorkflow.setOnboarding(onboarding);
 
-    when(tokenRepository.findByOnboardingId(onboarding.getId())).thenReturn(Optional.of(token));
+    when(tokenRepository.findByIdOptional(onboarding.getId())).thenReturn(Optional.of(token));
 
     onboardingService.saveTokenWithContract(onboardingWorkflow);
 
-    Mockito.verify(tokenRepository, Mockito.times(1)).findByOnboardingId(onboarding.getId());
+    Mockito.verify(tokenRepository, Mockito.times(1)).findByIdOptional(onboarding.getId());
     Mockito.verifyNoMoreInteractions(tokenRepository);
   }
 
@@ -340,6 +331,7 @@ void saveTokenAttachment() {
     ArgumentCaptor<Token> tokenArgumentCaptor = ArgumentCaptor.forClass(Token.class);
     Mockito.verify(tokenRepository, Mockito.times(1)).persist(tokenArgumentCaptor.capture());
     assertEquals(onboarding.getProductId(), tokenArgumentCaptor.getValue().getProductId());
+    assertEquals(attachmentTemplate.getName(), tokenArgumentCaptor.getValue().getName());
     assertEquals(digestExpected, tokenArgumentCaptor.getValue().getChecksum());
   }