diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/OnboardingController.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/OnboardingController.java index 6bf25f829..c51df8726 100644 --- a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/OnboardingController.java +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/OnboardingController.java @@ -15,6 +15,7 @@ import jakarta.ws.rs.core.MediaType; import lombok.AllArgsConstructor; + //@RolesAllowed("USER") @Path("/onboarding") @AllArgsConstructor diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/BillingPaRequest.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/BillingPaRequest.java new file mode 100644 index 000000000..1cd1ba060 --- /dev/null +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/BillingPaRequest.java @@ -0,0 +1,13 @@ +package it.pagopa.selfcare.onboarding.controller.request; + +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +@Data +public class BillingPaRequest { + @NotEmpty(message = "vatNumber is required") + private String vatNumber; + @NotEmpty(message = "recipientCode is required") + private String recipientCode; + private boolean publicServices; +} diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/BillingRequest.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/BillingRequest.java index e976cfab9..af82b1e8d 100644 --- a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/BillingRequest.java +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/BillingRequest.java @@ -7,7 +7,7 @@ public class BillingRequest { @NotEmpty(message = "vatNumber is required") private String vatNumber; - @NotEmpty(message = "recipientCode is required") + private String recipientCode; private boolean publicServices; } diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/InstitutionBaseRequest.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/InstitutionBaseRequest.java index f52dade75..8e14ccc3e 100644 --- a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/InstitutionBaseRequest.java +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/request/InstitutionBaseRequest.java @@ -17,7 +17,9 @@ public class InstitutionBaseRequest { private String taxCode; private String subunitCode; private InstitutionPaSubunitType subunitType; - + private String city; + private String country; + private String county; private String description; private String digitalAddress; private String address; diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/InstitutionResponse.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/InstitutionResponse.java index d756e3427..67a6bda5f 100644 --- a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/InstitutionResponse.java +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/InstitutionResponse.java @@ -16,7 +16,9 @@ public class InstitutionResponse { private String taxCode; private String subunitCode; private InstitutionPaSubunitType subunitType; - + private String city; + private String country; + private String county; private String description; private String digitalAddress; private String address; diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java index 2bd2a5d3c..001644f24 100644 --- a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/controller/response/OnboardingResponse.java @@ -8,7 +8,6 @@ public class OnboardingResponse { private InstitutionResponse institution; - private String productId; private String pricingPlan; private List users; diff --git a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/Institution.java b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/Institution.java index 1cd7312d4..191428ceb 100644 --- a/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/Institution.java +++ b/apps/onboarding-ms/src/main/java/it/pagopa/selfcare/onboarding/entity/Institution.java @@ -13,7 +13,9 @@ public class Institution { private String taxCode; private String subunitCode; private InstitutionPaSubunitType subunitType; - + private String city; + private String country; + private String county; private String description; private String digitalAddress; private String address;