Merge pull request #291 from pagopa/PAGOPA-1558-add-cf-all-get-psps

[PAGOPA-1558] feat: Add PSP tax code to get channel psp API
pagopa · Feb 27, 2024 · 2fe624a · 2fe624a
2 parents f07dbcb + 5077e20
commit 2fe624a
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 29 deletions.
diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -18147,7 +18147,7 @@
           },
           "config_description": {
             "type": "string",
-            "example": " default millisecondi validitÃ  token"
+            "example": " default millisecondi validità token"
           }
         }
       },
@@ -18648,7 +18648,7 @@
           },
           "config_description": {
             "type": "string",
-            "example": " default millisecondi validitÃ  token"
+            "example": " default millisecondi validità token"
           },
           "config_category": {
             "type": "string",
@@ -19574,7 +19574,8 @@
           "business_name",
           "enabled",
           "payment_types",
-          "psp_code"
+          "psp_code",
+          "tax_code"
         ],
         "type": "object",
         "properties": {
@@ -19592,6 +19593,9 @@
             "items": {
               "type": "string"
             }
+          },
+          "tax_code": {
+            "type": "string"
           }
         }
       },
@@ -19793,4 +19797,4 @@
       }
     }
   }
-}
+}
diff --git a/openapi/swagger.json b/openapi/swagger.json
@@ -14395,13 +14395,17 @@
         },
         "psp_code": {
           "type": "string"
+        },
+        "tax_code": {
+          "type": "string"
         }
       },
       "required": [
         "business_name",
         "enabled",
         "payment_types",
-        "psp_code"
+        "psp_code",
+        "tax_code"
       ],
       "type": "object"
     },
@@ -14472,7 +14476,7 @@
           "type": "string"
         },
         "config_description": {
-          "example": " default millisecondi validitÃ  token",
+          "example": " default millisecondi validità token",
           "type": "string"
         },
         "config_key": {
@@ -14494,7 +14498,7 @@
     "ConfigurationKeyBase": {
       "properties": {
         "config_description": {
-          "example": " default millisecondi validitÃ  token",
+          "example": " default millisecondi validità token",
           "type": "string"
         },
         "config_value": {

diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/model/psp/ChannelPsp.java b/src/main/java/it/gov/pagopa/apiconfig/core/model/psp/ChannelPsp.java
@@ -41,4 +41,9 @@ public class ChannelPsp {
   // should be @NotEmpty for requests, but it is not compatible for responses
   // check on empty request is managed in the service method
   private List<String> paymentTypeList;
+
+  @JsonProperty("tax_code")
+  @Schema(required = true)
+  @NotNull
+  private String taxCode;
 }
diff --git a/src/main/java/it/gov/pagopa/apiconfig/core/service/ChannelsService.java b/src/main/java/it/gov/pagopa/apiconfig/core/service/ChannelsService.java
@@ -388,26 +388,27 @@ private List<String> getPaymentTypeList(List<CanaleTipoVersamento> type) {
         .collect(Collectors.toList());
   }
 
-  /**
-   * Maps PSP objects stored in the DB in a List of PaymentServiceProvider
-   *
-   * @param page page of PSP returned from the database
-   * @param channelCode id of the channel
-   * @return a list of {@link PaymentServiceProvider}.
-   */
-  private List<ChannelPsp> getPspList(Page<Psp> page, String channelCode) {
-    return page.stream()
-        .map(
-            elem -> {
-              var psp = modelMapper.map(elem, PaymentServiceProvider.class);
-              return ChannelPsp.builder()
-                  .pspCode(psp.getPspCode())
-                  .enabled(psp.getEnabled())
-                  .businessName(psp.getBusinessName())
-                  .paymentTypeList(
-                      mapPaymentType(elem.getPspCanaleTipoVersamentoList(), channelCode))
-                  .build();
-            })
-        .collect(Collectors.toList());
-  }
+    /**
+     * Maps PSP objects stored in the DB in a List of PaymentServiceProvider
+     *
+     * @param page        page of PSP returned from the database
+     * @param channelCode id of the channel
+     * @return a list of {@link PaymentServiceProvider}.
+     */
+    private List<ChannelPsp> getPspList(Page<Psp> page, String channelCode) {
+        return page.stream()
+                .map(
+                        elem -> {
+                            var psp = modelMapper.map(elem, PaymentServiceProvider.class);
+                            return ChannelPsp.builder()
+                                    .pspCode(psp.getPspCode())
+                                    .enabled(psp.getEnabled())
+                                    .businessName(psp.getBusinessName())
+                                    .taxCode(psp.getTaxCode())
+                                    .paymentTypeList(
+                                            mapPaymentType(elem.getPspCanaleTipoVersamentoList(), channelCode))
+                                    .build();
+                        })
+                .collect(Collectors.toList());
+    }
 }