fix: promote to Main

fix: promote to Main

Author: stedelia

.devops/code-review-pipelines.yml

@@ -45,12 +45,12 @@ steps:
   - task: Maven@3
     inputs:
       mavenPomFile: 'pom.xml'
-      goals: 'clean org.jacoco:jacoco-maven-plugin:0.8.8:prepare-agent verify org.jacoco:jacoco-maven-plugin:0.8.8:report org.jacoco:jacoco-maven-plugin:0.8.8:report-aggregate '
+      goals: 'clean org.jacoco:jacoco-maven-plugin:0.8.12:prepare-agent verify org.jacoco:jacoco-maven-plugin:0.8.12:report org.jacoco:jacoco-maven-plugin:0.8.12:report-aggregate '
       options: '-B'
       publishJUnitResults: true
       testResultsFiles: '**/surefire-reports/TEST-*.xml'
       javaHomeOption: 'JDKVersion'
-      jdkVersionOption: '1.17'
+      jdkVersionOption: '1.21'
       mavenVersionOption: 'Default'
       mavenAuthenticateFeed: false
       effectivePomSkip: false
@@ -67,7 +67,7 @@ steps:
       options: '-B -Dsonar.coverage.jacoco.xmlReportPaths=$(xmlReportPaths)'
       publishJUnitResults: false
       javaHomeOption: 'JDKVersion'
-      jdkVersionOption: '1.17'
+      jdkVersionOption: '1.21'
       mavenVersionOption: 'Default'
       mavenAuthenticateFeed: false
       effectivePomSkip: false

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # see https://help.github.com/en/articles/about-code-owners#example-of-a-codeowners-file
-
-* @pagopa/idpay-app-maintainer-team @stedelia
+# Add the repository's code owners here
+* @pagopa/idpay-app-maintainer-team @pagopa/idpay-approver-team @dariopelliccioli

.github/workflows/anchore.yml

@@ -37,7 +37,7 @@ jobs:
     environment: dev
     steps:
       - name: Checkout the code
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2
       - name: Build the Docker image
         run: docker build . --file ${{ env.DOCKERFILE }} --tag localbuild/testimage:latest
       - name: Run the Anchore Grype scan action

.github/workflows/flow-docker-snapshot.yml

