From 91287e0b22ce6d75a42bcd7ef3c092094237c8c3 Mon Sep 17 00:00:00 2001 From: Giulia Tremolada Date: Tue, 8 Oct 2024 16:26:18 +0200 Subject: [PATCH] persist isAggregator field in API getInstitutionById --- app/src/main/resources/swagger/api-docs.json | 6 ++++++ .../model/institution/OnboardedProduct.java | 1 + .../model/product/mapper/ProductMapper.java | 1 - .../test/resources/stubs/InstitutionResponse.json | 13 ++++++++++++- .../web/model/OnboardedProductResource.java | 2 ++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/resources/swagger/api-docs.json b/app/src/main/resources/swagger/api-docs.json index 523c5dd3..7d9b97e4 100644 --- a/app/src/main/resources/swagger/api-docs.json +++ b/app/src/main/resources/swagger/api-docs.json @@ -3757,6 +3757,9 @@ "billing" : { "$ref" : "#/components/schemas/Billing" }, + "isAggregator" : { + "type" : "boolean" + }, "productId" : { "type" : "string" }, @@ -3785,6 +3788,9 @@ "billing" : { "$ref" : "#/components/schemas/Billing" }, + "isAggregator" : { + "type" : "boolean" + }, "productId" : { "type" : "string" }, diff --git a/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/OnboardedProduct.java b/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/OnboardedProduct.java index dddab8cc..4ab07a9c 100644 --- a/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/OnboardedProduct.java +++ b/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/institution/OnboardedProduct.java @@ -12,4 +12,5 @@ public class OnboardedProduct { private boolean authorized; private Billing billing; private List userProductActions; + private Boolean isAggregator; } diff --git a/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/product/mapper/ProductMapper.java b/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/product/mapper/ProductMapper.java index 493f5e37..b1d7ba14 100644 --- a/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/product/mapper/ProductMapper.java +++ b/connector-api/src/main/java/it/pagopa/selfcare/dashboard/connector/model/product/mapper/ProductMapper.java @@ -7,7 +7,6 @@ import it.pagopa.selfcare.product.entity.ProductRoleInfo; import org.springframework.stereotype.Component; -import java.util.EnumSet; import java.util.List; import java.util.Map; import java.util.Optional; diff --git a/connector/rest/src/test/resources/stubs/InstitutionResponse.json b/connector/rest/src/test/resources/stubs/InstitutionResponse.json index 2e565826..fec7b0bd 100644 --- a/connector/rest/src/test/resources/stubs/InstitutionResponse.json +++ b/connector/rest/src/test/resources/stubs/InstitutionResponse.json @@ -31,7 +31,18 @@ "id": "setId", "imported": true, "institutionType": "AS", - "onboarding": [], + "onboarding": [ + { + "productId": "setProductId", + "isAggregator": true, + "createdAt": "2024-06-11T10:09:30.154695400+02:00", + "billing": { + "publicServices": false, + "recipientCode": "setRecipientCode", + "vatNumber": "setVatNumber" + } + } + ], "origin": "setOrigin", "originId": "setOriginId", "paymentServiceProvider": { diff --git a/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/OnboardedProductResource.java b/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/OnboardedProductResource.java index ea123880..7888ab52 100644 --- a/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/OnboardedProductResource.java +++ b/web/src/main/java/it/pagopa/selfcare/dashboard/web/model/OnboardedProductResource.java @@ -19,4 +19,6 @@ public class OnboardedProductResource { private Billing billing; private List userProductActions; + + private Boolean isAggregator; }