Merge branch 'main' into PPANTT-51-feat-add-iban-and-master-scripts

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.169.0
-appVersion: 0.59.15
+version: 0.173.0
+appVersion: 0.59.18
 dependencies:
   - name: microservice-chart
     version: 2.8.0

helm/values-dev.yaml

@@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.59.15"
+    tag: "0.59.18"
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-prod.yaml

@@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.59.15"
+    tag: "0.59.18"
     pullPolicy: Always
   livenessProbe:
     httpGet:

helm/values-uat.yaml

@@ -28,7 +28,7 @@ microservice-chart: &microservice-chart
       envSecret: {}
   image:
     repository: ghcr.io/pagopa/pagopa-api-config
-    tag: "0.59.15"
+    tag: "0.59.18"
     pullPolicy: Always
   livenessProbe:
     httpGet:

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.15"
+    "version": "0.59.18"
   },
   "servers": [
     {
@@ -18538,6 +18538,7 @@
         "required": [
           "broker_code",
           "enabled",
+          "flag_standin",
           "port",
           "primitive_version",
           "protocol",
@@ -18716,6 +18717,16 @@
             "type": "integer",
             "description": "Primitive number version",
             "format": "int32"
+          },
+          "is_payment_options_enabled": {
+            "type": "boolean"
+          },
+          "rest_endpoint": {
+            "type": "string"
+          },
+          "flag_standin": {
+            "type": "boolean",
+            "description": "Represents the authorization to use the standin mode with this station"
           }
         }
       },
@@ -19197,6 +19208,7 @@
           "digital_stamp_brand",
           "enabled",
           "flag_psp_cp",
+          "flag_standin",
           "on_us",
           "payment_model",
           "port",
@@ -19375,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"
           }
         }
       },

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.15"
+    "version": "0.59.18"
   },
   "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",

pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>it.gov.pagopa.apiconfig</groupId>
   <artifactId>core</artifactId>
-  <version>0.59.15</version>
+  <version>0.59.18</version>
   <description>Spring application exposes APIs to manage configuration for CI/PSP on the Nodo dei Pagamenti</description>
 
   <properties>
@@ -32,7 +32,7 @@
     <postgresql-version>42.5.5</postgresql-version>
     <azure.storage.table.version>8.6.6</azure.storage.table.version>
     <testcontainer.version>1.17.6</testcontainer.version>
-    <starter.version>1.22.2</starter.version>
+    <starter.version>1.23.0</starter.version>
   </properties>
 
   <repositories>

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());
       }

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();
   }
 

src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertStationDetailsToStazioni.java

@@ -4,58 +4,62 @@
 import it.gov.pagopa.apiconfig.core.model.creditorinstitution.StationDetails;
 import it.gov.pagopa.apiconfig.starter.entity.IntermediariPa;
 import it.gov.pagopa.apiconfig.starter.entity.Stazioni;
-import javax.validation.Valid;
 import org.modelmapper.Converter;
 import org.modelmapper.spi.MappingContext;
 
