Merge pull request #324 from pagopa/PAGOPA-1622

Pagopa 1622 flag standin
pagopa · Sep 25, 2024 · 36cd914 · 36cd914
2 parents c2d73b3 + 0494934
commit 36cd914
Show file tree

Hide file tree

Showing 21 changed files with 77 additions and 34 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: core
 description: APIs to manage configuration for CI and PSP of pagoPA
 type: application
-version: 0.171.0
-appVersion: 0.59.17
+version: 0.172.0
+appVersion: 0.59.17-1-PAGOPA-1622
 dependencies:
   - name: microservice-chart
     version: 2.8.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.59.17"
+    tag: "0.59.17-1-PAGOPA-1622"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.59.17"
+    tag: "0.59.17-1-PAGOPA-1622"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.59.17"
+    tag: "0.59.17-1-PAGOPA-1622"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -4,7 +4,7 @@
     "title": "core",
     "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.59.17"
+    "version": "0.59.17-1-PAGOPA-1622"
   },
   "servers": [
     {
@@ -18538,6 +18538,7 @@
         "required": [
           "broker_code",
           "enabled",
+          "flag_standin",
           "port",
           "primitive_version",
           "protocol",
@@ -18722,6 +18723,10 @@
           },
           "rest_endpoint": {
             "type": "string"
+          },
+          "flag_standin": {
+            "type": "boolean",
+            "description": "Represents the authorization to use the standin mode with this station"
           }
         }
       },
@@ -19203,6 +19208,7 @@
           "digital_stamp_brand",
           "enabled",
           "flag_psp_cp",
+          "flag_standin",
           "on_us",
           "payment_model",
           "port",
@@ -19381,6 +19387,10 @@
           "flag_psp_cp": {
             "type": "boolean",
             "description": "Represents the authorization to carry out the transfer of the information present in additional payment information in the tags relating to payment by card for the PA in V1"
+          },
+          "flag_standin": {
+            "type": "boolean",
+            "description": "Represents the authorization to use the standin mode with this channel"
           }
         }
       },

diff --git a/openapi/swagger.json b/openapi/swagger.json
@@ -4,7 +4,7 @@
     "description": "Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti",
     "termsOfService": "https://www.pagopa.gov.it/",
     "title": "core",
-    "version": "0.59.17"
+    "version": "0.59.17-1-PAGOPA-1622"
   },
   "host": "localhost:8080",
   "basePath": "/",
@@ -1192,18 +1192,6 @@
               }
             }
           },
