Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SELC - 4465] feat: Removal of mandatory requirements for taxCode, vatNumber, recip… #291

Merged
merged 2 commits into from
Apr 16, 2024
Merged

[SELC - 4465] feat: Removal of mandatory requirements for taxCode, vatNumber, recip… #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e4890
feat: Removal of mandatory requirements for taxCode, vatNumber, recip…
gianmarcoplutino Apr 15, 2024
a9efa08
feat: removed valid and jsonProperty Annotations
gianmarcoplutino Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/src/main/resources/swagger/api-docs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2038,7 +2038,7 @@
},
"BillingDataDto" : {
"title" : "BillingDataDto",
"required" : [ "businessName", "digitalAddress", "recipientCode", "registeredOffice", "taxCode", "vatNumber", "zipCode" ],
"required" : [ "businessName", "digitalAddress", "registeredOffice", "zipCode" ],
"type" : "object",
"properties" : {
"businessName" : {
Expand Down Expand Up @@ -2459,7 +2459,6 @@
},
"InstitutionLocationDataDto" : {
"title" : "InstitutionLocationDataDto",
"required" : [ "city", "country", "county" ],
"type" : "object",
"properties" : {
"city" : {
Expand Down Expand Up @@ -2607,7 +2606,7 @@
},
"OnboardingProductDto" : {
"title" : "OnboardingProductDto",
"required" : [ "billingData", "institutionType", "productId", "taxCode", "users" ],
"required" : [ "billingData", "institutionType", "productId", "users" ],
"type" : "object",
"properties" : {
"additionalInformations" : {
Expand Down
10 changes: 3 additions & 7 deletions web/src/main/java/it/pagopa/selfcare/onboarding/web/model/BillingDataDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,13 @@ public class BillingDataDto {
@NotBlank
private String zipCode;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.taxCode}", required = true)
@JsonProperty(required = true)
@NotBlank
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.taxCode}")
private String taxCode;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.vatNumber}", required = true)
@JsonProperty(required = true)
@NotBlank
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.vatNumber}")
private String vatNumber;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.recipientCode}", required = true)
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.recipientCode}")
private String recipientCode;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.publicServices}")
Expand Down
15 changes: 3 additions & 12 deletions web/src/main/java/it/pagopa/selfcare/onboarding/web/model/InstitutionLocationDataDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
package it.pagopa.selfcare.onboarding.web.model;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;

@Data
public class InstitutionLocationDataDto {
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.city}", required = true)
@JsonProperty(required = true)
@NotBlank
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.city}")
private String city;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.county}", required = true)
@JsonProperty(required = true)
@NotBlank
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.county}")
private String county;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.country}", required = true)
@JsonProperty(required = true)
@NotBlank
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.country}")
private String country;

}
4 changes: 1 addition & 3 deletions web/src/main/java/it/pagopa/selfcare/onboarding/web/model/OnboardingProductDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class OnboardingProductDto {
private BillingDataDto billingData;

@ApiModelProperty(value = "${swagger.onboarding.institution.model.locationData}")
@Valid
private InstitutionLocationDataDto institutionLocationData;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.institutionType}", required = true)
Expand Down Expand Up @@ -56,8 +55,7 @@ public class OnboardingProductDto {
@NotNull
private String productId;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.taxCode}", required = true)
@NotNull
@ApiModelProperty(value = "${swagger.onboarding.institutions.model.taxCode}")
private String taxCode;

@ApiModelProperty(value = "${swagger.onboarding.institutions.model.subunitCode}")
Expand Down
Loading