Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 11 additions & 1 deletion openapi/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down Expand Up @@ -18538,6 +18538,7 @@
"required": [
"broker_code",
"enabled",
"flag_standin",
"port",
"primitive_version",
"protocol",
Expand Down Expand Up @@ -18722,6 +18723,10 @@
},
"rest_endpoint": {
"type": "string"
},
"flag_standin": {
"type": "boolean",
"description": "Represents the authorization to use the standin mode with this station"
}
}
},
Expand Down Expand Up @@ -19203,6 +19208,7 @@
"digital_stamp_brand",
"enabled",
"flag_psp_cp",
"flag_standin",
"on_us",
"payment_model",
"port",
Expand Down Expand Up @@ -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"
}
}
},
Expand Down
24 changes: 11 additions & 13 deletions openapi/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "/",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -15155,6 +15147,7 @@
"digital_stamp_brand",
"enabled",
"flag_psp_cp",
"flag_standin",
"on_us",
"payment_model",
"port",
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -16886,6 +16883,7 @@
"required": [
"broker_code",
"enabled",
"flag_standin",
"port",
"primitive_version",
"protocol",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ private CanaliNodo buildCanaliNodo(ChannelDetails source) {
.agidChannel(source.getAgid())
.flagTravaso(source.getFlagPspCp())
.versionePrimitive(source.getPrimitiveVersion())
.flagStandin(source.getFlagStandin())
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 10 additions & 8 deletions src/main/resources/h2/data-h2.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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');



Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/h2/schema-h2.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/it/gov/pagopa/apiconfig/TestUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ public static Stazioni getMockStazioni() {
.targetPortPof(443L)
.targetPathPof("/")
.versionePrimitive(1)
.flagStandin(false)
.build();
}

Expand Down Expand Up @@ -368,6 +369,7 @@ public static StationDetails getMockStationDetails() {
.threadNumber(2L)
.rtInstantaneousDispatch(false)
.primitiveVersion(1)
.flagStandin(false)
.build();
}

Expand Down Expand Up @@ -810,6 +812,7 @@ public static ChannelDetails getMockChannelDetails() {
.agid(true)
.flagPspCp(false)
.primitiveVersion(1)
.flagStandin(false)
.build();
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/resources/response/create_channel_ok.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
"digital_stamp_brand": false,
"agid": true,
"flag_psp_cp": false,
"primitive_version": 1
"primitive_version": 1,
"flag_standin": false
}
3 changes: 2 additions & 1 deletion src/test/resources/response/create_station_ok.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
"timeout_c": 1,
"flag_online": true,
"invio_rt_istantaneo": false,
"primitive_version": 1
"primitive_version": 1,
"flag_standin": false
}
3 changes: 2 additions & 1 deletion src/test/resources/response/get_station_ok1.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
3 changes: 2 additions & 1 deletion src/test/resources/response/update_channel_ok.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
"digital_stamp_brand": false,
"agid": true,
"flag_psp_cp": false,
"primitive_version": 1
"primitive_version": 1,
"flag_standin": false
}
3 changes: 2 additions & 1 deletion src/test/resources/response/update_station_ok.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Loading