[PAGOPA-1163] add psp business name: first impl

helm/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-afm-marketplace
 description: Microservice that handles marketplace for pagoPA Advanced Fees Management
 type: application
-version: 0.17.0
-appVersion: 0.13.2
+version: 0.18.0
+appVersion: 0.13.3
 dependencies:
   - name: microservice-chart
     version: 1.21.0

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-marketplace-be
-    tag: "0.13.2"
+    tag: "0.13.3"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -98,7 +98,7 @@ microservice-chart:
       create: true
       image:
         repository: ghcr.io/pagopa/pagopa-afm-marketplace-be
-        tag: "0.13.2"
+        tag: "0.13.3"
         pullPolicy: Always
       envConfig: {}
       envSecret: {}

helm/values-prod.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-marketplace-be
-    tag: "0.13.2"
+    tag: "0.13.3"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -98,7 +98,7 @@ microservice-chart:
       create: true
       image:
         repository: ghcr.io/pagopa/pagopa-afm-marketplace-be
-        tag: "0.13.2"
+        tag: "0.13.3"
         pullPolicy: Always
       envConfig: {}
       envSecret: {}

helm/values-uat.yaml

@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-afm-marketplace-be
-    tag: "0.13.2"
+    tag: "0.13.3"
     pullPolicy: Always
   livenessProbe:
     httpGet:
@@ -98,7 +98,7 @@ microservice-chart:
       create: true
       image:
         repository: ghcr.io/pagopa/pagopa-afm-marketplace-be
-        tag: "0.13.2"
+        tag: "0.13.3"
         pullPolicy: Always
       envConfig: {}
       envSecret: {}

openapi/openapi.json

@@ -4,7 +4,7 @@
     "title": "Marketplace API for PagoPA AFM",
     "description": "marketplace-be",
     "termsOfService": "https://www.pagopa.gov.it/",
-    "version": "0.13.2"
+    "version": "0.13.3"
   },
   "servers": [
     {

pom.xml

@@ -13,7 +13,7 @@
 
 	<groupId>it.pagopa.afm</groupId>
 	<artifactId>marketplace-be</artifactId>
-	<version>0.13.2</version>
+	<version>0.13.3</version>
 	<name>marketplace-be</name>
 	<description>Marketplace API for PagoPA AFM</description>
 

src/main/java/it/pagopa/afm/marketplacebe/entity/Bundle.java

@@ -45,6 +45,9 @@ public class Bundle {
 
     @NotNull
     private String abi;
+
+    @NotNull
+    private String pspBusinessName;
 
     private Boolean digitalStamp;
 

src/main/java/it/pagopa/afm/marketplacebe/model/bundle/BundleRequest.java

@@ -26,6 +26,8 @@ public class BundleRequest {
     @NotNull
     private String abi;
     private String name;
+    @NotNull
+    private String pspBusinessName;
     private String description;
     private Long paymentAmount;
     private Long minPaymentAmount;

src/main/java/it/pagopa/afm/marketplacebe/service/BundleService.java

@@ -191,6 +191,7 @@ private Bundle generateBundle(String idPsp, BundleRequest bundleRequest) {
         .idCdi(bundleRequest.getIdCdi())
         .abi(bundleRequest.getAbi())
         .name(bundleRequest.getName())
+        .pspBusinessName(bundleRequest.getPspBusinessName())
         .description(bundleRequest.getDescription())
         .paymentAmount(bundleRequest.getPaymentAmount())
         .minPaymentAmount(bundleRequest.getMinPaymentAmount())
@@ -235,6 +236,7 @@ public Bundle updateBundle(String idPsp, String idBundle, BundleRequest bundleRe
     bundle.setIdCdi(bundleRequest.getIdCdi());
     bundle.setAbi(bundleRequest.getAbi());
     bundle.setName(bundleRequest.getName());
+    bundle.setPspBusinessName(bundleRequest.getPspBusinessName());
     bundle.setDescription(bundleRequest.getDescription());
     bundle.setPaymentAmount(bundleRequest.getPaymentAmount());
     bundle.setMinPaymentAmount(bundleRequest.getMinPaymentAmount());

src/test/java/it/pagopa/afm/marketplacebe/TestUtil.java

@@ -101,6 +101,7 @@ public static BundleRequest getMockBundleRequest() {
         .idCdi(null)
         .abi("abi")
         .name("name")
+        .pspBusinessName("business name")
         .description("description")
         .paymentAmount(100L)
         .minPaymentAmount(0L)
@@ -152,6 +153,7 @@ public static List<BundleRequest> getMockBundleRequestList() {
         .idCdi("idCdi")
         .abi("abi")
         .name("name")
+        .pspBusinessName("business name 0")
         .description("description")
         .paymentAmount(100L)
         .minPaymentAmount(0L)
@@ -171,6 +173,7 @@ public static List<BundleRequest> getMockBundleRequestList() {
         .idCdi("idCdi")
         .abi("abi")
         .name("name")
+        .pspBusinessName("business name 1")
         .description("description")
         .paymentAmount(200L)
         .minPaymentAmount(0L)
@@ -190,6 +193,7 @@ public static List<BundleRequest> getMockBundleRequestList() {
         .idCdi("idCdi")
         .abi("abi")
         .name("name")
+        .pspBusinessName("business name 2")
         .description("description")
         .paymentAmount(300L)
         .minPaymentAmount(0L)

src/test/java/it/pagopa/afm/marketplacebe/service/BundleServiceTest.java

@@ -19,6 +19,7 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -190,6 +191,7 @@ void shouldCreateBundle() {
 
         Mockito.verify(bundleRepository, times(1)).save(Mockito.any());
         assertEquals(bundleRequest.getName(), bundleArgumentCaptor.getValue().getName());
+        assertEquals(bundleRequest.getPspBusinessName(), bundleArgumentCaptor.getValue().getPspBusinessName());
     }
 
     @Test
@@ -1161,6 +1163,7 @@ void updateBundle_ok_1() {
 
         Bundle result = bundleService.updateBundle(TestUtil.getMockIdPsp(), bundle.getId(), TestUtil.getMockBundleRequest());
         assertNotNull(result);
+        assertEquals(result.getPspBusinessName(), TestUtil.getMockBundleRequest().getPspBusinessName());
     }
 
     @Test
@@ -1286,10 +1289,19 @@ void createBundleByList_ok() {
         when(touchpointRepository.findByName(anyString())).thenReturn(Optional.of(TestUtil.getMockTouchpoint()));
         when(paymentTypeRepository.findByName(anyString()))
                 .thenReturn(Optional.of(TestUtil.getMockPaymentType()));
-
+        
         List<BundleResponse> result = bundleService.createBundleByList(TestUtil.getMockIdPsp(), TestUtil.getMockBundleRequestList());
         assertNotNull(result);
         assertEquals(3,result.size());
+
+        @SuppressWarnings("unchecked")
+		ArgumentCaptor<Iterable<Bundle>> captor = ArgumentCaptor.forClass(Iterable.class);
+        verify(bundleRepository, times(1)).saveAll(captor.capture());
+
+        Iterator<Bundle> iter = captor.getAllValues().get(0).iterator();
+        assertEquals(iter.next().getPspBusinessName(), TestUtil.getMockBundleRequestList().get(0).getPspBusinessName());
+        assertEquals(iter.next().getPspBusinessName(), TestUtil.getMockBundleRequestList().get(1).getPspBusinessName());
+        assertEquals(iter.next().getPspBusinessName(), TestUtil.getMockBundleRequestList().get(2).getPspBusinessName());
     }
 
     @Test