+import javax.validation.Valid;
+
 public class ConvertStationDetailsToStazioni implements Converter<StationDetails, Stazioni> {
 
-  @Override
-  public Stazioni convert(MappingContext<StationDetails, Stazioni> context) {
-    @Valid StationDetails source = context.getSource();
-    return Stazioni.builder()
-        .idStazione(source.getStationCode())
-        .enabled(source.getEnabled())
-        .versione(source.getVersion())
-        .password(source.getPassword())
-        .protocollo(getProtocol(source.getProtocol()))
-        .ip(source.getIp())
-        .porta(source.getPort())
-        .servizio(source.getService())
-        .servizioPof(source.getPofService())
-        .intermediarioPa(IntermediariPa.builder().objId(source.getBrokerObjId()).build())
-        .protocollo4Mod(getProtocol(source.getProtocol4Mod()))
-        .ip4Mod(source.getIp4Mod())
-        .porta4Mod(source.getPort4Mod())
-        .servizio4Mod(source.getService4Mod())
-        .redirectProtocollo(getProtocol(source.getRedirectProtocol()))
-        .redirectIp(source.getRedirectIp())
-        .redirectPorta(source.getRedirectPort())
-        .redirectPath(source.getRedirectPath())
-        .redirectQueryString(source.getRedirectQueryString())
-        .proxyEnabled(source.getProxyEnabled())
-        .proxyHost(source.getProxyHost())
-        .proxyPort(source.getProxyPort())
-        .proxyUsername(source.getProxyUsername())
-        .proxyPassword(source.getProxyPassword())
-        .targetHost(source.getTargetHost())
-        .targetPort(source.getTargetPort())
-        .targetPath(source.getTargetPath())
-        .targetHostPof(source.getTargetHostPof())
-        .targetPortPof(source.getTargetPortPof())
-        .targetPathPof(source.getTargetPathPof())
-        .flagOnline(source.getFlagOnline())
-        .numThread(source.getThreadNumber())
-        .timeoutA(source.getTimeoutA())
-        .timeoutB(source.getTimeoutB())
-        .timeoutC(source.getTimeoutC())
-        .rtEnabled(true)
-        .invioRtIstantaneo(source.getRtInstantaneousDispatch())
-        .versionePrimitive(source.getPrimitiveVersion())
-        .build();
-  }
+    @Override
+    public Stazioni convert(MappingContext<StationDetails, Stazioni> context) {
+        @Valid StationDetails source = context.getSource();
+        return Stazioni.builder()
+                .idStazione(source.getStationCode())
+                .enabled(source.getEnabled())
+                .versione(source.getVersion())
+                .password(source.getPassword())
+                .protocollo(getProtocol(source.getProtocol()))
+                .ip(source.getIp())
+                .porta(source.getPort())
+                .servizio(source.getService())
+                .servizioPof(source.getPofService())
+                .intermediarioPa(IntermediariPa.builder().objId(source.getBrokerObjId()).build())
+                .protocollo4Mod(getProtocol(source.getProtocol4Mod()))
+                .ip4Mod(source.getIp4Mod())
+                .porta4Mod(source.getPort4Mod())
+                .servizio4Mod(source.getService4Mod())
+                .redirectProtocollo(getProtocol(source.getRedirectProtocol()))
+                .redirectIp(source.getRedirectIp())
+                .redirectPorta(source.getRedirectPort())
+                .redirectPath(source.getRedirectPath())
+                .redirectQueryString(source.getRedirectQueryString())
+                .proxyEnabled(source.getProxyEnabled())
+                .proxyHost(source.getProxyHost())
+                .proxyPort(source.getProxyPort())
+                .proxyUsername(source.getProxyUsername())
+                .proxyPassword(source.getProxyPassword())
+                .targetHost(source.getTargetHost())
+                .targetPort(source.getTargetPort())
+                .targetPath(source.getTargetPath())
+                .targetHostPof(source.getTargetHostPof())
+                .targetPortPof(source.getTargetPortPof())
+                .targetPathPof(source.getTargetPathPof())
+                .flagOnline(source.getFlagOnline())
+                .numThread(source.getThreadNumber())
+                .timeoutA(source.getTimeoutA())
+                .timeoutB(source.getTimeoutB())
+                .timeoutC(source.getTimeoutC())
+                .rtEnabled(true)
+                .invioRtIstantaneo(source.getRtInstantaneousDispatch())
+                .versionePrimitive(source.getPrimitiveVersion())
+                .flagStandin(source.getFlagStandin())
+                .isPaymentOptionsEnabled(source.getIsPaymentOptionsEnabled())
+                .restEndpoint(source.getRestEndpoint())
+                .build();
+    }
 
-  private String getProtocol(Protocol source) {
-    return source != null ? source.name() : null;
-  }
+    private String getProtocol(Protocol source) {
+        return source != null ? source.name() : null;
+    }
 }

src/main/java/it/gov/pagopa/apiconfig/core/mapper/ConvertStazioniToStationDetails.java

@@ -61,6 +61,9 @@ 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();
     }
 }