diff --git a/.github/workflows/04_release_deploy.yml b/.github/workflows/04_release_deploy.yml index bfe833c..8e2eff3 100644 --- a/.github/workflows/04_release_deploy.yml +++ b/.github/workflows/04_release_deploy.yml @@ -69,7 +69,7 @@ jobs: steps: - name: Semver setup id: semver_setup - uses: pagopa/github-actions-template/nodo5-semver-setup@ce252c8501c9242bd6045f7cdd650736b2f38777 + uses: pagopa/github-actions-template/nodo5-semver-setup@5225a04f93d77fe257acd37f1f1b55109583bbc4 with: semver: ${{ inputs.semver }} diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 1a9b5d4..7e4c3f7 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-nodo-cfg-data-migration description: A microservice that permits the migration from Nexi's Oracle database to PagoPA's PostgreSQL database type: application -version: 0.71.0 -appVersion: 1.0.1 +version: 0.73.0 +appVersion: 1.0.1-2-NOD-934-add-missing-fields dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index eba98b0..6cef56b 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-nodo-cfg-data-migration - tag: "1.0.1" + tag: "1.0.1-2-NOD-934-add-missing-fields" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index f9a0a5e..7bc69ed 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-nodo-cfg-data-migration - tag: "1.0.1" + tag: "1.0.1-2-NOD-934-add-missing-fields" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index de3cc17..f4f8068 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-nodo-cfg-data-migration - tag: "1.0.1" + tag: "1.0.1-2-NOD-934-add-missing-fields" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index f9eb169..f74d88a 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -1,570 +1,536 @@ { - "openapi": "3.0.1", - "info": { - "description": "A microservice that permits the migration from Nexi's Oracle database to PagoPA's PostgreSQL database", - "termsOfService": "https://www.pagopa.gov.it/", - "title": "data-migration", - "version": "1.0.1" + "openapi" : "3.0.1", + "info" : { + "description" : "A microservice that permits the migration from Nexi's Oracle database to PagoPA's PostgreSQL database", + "termsOfService" : "https://www.pagopa.gov.it/", + "title" : "data-migration", + "version" : "1.0.1-2-NOD-934-add-missing-fields" }, - "servers": [ - { - "url": "http://localhost", - "description": "Generated server url" - } - ], - "tags": [ - { - "description": "Everything about DB Migration", - "name": "DB Migration" - } - ], - "paths": { - "/info": { - "get": { - "operationId": "healthCheck", - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AppInfo" + "servers" : [ { + "url" : "http://localhost", + "description" : "Generated server url" + } ], + "tags" : [ { + "description" : "Everything about DB Migration", + "name" : "DB Migration" + } ], + "paths" : { + "/info" : { + "get" : { + "operationId" : "healthCheck", + "responses" : { + "200" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/AppInfo" } } }, - "description": "OK", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "OK", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "400": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemJson" + "400" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ProblemJson" } } }, - "description": "Bad Request", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Bad Request", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "401": { - "description": "Unauthorized", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "401" : { + "description" : "Unauthorized", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "403": { - "description": "Forbidden", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "403" : { + "description" : "Forbidden", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "429": { - "description": "Too many requests", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "429" : { + "description" : "Too many requests", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "500": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ProblemJson" + "500" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/ProblemJson" } } }, - "description": "Service unavailable", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Service unavailable", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } } }, - "security": [ - { - "ApiKey": [] - } - ], - "summary": "Return OK if application is started", - "tags": [ - "Home" - ] + "security" : [ { + "ApiKey" : [ ] + } ], + "summary" : "Return OK if application is started", + "tags" : [ "Home" ] }, - "parameters": [ - { - "description": "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", - "in": "header", - "name": "X-Request-Id", - "schema": { - "type": "string" - } + "parameters" : [ { + "description" : "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", + "in" : "header", + "name" : "X-Request-Id", + "schema" : { + "type" : "string" } - ] + } ] }, - "/restart": { - "parameters": [ - { - "description": "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", - "in": "header", - "name": "X-Request-Id", - "schema": { - "type": "string" - } + "/restart" : { + "parameters" : [ { + "description" : "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", + "in" : "header", + "name" : "X-Request-Id", + "schema" : { + "type" : "string" } - ], - "post": { - "operationId": "restart", - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + } ], + "post" : { + "operationId" : "restart", + "responses" : { + "200" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "OK", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "OK", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "401": { - "description": "Unauthorized", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "401" : { + "description" : "Unauthorized", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "404": { - "content": { - "*/*": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + "404" : { + "content" : { + "*/*" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "Not Found", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Not Found", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "409": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + "409" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "Conflict", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Conflict", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "429": { - "description": "Too many requests", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "429" : { + "description" : "Too many requests", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } } }, - "security": [ - { - "ApiKey": [] - } - ], - "summary": "Start again the migration, if interrupted", - "tags": [ - "DB Migration" - ] + "security" : [ { + "ApiKey" : [ ] + } ], + "summary" : "Start again the migration, if interrupted", + "tags" : [ "DB Migration" ] } }, - "/start": { - "parameters": [ - { - "description": "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", - "in": "header", - "name": "X-Request-Id", - "schema": { - "type": "string" - } + "/start" : { + "parameters" : [ { + "description" : "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", + "in" : "header", + "name" : "X-Request-Id", + "schema" : { + "type" : "string" } - ], - "post": { - "operationId": "start", - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + } ], + "post" : { + "operationId" : "start", + "responses" : { + "200" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "OK", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "OK", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "401": { - "description": "Unauthorized", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "401" : { + "description" : "Unauthorized", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "409": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + "409" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "Conflict", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Conflict", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "429": { - "description": "Too many requests", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "429" : { + "description" : "Too many requests", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } } }, - "security": [ - { - "ApiKey": [] - } - ], - "summary": "Start the migration", - "tags": [ - "DB Migration" - ] + "security" : [ { + "ApiKey" : [ ] + } ], + "summary" : "Start the migration", + "tags" : [ "DB Migration" ] } }, - "/status": { - "get": { - "operationId": "status", - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + "/status" : { + "get" : { + "operationId" : "status", + "responses" : { + "200" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "OK", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "OK", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "401": { - "description": "Unauthorized", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "401" : { + "description" : "Unauthorized", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "409": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + "409" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "Conflict", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Conflict", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "429": { - "description": "Too many requests", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "429" : { + "description" : "Too many requests", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "500": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + "500" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "Service unavailable", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Service unavailable", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } } }, - "security": [ - { - "ApiKey": [] - } - ], - "summary": "Get the status of the migration", - "tags": [ - "DB Migration" - ] + "security" : [ { + "ApiKey" : [ ] + } ], + "summary" : "Get the status of the migration", + "tags" : [ "DB Migration" ] }, - "parameters": [ - { - "description": "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", - "in": "header", - "name": "X-Request-Id", - "schema": { - "type": "string" - } + "parameters" : [ { + "description" : "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", + "in" : "header", + "name" : "X-Request-Id", + "schema" : { + "type" : "string" } - ] + } ] }, - "/stop": { - "parameters": [ - { - "description": "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", - "in": "header", - "name": "X-Request-Id", - "schema": { - "type": "string" - } + "/stop" : { + "parameters" : [ { + "description" : "This header identifies the call, if not passed it is self-generated. This ID is returned in the response.", + "in" : "header", + "name" : "X-Request-Id", + "schema" : { + "type" : "string" } - ], - "post": { - "operationId": "stop", - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + } ], + "post" : { + "operationId" : "stop", + "responses" : { + "200" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "OK", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "OK", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "401": { - "description": "Unauthorized", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "401" : { + "description" : "Unauthorized", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "409": { - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/MigrationExecutionMessage" + "409" : { + "content" : { + "application/json" : { + "schema" : { + "$ref" : "#/components/schemas/MigrationExecutionMessage" } } }, - "description": "Conflict", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "description" : "Conflict", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } }, - "429": { - "description": "Too many requests", - "headers": { - "X-Request-Id": { - "description": "This header identifies the call", - "schema": { - "type": "string" + "429" : { + "description" : "Too many requests", + "headers" : { + "X-Request-Id" : { + "description" : "This header identifies the call", + "schema" : { + "type" : "string" } } } } }, - "security": [ - { - "ApiKey": [] - } - ], - "summary": "Stop the migration", - "tags": [ - "DB Migration" - ] + "security" : [ { + "ApiKey" : [ ] + } ], + "summary" : "Stop the migration", + "tags" : [ "DB Migration" ] } } }, - "components": { - "schemas": { - "AppInfo": { - "type": "object", - "properties": { - "environment": { - "type": "string" + "components" : { + "schemas" : { + "AppInfo" : { + "type" : "object", + "properties" : { + "environment" : { + "type" : "string" }, - "name": { - "type": "string" + "name" : { + "type" : "string" }, - "oracleDBStatus": { - "type": "string" + "oracleDBStatus" : { + "type" : "string" }, - "postgresDBStatus": { - "type": "string" + "postgresDBStatus" : { + "type" : "string" }, - "version": { - "type": "string" + "version" : { + "type" : "string" } } }, - "MigrationExecutionMessage": { - "type": "object", - "properties": { - "message": { - "type": "string" + "MigrationExecutionMessage" : { + "type" : "object", + "properties" : { + "message" : { + "type" : "string" } } }, - "ProblemJson": { - "type": "object", - "properties": { - "detail": { - "type": "string", - "description": "A human readable explanation specific to this occurrence of the problem.", - "example": "There was an error processing the request" + "ProblemJson" : { + "type" : "object", + "properties" : { + "detail" : { + "type" : "string", + "description" : "A human readable explanation specific to this occurrence of the problem.", + "example" : "There was an error processing the request" }, - "status": { - "maximum": 600, - "minimum": 100, - "type": "integer", - "description": "The HTTP status code generated by the origin server for this occurrence of the problem.", - "format": "int32", - "example": 200 + "status" : { + "maximum" : 600, + "minimum" : 100, + "type" : "integer", + "description" : "The HTTP status code generated by the origin server for this occurrence of the problem.", + "format" : "int32", + "example" : 200 }, - "title": { - "type": "string", - "description": "A short, summary of the problem type. Written in english and readable for engineers (usually not suited for non technical stakeholders and not localized); example: Service Unavailable" + "title" : { + "type" : "string", + "description" : "A short, summary of the problem type. Written in english and readable for engineers (usually not suited for non technical stakeholders and not localized); example: Service Unavailable" } } } }, - "securitySchemes": { - "ApiKey": { - "description": "The API key to access this function app.", - "in": "header", - "name": "Ocp-Apim-Subscription-Key", - "type": "apiKey" + "securitySchemes" : { + "ApiKey" : { + "description" : "The API key to access this function app.", + "in" : "header", + "name" : "Ocp-Apim-Subscription-Key", + "type" : "apiKey" } } } -} +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 311bc3b..127d7c7 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ it.gov.pagopa.nodo data-migration - 1.0.1 + 1.0.1-2-NOD-934-add-missing-fields A microservice that permits the migration from Nexi's Oracle database to PagoPA's PostgreSQL database 17 diff --git a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CanaliNodo.java b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CanaliNodo.java index f22e3f7..add8834 100644 --- a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CanaliNodo.java +++ b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CanaliNodo.java @@ -98,4 +98,8 @@ public class CanaliNodo { @Convert(converter = YesNoConverter.class) @Column(name = "FLAG_TRAVASO", nullable = false) private Boolean flagPspCp = false; + + @Column(name = "FLAG_STANDIN") + @Convert(converter = YesNoConverter.class) + private Boolean flagStandin; } diff --git a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiDetail.java b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiDetail.java index d0d1e26..1821b1c 100644 --- a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiDetail.java +++ b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiDetail.java @@ -40,4 +40,7 @@ public class CdiDetail { @Column(name = "LOGO_SERVIZIO") @ToString.Exclude private byte[] logoServizio; + + @Column(name = "CANALE_APP") + private Long canaleApp; } diff --git a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiMaster.java b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiMaster.java index a93fcae..0fcc559 100644 --- a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiMaster.java +++ b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/CdiMaster.java @@ -58,4 +58,10 @@ public class CdiMaster { @OneToMany(fetch = FetchType.LAZY, mappedBy = "fkCdiMaster", cascade = CascadeType.REMOVE) @ToString.Exclude private List cdiDetail; + + @Column(name = "URL_INFORMATIVA_PSP") + private String urlInformativaPsp; + + @Column(name = "URL_CONVENZIONI_PSP") + private String urlConvenzioniPsp; } diff --git a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Iban.java b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Iban.java index 22ee7a3..9c52952 100644 --- a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Iban.java +++ b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Iban.java @@ -53,4 +53,7 @@ public class Iban { @OneToMany(fetch = FetchType.LAZY, mappedBy = "fkIban") @EqualsAndHashCode.Exclude private List ibanMasters; + + @Column(name = "RAGIONE_SOCIALE") + private String ragioneSociale; } diff --git a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/InformativePaMaster.java b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/InformativePaMaster.java index 11bbdf3..337e4c3 100644 --- a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/InformativePaMaster.java +++ b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/InformativePaMaster.java @@ -41,4 +41,7 @@ public class InformativePaMaster { @Column(name = "PAGAMENTI_PRESSO_PSP") @Convert(converter = NumericBooleanConverter.class) private Boolean pagamentiPressoPsp; + + @Column(name = "FK_ICA_BINARY_FILE") + private Long fkIcaBinaryFile; } diff --git a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Pa.java b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Pa.java index 06fcb11..83b0695 100644 --- a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Pa.java +++ b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Pa.java @@ -64,4 +64,7 @@ public class Pa { @Column(name = "DESCRIZIONE") private String description; + + @Column(name = "CBILL") + private String cbill; } diff --git a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Stazioni.java b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Stazioni.java index 73e2044..144b10c 100644 --- a/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Stazioni.java +++ b/src/main/java/it/gov/pagopa/nodo/datamigration/entity/cfg/Stazioni.java @@ -142,4 +142,23 @@ public class Stazioni { @Column(name = "VERSIONE_PRIMITIVE") private Integer versionePrimitive; + + @Column(name = "PROTOCOLLO_AVV") + private String protocolloAvv; + + @Column(name = "IP_AVV") + private String ipAvv; + + @Column(name = "PORTA_AVV") + private Long portaAvv; + + @Column(name = "SERVIZIO_AVV") + private String servizioAvv; + + @Column(name = "TIMEOUT") + private Long timeout; + + @Column(name = "FLAG_STANDIN") + @Convert(converter = YesNoConverter.class) + private Boolean flagStandin; } diff --git a/src/test/java/it/gov/pagopa/nodo/datamigration/fsm/step/ExecuteCodifichePATableMigrationStepTest.java b/src/test/java/it/gov/pagopa/nodo/datamigration/fsm/step/ExecuteCodifichePATableMigrationStepTest.java index 80d73ca..3425053 100644 --- a/src/test/java/it/gov/pagopa/nodo/datamigration/fsm/step/ExecuteCodifichePATableMigrationStepTest.java +++ b/src/test/java/it/gov/pagopa/nodo/datamigration/fsm/step/ExecuteCodifichePATableMigrationStepTest.java @@ -127,7 +127,7 @@ void testExecuteStepMigrationInterruptedStepException() throws MigrationStepExce @Test void getNextState() { StepName nextState = migrationStep.getNextState(); - assertEquals(StepName.EXECUTE_BINARY_FILE_TABLE_MIGRATION, nextState); + assertEquals(StepName.EXECUTE_IBAN_TABLE_MIGRATION, nextState); } @Test diff --git a/src/test/java/it/gov/pagopa/nodo/datamigration/service/MigrationServiceTest.java b/src/test/java/it/gov/pagopa/nodo/datamigration/service/MigrationServiceTest.java index aa113e8..e2079f1 100644 --- a/src/test/java/it/gov/pagopa/nodo/datamigration/service/MigrationServiceTest.java +++ b/src/test/java/it/gov/pagopa/nodo/datamigration/service/MigrationServiceTest.java @@ -72,6 +72,11 @@ public void testGetMigrationStatus() { .codifiche(new DataMigrationStatus()) .codifichePa(new DataMigrationStatus()) .binaryFile(new DataMigrationStatus()) + .iban(new DataMigrationStatus()) + .ibanAttributes(new DataMigrationStatus()) + .ibanAttributesMaster(new DataMigrationStatus()) + .ibanMaster(new DataMigrationStatus()) + .icaBinaryFile(new DataMigrationStatus()) .informativeContoAccreditoMaster(new DataMigrationStatus()) .informativeContoAccreditoDetail(new DataMigrationStatus()) .informativePaMaster(new DataMigrationStatus()) @@ -117,6 +122,11 @@ public void testGetMigrationStatus() { details.put("CODIFICHE", getTableMigrationStatus(dataMigrationDetails.getCodifiche())); details.put("CODIFICHE_PA", getTableMigrationStatus(dataMigrationDetails.getCodifichePa())); details.put("BINARY_FILE", getTableMigrationStatus(dataMigrationDetails.getBinaryFile())); + details.put("IBAN", getTableMigrationStatus(dataMigrationDetails.getIban())); + details.put("IBAN_ATTRIBUTES", getTableMigrationStatus(dataMigrationDetails.getIbanAttributes())); + details.put("IBAN_ATTRIBUTES_MASTER", getTableMigrationStatus(dataMigrationDetails.getIbanAttributesMaster())); + details.put("IBAN_MASTER", getTableMigrationStatus(dataMigrationDetails.getIbanMaster())); + details.put("ICA_BINARY_FILE", getTableMigrationStatus(dataMigrationDetails.getIcaBinaryFile())); details.put("INFORMATIVE_CONTO_ACCREDITO_MASTER", getTableMigrationStatus(dataMigrationDetails.getInformativeContoAccreditoMaster())); details.put("INFORMATIVE_CONTO_ACCREDITO_DETAIL", getTableMigrationStatus(dataMigrationDetails.getInformativeContoAccreditoDetail())); details.put("INFORMATIVE_PA_MASTER", getTableMigrationStatus(dataMigrationDetails.getInformativePaMaster())); diff --git a/src/test/resources/JsonTest.json b/src/test/resources/JsonTest.json index 85a1b24..d3c7ab1 100644 --- a/src/test/resources/JsonTest.json +++ b/src/test/resources/JsonTest.json @@ -1 +1 @@ -{"intermediariPa":null,"pa":{"status":"COMPLETED","start":1696343803316,"end":1696343803317,"records":35},"stazioni":null,"paStazioniPa":null,"codifiche":null,"codifichePa":null,"binaryFile":null,"informativeContoAccreditoMaster":null,"informativeContoAccreditoDetail":null,"informativePaMaster":null,"informativePaDetail":null,"informativePaFasce":null,"intermediariPsp":null,"psp":null,"canaliNodo":null,"canali":null,"tipiVersamento":null,"canaleTipoVersamento":null,"pspCanaleTipoVersamento":null,"dizionarioMetadati":null,"cdiMaster":null,"cdiDetail":null,"cdiFasciaCostoServizio":null,"cdiInformazioniServizio":null,"cdiPreferences":null,"elencoServizi":null,"cdsCategorie":null,"cdsSoggetto":null,"cdsServizio":null,"cdsSoggettoServizio":null,"configurationKeys":null,"wfespPluginConf":null,"ftpServers":null,"pdd":null,"gdeConfig":null,"quadratureSched":null} \ No newline at end of file +{"intermediariPa":null,"pa":{"status":"COMPLETED","start":1696343803316,"end":1696343803317,"records":35},"stazioni":null,"paStazioniPa":null,"codifiche":null,"codifichePa":null,"binaryFile":null,"iban":null,"ibanAttributes":null,"ibanMaster":null,"ibanAttributesMaster":null,"icaBinaryFile":null,"informativeContoAccreditoMaster":null,"informativeContoAccreditoDetail":null,"informativePaMaster":null,"informativePaDetail":null,"informativePaFasce":null,"intermediariPsp":null,"psp":null,"canaliNodo":null,"canali":null,"tipiVersamento":null,"canaleTipoVersamento":null,"pspCanaleTipoVersamento":null,"dizionarioMetadati":null,"cdiMaster":null,"cdiDetail":null,"cdiFasciaCostoServizio":null,"cdiInformazioniServizio":null,"cdiPreferences":null,"elencoServizi":null,"cdsCategorie":null,"cdsSoggetto":null,"cdsServizio":null,"cdsSoggettoServizio":null,"configurationKeys":null,"wfespPluginConf":null,"ftpServers":null,"pdd":null,"gdeConfig":null,"quadratureSched":null} \ No newline at end of file diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index d354327..3f8fc84 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -41,6 +41,16 @@ persistence.postgresql.hikari.connectionTimeout=15000 persistence.postgresql.hikari.maxLifetime=30000 persistence.postgresql.hikari.keepaliveTime=30000 persistence.postgresql.jdbc.batch.size=30 +# Datasource H2 +persistence.h2.jdbc-url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'classpath:h2/init.sql' +persistence.h2.username=sa +persistence.h2.password=sa +#persistence.h2.default_schema=migration +persistence.h2.driver-class-name=org.h2.Driver +persistence.h2.hikari.connectionTimeout=15000 +persistence.h2.hikari.maxLifetime=30000 +persistence.h2.hikari.keepaliveTime=30000 +persistence.h2.jdbc.batch.size=30 # Server server.servlet.context-path=/ server.port=8080 @@ -65,6 +75,11 @@ step.dizionario_metadati.batch.size=200 step.elenco_servizi.batch.size=200 step.ftp_servers.batch.size=200 step.gde_config.batch.size=200 +step.iban_attributes_master.batch.size=200 +step.iban_master.batch.size=200 +step.iban_attributes.batch.size=200 +step.iban.batch.size=200 +step.ica_binary_file.batch.size=200 step.informative_conto_accredito_detail.batch.size=200 step.informative_conto_accredito_master.batch.size=200 step.informative_pa_detail.batch.size=200