-          "404": {
-            "description": "Not Found",
-            "headers": {
-              "X-Request-Id": {
-                "description": "This header identifies the call",
-                "type": "string"
-              }
-            },
-            "schema": {
-              "$ref": "#/definitions/ProblemJson"
-            }
-          },
           "429": {
             "description": "Too many requests",
             "headers": {
@@ -15012,6 +15000,10 @@
           "description": "Represents the authorization to carry out the transfer of the information present in additional payment information in the tags relating to payment by card for the PA in V1",
           "type": "boolean"
         },
+        "flag_standin": {
+          "description": "Represents the authorization to use the standin mode with this channel",
+          "type": "boolean"
+        },
         "ip": {
           "type": "string"
         },
@@ -15155,6 +15147,7 @@
         "digital_stamp_brand",
         "enabled",
         "flag_psp_cp",
+        "flag_standin",
         "on_us",
         "payment_model",
         "port",
@@ -16731,6 +16724,10 @@
         "flag_online": {
           "type": "boolean"
         },
+        "flag_standin": {
+          "description": "Represents the authorization to use the standin mode with this station",
+          "type": "boolean"
+        },
         "invio_rt_istantaneo": {
           "type": "boolean"
         },
@@ -16886,6 +16883,7 @@
       "required": [
         "broker_code",
         "enabled",
+        "flag_standin",
         "port",
         "primitive_version",
         "protocol",

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>it.gov.pagopa.apiconfig</groupId>
   <artifactId>core</artifactId>
-  <version>0.59.17</version>
+  <version>0.59.17-1-PAGOPA-1622</version>
   <description>Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti</description>
 
   <properties>

diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertCanaliToChannelDetails.java b/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertCanaliToChannelDetails.java
@@ -60,7 +60,8 @@ public ChannelDetails convert(MappingContext<Canali, ChannelDetails> context) {
           .agid(source.getFkCanaliNodo().getAgidChannel())
           .flagPspCp(source.getFkCanaliNodo().getFlagTravaso())
           .primitiveVersion(source.getFkCanaliNodo().getVersionePrimitive())
-          .flagIo(source.getFkCanaliNodo().getFlagIo());
+          .flagIo(source.getFkCanaliNodo().getFlagIo())
+          .flagStandin(source.getFkCanaliNodo().getFlagStandin());
       if (source.getFkCanaliNodo().getIdServPlugin() != null) {
         builder.servPlugin(source.getFkCanaliNodo().getIdServPlugin().getIdServPlugin());
       }

diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertChannelDetailsToCanali.java b/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertChannelDetailsToCanali.java
@@ -66,6 +66,7 @@ private CanaliNodo buildCanaliNodo(ChannelDetails source) {
         .agidChannel(source.getAgid())
         .flagTravaso(source.getFlagPspCp())
         .versionePrimitive(source.getPrimitiveVersion())
+        .flagStandin(source.getFlagStandin())
         .build();
   }
 

diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertStationDetailsToStazioni.java b/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertStationDetailsToStazioni.java
@@ -53,6 +53,7 @@ public Stazioni convert(MappingContext<StationDetails, Stazioni> context) {
                 .rtEnabled(true)
                 .invioRtIstantaneo(source.getRtInstantaneousDispatch())
                 .versionePrimitive(source.getPrimitiveVersion())
+                .flagStandin(source.getFlagStandin())
                 .isPaymentOptionsEnabled(source.getIsPaymentOptionsEnabled())
                 .restEndpoint(source.getRestEndpoint())
                 .build();

diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertStazioniToStationDetails.java b/src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertStazioniToStationDetails.java
@@ -61,6 +61,7 @@ public StationDetails convert(MappingContext<Stazioni, StationDetails> context)
                 .rtInstantaneousDispatch(source.getInvioRtIstantaneo())
                 .primitiveVersion(source.getVersionePrimitive())
                 .isConnectionSync(isConnectionSync(source))
+                .flagStandin(source.getFlagStandin())
                 .isPaymentOptionsEnabled(source.getIsPaymentOptionsEnabled())
                 .restEndpoint(source.getRestEndpoint())
                 .build();

diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/model/creditorinstitution/StationDetails.java b/src/main/java/it/gov/pagopa/apiconfig/core/model/creditorinstitution/StationDetails.java
@@ -168,6 +168,14 @@ public class StationDetails extends Station {
     @JsonProperty("primitive_version")
     private Integer primitiveVersion;
 
+    @JsonProperty("flag_standin")
+    @Schema(
+            required = true,
+            description =
+                    "Represents the authorization to use the standin mode with this station")
+    @NotNull
+    private Boolean flagStandin;
+
     @JsonProperty("is_payment_options_enabled")
     private Boolean isPaymentOptionsEnabled = false;
 

diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/model/psp/ChannelDetails.java b/src/main/java/it/gov/pagopa/apiconfig/core/model/psp/ChannelDetails.java
@@ -192,6 +192,14 @@ public class ChannelDetails extends Channel {
   @NotNull
   private Boolean flagPspCp;
 
+  @JsonProperty("flag_standin")
+  @Schema(
+          required = true,
+          description =
+                  "Represents the authorization to use the standin mode with this channel")
+  @NotNull
+  private Boolean flagStandin;
+
   @JsonIgnore private IntermediariPsp fkIntermediarioPsp;
 
   @JsonIgnore private WfespPluginConf fkWfespPluginConf;

diff --git a/src/main/resources/h2/data-h2.sql b/src/main/resources/h2/data-h2.sql
@@ -45,23 +45,25 @@ INSERT INTO NODO4_CFG.STAZIONI (OBJ_ID, ID_STAZIONE, ENABLED, IP, PASSWORD, PORT
                                 PORTA_4MOD, SERVIZIO_4MOD, PROXY_ENABLED, PROXY_HOST, PROXY_PORT, PROXY_USERNAME,
                                 PROXY_PASSWORD, TIMEOUT, NUM_THREAD,
                                 TIMEOUT_A, TIMEOUT_B, TIMEOUT_C, FLAG_ONLINE, VERSIONE, SERVIZIO_NMP, INVIO_RT_ISTANTANEO,
-                                TARGET_HOST, TARGET_PORT, TARGET_PATH, TARGET_HOST_POF, TARGET_PORT_POF, TARGET_PATH_POF, VERSIONE_PRIMITIVE)
+                                TARGET_HOST, TARGET_PORT, TARGET_PATH, TARGET_HOST_POF, TARGET_PORT_POF, TARGET_PATH_POF,
+                                VERSIONE_PRIMITIVE, FLAG_STANDIN, IS_PAYMENT_OPTIONS_ENABLED, REST_ENDPOINT)
 VALUES (2, '80007580279_01', 'Y', 'NodoDeiPagamentiDellaPATest.sia.eu', 'password', 80, 'HTTP',
         'paygov.collaudo.regione.veneto.it', 'nodo-regionale-fesp/paaInviaRispostaPagamento.html', 443, null,
         'openspcoop/PD/RT6TPDREGVENETO', 'Y', 'openspcoop/PD/CCP6TPDREGVENETO', 2, 'HTTPS', 'HTTP', null, null, null,
-        'Y', '10.101.1.95', 8080, null, null, 120, 2, 15, 30, 120, 'Y', 1, null, 'N', 'localhost', 443, '/', 'localhost', 443, '/', 1);
+        'Y', '10.101.1.95', 8080, null, null, 120, 2, 15, 30, 120, 'Y', 1, null, 'N', 'localhost', 443, '/', 'localhost', 443, '/', 1, 'N', false, 'aaaa');
 
 INSERT INTO NODO4_CFG.STAZIONI (OBJ_ID, ID_STAZIONE, ENABLED, IP, PASSWORD, PORTA, PROTOCOLLO,
                                 REDIRECT_IP, REDIRECT_PATH, REDIRECT_PORTA, REDIRECT_QUERY_STRING, SERVIZIO, RT_ENABLED,
                                 SERVIZIO_POF, FK_INTERMEDIARIO_PA, REDIRECT_PROTOCOLLO, PROTOCOLLO_4MOD, IP_4MOD,
                                 PORTA_4MOD, SERVIZIO_4MOD, PROXY_ENABLED, PROXY_HOST, PROXY_PORT, PROXY_USERNAME,
                                 PROXY_PASSWORD, TIMEOUT, NUM_THREAD,
                                 TIMEOUT_A, TIMEOUT_B, TIMEOUT_C, FLAG_ONLINE, VERSIONE, SERVIZIO_NMP, INVIO_RT_ISTANTANEO,
-                                TARGET_HOST, TARGET_PORT, TARGET_PATH, TARGET_HOST_POF, TARGET_PORT_POF, TARGET_PATH_POF, VERSIONE_PRIMITIVE)
+                                TARGET_HOST, TARGET_PORT, TARGET_PATH, TARGET_HOST_POF, TARGET_PORT_POF, TARGET_PATH_POF,
+                                VERSIONE_PRIMITIVE, FLAG_STANDIN, IS_PAYMENT_OPTIONS_ENABLED, REST_ENDPOINT)
 VALUES (3, '1123', 'Y', 'site.eu', 'password', 80, 'HTTP',
         'site.it', 'page.html', 443, null,
         'service/', 'Y', 'service/', 2, 'HTTPS', 'HTTP', null, null, null,
-        'Y', '10.101.1.95', 8080, null, null, 120, 2, 15, 30, 120, 'Y', 1, null, 'N', 'localhost', 443, '/', 'localhost', 443, '/', 2);
+        'Y', '10.101.1.95', 8080, null, null, 120, 2, 15, 30, 120, 'Y', 1, null, 'N', 'localhost', 443, '/', 'localhost', 443, '/', 2, 'N', false, 'bbbb');
 
 INSERT INTO NODO4_CFG.PA_STAZIONE_PA (OBJ_ID, PROGRESSIVO, FK_PA, FK_STAZIONE, AUX_DIGIT, SEGREGAZIONE, QUARTO_MODELLO, BROADCAST)
 VALUES (430, 1, 190, 2, null, 1, 'N', 'N');
@@ -146,16 +148,16 @@ insert into NODO4_CFG.CANALI_NODO (OBJ_ID, REDIRECT_IP, REDIRECT_PATH, REDIRECT_
                                    MODELLO_PAGAMENTO, MULTI_PAYMENT, RAGIONE_SOCIALE, RPT_RT_COMPLIANT, WSAPI,
                                    REDIRECT_PROTOCOLLO, ID_SERV_PLUGIN, ID_CLUSTER, ID_FESP_INSTANCE, LENTO, RT_PUSH,
                                    AGID_CHANNEL, ON_US, CARRELLO_CARTE, RECOVERY, MARCA_BOLLO_DIGITALE, FLAG_IO,FLAG_PSP_CP,
-                                   VERSIONE_PRIMITIVE, FLAG_TRAVASO)
+                                   VERSIONE_PRIMITIVE, FLAG_TRAVASO, FLAG_STANDIN)
 values (1, null, null, null, null, 'ATTIVATO_PRESSO_PSP', 'N', null, 'N', null, 'HTTP', null, 'CL_1', null, 'N', 'Y',
-        'N', 'N', 'N', 'Y', 'N', 'N', 'N', 1, 'N');
+        'N', 'N', 'N', 'Y', 'N', 'N', 'N', 1, 'N', 'N');
 insert into NODO4_CFG.CANALI_NODO (OBJ_ID, REDIRECT_IP, REDIRECT_PATH, REDIRECT_PORTA, REDIRECT_QUERY_STRING,
                                    MODELLO_PAGAMENTO, MULTI_PAYMENT, RAGIONE_SOCIALE, RPT_RT_COMPLIANT, WSAPI,
                                    REDIRECT_PROTOCOLLO, ID_SERV_PLUGIN, ID_CLUSTER, ID_FESP_INSTANCE, LENTO, RT_PUSH,
                                    AGID_CHANNEL, ON_US, CARRELLO_CARTE, RECOVERY, MARCA_BOLLO_DIGITALE, FLAG_IO, FLAG_PSP_CP,
-                                   VERSIONE_PRIMITIVE, FLAG_TRAVASO)
+                                   VERSIONE_PRIMITIVE, FLAG_TRAVASO, FLAG_STANDIN)
 values (2, null, null, null, null, 'MODELLO_PAGAMENTO', 'N', null, 'N', null, 'HTTP', null, 'CL_2', null, 'N', 'Y',
-        'N', 'N', 'N', 'Y', 'N', 'N', 'N', 1, 'N');
+        'N', 'N', 'N', 'Y', 'N', 'N', 'N', 1, 'N', 'N');
 
 
 