@@ -0,0 +1,88 @@
+name: 📦 Flow Snapshot Docker
+
+on:
+  push:
+    branches-ignore:
+      - 'main'
+    paths-ignore:
+      - 'CODEOWNERS'
+      - '**.md'
+      - '.**'
+  workflow_dispatch:
+    inputs:
+      docker_build_enabled:
+        description: 'Enable Docker build'
+        required: false
+        default: 'true'
+      azdo_trigger_enabled:
+        description: 'Enable Azure DevOps trigger'
+        required: false
+        default: 'true'
+      argocd_target_branch:
+          description: 'argocd target branch name'
+          required: false
+          default: 'main'
+      postman_branch:
+        description: postman branch name'
+        required: false
+        default: 'release-dev'
+
+env:
+  # branch choosed by workflow_dispatch or by push event
+  CURRENT_BRANCH: ${{ github.event.inputs.branch || github.ref_name }}
+
+jobs:
+  checkout:
+    name: 🔖 Checkout Repository
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2
+        with:
+          ref: ${{ env.CURRENT_BRANCH }}
+
+  docker-build:
+    name: 📦 Docker Build and Push
+    needs: checkout
+    runs-on: ubuntu-22.04
+    if: ${{ github.event_name == 'push' || github.event.inputs.docker_build_enabled == 'true' }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2
+        with:
+          ref: ${{ env.CURRENT_BRANCH }}
+
+      - name: Run Snapshot Docker Build/Push
+        # https://github.com/pagopa/github-actions-template/releases/tag/v2.0.0
+        uses: pagopa/github-actions-template/payments-flow-docker-snapshot@b825ee193430395706a4a7e580b8435bdded0227
+        with:
+          current_branch: ${{ github.ref_name }}
+
+  azure-devops-trigger:
+    name: 🅰️ Azure DevOps Pipeline Trigger
+    needs: docker-build
+    runs-on: ubuntu-22.04
+    if: |
+      always() &&
+      needs.docker-build.result != 'failure' &&
+      github.event.inputs.azdo_trigger_enabled == 'true'
+    steps:
+      - name: Trigger Azure DevOps Pipeline
+        # https://github.com/pagopa/github-actions-template/releases/tag/v2.1.0
+        uses: pagopa/github-actions-template/azure-devops-trigger-pipeline@cad30356d9046af6e7b0cee43db4cf919cc408f9
+        with:
+          enable_azure_devops_step: 'true'
+          azure_devops_project_url: 'https://dev.azure.com/pagopaspa/idpay-itn-projects'
+          azure_devops_pipeline_name: 'idpay-deploy-aks.deploy'
+          azure_devops_pat: ${{ secrets.AZURE_DEVOPS_TOKEN }}
+          azure_template_parameters: |
+            {
+              "APPS_TOP": "[idpay-onboarding-workflow]",
+              "APPS_MID": "[]",
+              "APPS_EXT": "[]",
+              "ARGOCD_TARGET_BRANCH": "${{ github.event.inputs.argocd_target_branch }}",
+              "POSTMAN_BRANCH": "${{ github.event.inputs.postman_branch }}",
+              "TRIGGER_MESSAGE": "idpay-onboarding-workflow"
+            }
+
+

.github/workflows/release.yml

@@ -1,37 +1,37 @@
 name: Release
 
 on:
-  # Trigger the workflow on push or pull request,
-  # but only for the main branch
+  # Trigger the workflow on push on the main branch
   push:
     branches:
       - main
     paths-ignore:
-      - "CODEOWNERS"
-      - "**.md"
-      - ".**"
+      - 'CODEOWNERS'
+      - '**.md'
+      - '.**'
+
+permissions:
+  packages: write
+  contents: write
+
 
 jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    environment: prod
+  checkout:
+    name: 🔖 Checkout Repository
+    runs-on: ubuntu-22.04
     steps:
-      - name: Checkout
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
-        with:
-          persist-credentials: false
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d #v3.8.1
+      - name: Checkout code
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
         with:
-          node-version: 20
-          scope: 'cycjimmy'
-      - name: Release
-        uses: cycjimmy/semantic-release-action@61680d0e9b02ff86f5648ade99e01be17f0260a4 #v4.0.0
+          ref: ${{ github.ref_name }}
+
+  flow-release:
+    name: 🚀 Release
+    runs-on: ubuntu-22.04
+    needs: checkout
+    steps:
+      - name: 🚀 release + docker
+        # https://github.com/pagopa/github-actions-template/releases/tag/v2.1.1
+        uses: pagopa/github-actions-template/payments-flow-release@e67e0ec4bb01d6cb5065e311ba0e1c92c49966a7
         with:
-          extra_plugins: |
-            semantic-release/release-notes-generator#c466b7165be2a0e5988676174e4bc244c991d669 #v11.0.7
-            semantic-release/git#3e934d45f97fd07a63617c0fc098c9ed3e67d97a #v10.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          current_branch: ${{ github.ref_name }}

Dockerfile

@@ -1,7 +1,8 @@
+
 #
 # Build
 #
-FROM maven:3.9.6-amazoncorretto-17-al2023@sha256:459be099faa25a32c06cd45ed1ef2bc9dbbf8a5414da4e72349459a1bb4d6166 AS buildtime
+FROM maven:3.9.9-amazoncorretto-21-al2023@sha256:281aeb7254dde09226bde36c2ce236ead71c6451298986a79fa542bc26444225 AS buildtime
 
 WORKDIR /build
 COPY . .
@@ -11,7 +12,7 @@ RUN mvn clean package -DskipTests
 #
 # Docker RUNTIME
 #
-FROM amazoncorretto:17-alpine3.20@sha256:38b44a49bfd11b925015b281d3d35c845daaeca5f0e3827f8e1df9bedf7b256a AS runtime
+FROM amazoncorretto:21-alpine3.20@sha256:ca05e809506b30f75a5b90f766b177e3ae996ac606b63499b4bd75b1b7890451 AS runtime
 
 RUN apk --no-cache add shadow
 RUN useradd --uid 10000 runner
@@ -21,7 +22,7 @@ WORKDIR /app
 
 COPY --from=buildtime /build/target/*.jar /app/app.jar
 # The agent is enabled at runtime via JAVA_TOOL_OPTIONS.
-ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.7.0/applicationinsights-agent-3.7.0.jar /app/applicationinsights-agent.jar
+ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.7.1/applicationinsights-agent-3.7.1.jar /app/applicationinsights-agent.jar
 
 RUN chown -R runner:runner /app
 

pom.xml

@@ -15,7 +15,7 @@
     <version>1.4.0</version>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
     </properties>
 
     <dependencies>
@@ -238,9 +238,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.5.3</version>
                 <configuration>
-                    <argLine>@{argLine} -Duser.timezone=Europe/Rome</argLine>
+                    <argLine>-Duser.timezone=Europe/Rome</argLine>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/it/gov/pagopa/onboarding/workflow/constants/OnboardingWorkflowConstants.java

@@ -37,7 +37,6 @@ public class OnboardingWorkflowConstants {
   public static final String ERROR_BUDGET_TERMINATED = "BUDGET_TERMINATED";
   public static final String ERROR_WHITELIST = "NOT_IN_WHITELIST";
   public static final String ERROR_TECHNICAL = "TECHNICAL_ERROR";
-
   public static final class ExceptionMessage {
     public static final String ERROR_SUSPENSION_STATUS_MSG = "It is not possible to suspend the user on initiative [%s]";
     public static final String ERROR_READMIT_STATUS_MSG = "It is not possible to readmit the user on initiative [%s]";

src/main/java/it/gov/pagopa/onboarding/workflow/controller/OnboardingControllerImpl.java

@@ -7,7 +7,6 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,7 +21,7 @@ public OnboardingControllerImpl(OnboardingService onboardingService) {
 
   public ResponseEntity<RequiredCriteriaDTO> checkPrerequisites(
       @Valid @RequestBody CheckPutDTO body,
-      @PathVariable("userId") String userId) {
+      String userId) {
     RequiredCriteriaDTO dto = onboardingService.checkPrerequisites(body.getInitiativeId(), userId,
         body.getChannel());
     if (dto == null) {
@@ -33,13 +32,13 @@ public ResponseEntity<RequiredCriteriaDTO> checkPrerequisites(
 
   public ResponseEntity<Void> onboardingCitizen(
       @Valid @RequestBody OnboardingPutDTO onBoardingPutDTO,
-      @PathVariable("userId") String userId) {
+      String userId) {
     onboardingService.putTcConsent(onBoardingPutDTO.getInitiativeId(),userId);
     return new ResponseEntity<>(HttpStatus.NO_CONTENT);
   }
 
   public ResponseEntity<OnboardingStatusDTO> onboardingStatus(
-      @PathVariable("initiativeId") String initiativeId, @PathVariable("userId") String userId) {
+      String initiativeId, String userId) {
     OnboardingStatusDTO onBoardingStatusDTO = onboardingService.getOnboardingStatus(initiativeId,
         userId);
     return new ResponseEntity<>(onBoardingStatusDTO, HttpStatus.OK);
@@ -60,7 +59,7 @@ public ResponseEntity<ResponseInitiativeOnboardingDTO> onboardingStatusList(Stri
 
   @Override
   public ResponseEntity<Void> saveConsent(@Valid @RequestBody ConsentPutDTO body,
-      @PathVariable("userId") String userId) {
+      String userId) {
     onboardingService.saveConsent(body, userId);
     return new ResponseEntity<>(HttpStatus.ACCEPTED);
   }
@@ -95,4 +94,5 @@ public  ResponseEntity<OnboardingFamilyDTO> familyUnitComposition(String initiat
     OnboardingFamilyDTO onboardingFamilyDTO = onboardingService.getfamilyUnitComposition(initiativeId, userId);
     return new ResponseEntity<>(onboardingFamilyDTO, HttpStatus.OK);
   }
+  
 }

src/main/java/it/gov/pagopa/onboarding/workflow/model/SelfDeclarationText.java renamed to src/main/java/it/gov/pagopa/onboarding/workflow/model/SelfDeclaration.java

@@ -12,7 +12,7 @@
 @Data
 @NoArgsConstructor
 @SuperBuilder
-public class SelfDeclarationText {
+public class SelfDeclaration {
 
     public static String buildId(String initiativeId, String userId) {
         return "%s_%s".formatted(userId, initiativeId);
@@ -21,5 +21,6 @@ public static String buildId(String initiativeId, String userId) {
     @Id private String id;
     private String initiativeId;
     private String userId;
+    private List<SelfDeclarationMultiValues> selfDeclarationMultiValues;
     private List<SelfDeclarationTextValues> selfDeclarationTextValues;
 }