Merge remote-tracking branch 'refs/remotes/origin/export-ci-new' into…

… VAS-759-bo-export-ec-stazioni-upgrade # Conflicts: # openapi/openapi.json # src/main/resources/application.properties
pagopa · Jun 5, 2024 · b3198dc · b3198dc
2 parents e7226eb + 34ec510
commit b3198dc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 5 deletions.
diff --git a/.../apiconfig/selfcareintegration/mapper/ConvertPaStazionePaToCreditorInstitutionDetail.java b/.../apiconfig/selfcareintegration/mapper/ConvertPaStazionePaToCreditorInstitutionDetail.java
@@ -15,8 +15,8 @@ public CreditorInstitutionDetail convert(MappingContext<PaStazionePa, CreditorIn
 
         PaStazionePa src = context.getSource();
         Pa pa = src.getPa();
-        Stazioni stazioni = src.getFkStazione();
-        IntermediariPa intermediariPa = stazioni.getIntermediarioPa();
+        Stazioni stazione = src.getFkStazione();
+        IntermediariPa intermediariPa = stazione.getIntermediarioPa();
 
         return CreditorInstitutionDetail.builder()
                 .businessName(pa.getRagioneSociale())
@@ -25,13 +25,18 @@ public CreditorInstitutionDetail convert(MappingContext<PaStazionePa, CreditorIn
                 .cbillCode(pa.getCbill())
                 .brokerBusinessName(intermediariPa.getCodiceIntermediario())
                 .brokerCode(intermediariPa.getIdIntermediarioPa())
-                .stationCode(stazioni.getIdStazione())
-                .stationEnabled(stazioni.getEnabled())
-                .stationVersion(stazioni.getVersione())
+                .stationCode(stazione.getIdStazione())
+                .stationEnabled(stazione.getEnabled())
+                .stationVersion(stazione.getVersione())
                 .auxDigit(src.getAuxDigit())
                 .segregationCode(getDoubleDigitCode(src.getSegregazione()))
                 .applicationCode(getDoubleDigitCode(src.getProgressivo()))
                 .broadcast(src.getBroadcast())
+                .endpointRT(stazione.getProtocollo() + stazione.getIp() + stazione.getPorta() + stazione.getServizio())
+                .endpointRedirect(stazione.getRedirectProtocollo() + stazione.getRedirectIp() + stazione.getRedirectPorta()+ stazione.getRedirectPath() + stazione.getRedirectQueryString())
+                .endpointMU(stazione.getProtocollo4Mod() + stazione.getIp4Mod() + stazione.getPorta4Mod() + stazione.getServizio4Mod())
+                .versionePrimitive(stazione.getVersionePrimitive())
+                .ecStatus(src.getPa().getEnabled())
                 .build();
     }
 

diff --git a/...pa/apiconfig/selfcareintegration/model/creditorinstitution/CreditorInstitutionDetail.java b/...pa/apiconfig/selfcareintegration/model/creditorinstitution/CreditorInstitutionDetail.java
@@ -80,4 +80,24 @@ public class CreditorInstitutionDetail {
     @JsonProperty("broadcast")
     @Schema(description = "The flag that define if the station is made for broadcast operations", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Boolean broadcast;
+
+    @JsonProperty("endpoint_rt")
+    @Schema(description = "endpoint for RT", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private String endpointRT;
+
+    @JsonProperty("endpoint_redirect")
+    @Schema(description = "endpoint for Redirect", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private String endpointRedirect;
+
+    @JsonProperty("endpoint_mod4")
+    @Schema(description = "endpoint for Modello Unico", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private String endpointMU;
+
+    @JsonProperty("primitive_version")
+    @Schema(description = "Version of the primitive", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+    private Integer versionePrimitive;
+
+    @JsonProperty("ci_status")
+    @Schema(description = "True if the CI is enabled", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean ciStatus;
 }