diff --git a/src/main/resources/h2/schema-h2.sql b/src/main/resources/h2/schema-h2.sql
@@ -104,6 +104,8 @@ create table NODO4_CFG.STAZIONI
     TARGET_PORT_POF           numeric,
     TARGET_PATH_POF           varchar(100),
     VERSIONE_PRIMITIVE    numeric(2)   default 1,
+    IS_PAYMENT_OPTIONS_ENABLED boolean NOT NULL,
+    REST_ENDPOINT              varchar(100),
     constraint PK_STAZIONI
         primary key (OBJ_ID),
     constraint UQ_ID_STAZIONE
@@ -123,6 +125,8 @@ create table NODO4_CFG.PA_STAZIONE_PA
     QUARTO_MODELLO char not null,
     BROADCAST      char    not null default 'N',
     PAGAMENTO_SPONTANEO char    not null default 'N',
+    ACA            char not null default 'N',
+    STANDIN        char not null default 'N',
     constraint PK_PA_STAZIONE_PA
         primary key (OBJ_ID),
     constraint FK_PA_STAZIONE_PA_PA
@@ -336,6 +340,7 @@ create table NODO4_CFG.CANALI_NODO
     FLAG_PSP_CP           char                  default 'N',
     VERSIONE_PRIMITIVE    numeric(2)            default 1,
     FLAG_TRAVASO          char                  default 'N',
+    FLAG_STANDIN          char                  default 'N',
     constraint PK_CANALI_NODO
         primary key (OBJ_ID),
     constraint FK_CANALI_SERV_PLUGIN

diff --git a/src/test/java/it/gov/pagopa/apiconfig/TestUtil.java b/src/test/java/it/gov/pagopa/apiconfig/TestUtil.java
@@ -204,6 +204,7 @@ public static Stazioni getMockStazioni() {
         .targetPortPof(443L)
         .targetPathPof("/")
         .versionePrimitive(1)
+        .flagStandin(false)
         .build();
   }
 
@@ -368,6 +369,7 @@ public static StationDetails getMockStationDetails() {
         .threadNumber(2L)
         .rtInstantaneousDispatch(false)
         .primitiveVersion(1)
+        .flagStandin(false)
         .build();
   }
 
@@ -810,6 +812,7 @@ public static ChannelDetails getMockChannelDetails() {
         .agid(true)
         .flagPspCp(false)
         .primitiveVersion(1)
+        .flagStandin(false)
         .build();
   }
 

diff --git a/src/test/resources/response/create_channel_ok.json b/src/test/resources/response/create_channel_ok.json
@@ -21,5 +21,6 @@
   "digital_stamp_brand": false,
   "agid": true,
   "flag_psp_cp": false,
-  "primitive_version": 1
+  "primitive_version": 1,
+  "flag_standin": false
 }
diff --git a/src/test/resources/response/create_station_ok.json b/src/test/resources/response/create_station_ok.json
@@ -15,5 +15,6 @@
   "timeout_c": 1,
   "flag_online": true,
   "invio_rt_istantaneo": false,
-  "primitive_version": 1
+  "primitive_version": 1,
+  "flag_standin": false
 }
diff --git a/src/test/resources/response/get_station_ok1.json b/src/test/resources/response/get_station_ok1.json
@@ -35,5 +35,6 @@
   "target_port_pof":443,
   "target_path_pof":"/",
   "primitive_version": 1,
-  "is_connection_sync": true
+  "is_connection_sync": true,
+  "flag_standin": false
 }
diff --git a/src/test/resources/response/update_channel_ok.json b/src/test/resources/response/update_channel_ok.json
@@ -21,5 +21,6 @@
   "digital_stamp_brand": false,
   "agid": true,
   "flag_psp_cp": false,
-  "primitive_version": 1
+  "primitive_version": 1,
+  "flag_standin": false
 }
diff --git a/src/test/resources/response/update_station_ok.json b/src/test/resources/response/update_station_ok.json
@@ -35,5 +35,6 @@
   "target_port_pof":443,
   "target_path_pof":"/",
   "primitive_version": 1,
-  "is_connection_sync": true
+  "is_connection_sync": true,
+  "flag_standin": false
 }