From d35ecfe9fd00934fcf7f150d7eb5b6e0910f6b70 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Mon, 24 Aug 2020 15:31:22 +0200 Subject: [PATCH 1/2] Add product termination message --- .../apiclient/dto/model/dto/ProductDTO.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java index 1b346b2f6..3bf750815 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java @@ -207,6 +207,10 @@ public class ProductDTO extends NamedEntityDTO implements ProductL10nDTO, Compar @ApiModelProperty( "Require approvation for customer subscriptions" ) private Boolean subscriptionApproval; + @ApiModelProperty( "Message to display to the user on subscription termination" ) + @Size( max = 4096 ) + private String terminationMessage; + public ProductDTO( String name, String identifier, ProductType type, UrlEntityDTO company ) { this( name, identifier, type ); @@ -770,6 +774,16 @@ public void setSubscriptionApproval( Boolean subscriptionApproval ) this.subscriptionApproval = subscriptionApproval; } + public String getTerminationMessage() + { + return terminationMessage; + } + + public void setTerminationMessage( String terminationMessage ) + { + this.terminationMessage = terminationMessage; + } + @Override public boolean equals( Object o ) { From e25b23e84956c8b5108919434314c9df6cf70539 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Tue, 25 Aug 2020 16:42:27 +0200 Subject: [PATCH 2/2] Localize --- .../apiclient/dto/model/dto/ProductDTO.java | 4 +++- .../apiclient/dto/model/dto/ProductDraftDTO.java | 15 +++++++++++++++ .../apiclient/dto/model/dto/ProductL10nDTO.java | 4 ++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java index 3bf750815..f6ea5e084 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDTO.java @@ -208,7 +208,7 @@ public class ProductDTO extends NamedEntityDTO implements ProductL10nDTO, Compar private Boolean subscriptionApproval; @ApiModelProperty( "Message to display to the user on subscription termination" ) - @Size( max = 4096 ) + @Size( max = 65536, message = INVALID_SIZE ) private String terminationMessage; public ProductDTO( String name, String identifier, ProductType type, UrlEntityDTO company ) @@ -774,11 +774,13 @@ public void setSubscriptionApproval( Boolean subscriptionApproval ) this.subscriptionApproval = subscriptionApproval; } + @Override public String getTerminationMessage() { return terminationMessage; } + @Override public void setTerminationMessage( String terminationMessage ) { this.terminationMessage = terminationMessage; diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDraftDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDraftDTO.java index c320ac008..54ccc2845 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDraftDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductDraftDTO.java @@ -44,6 +44,9 @@ public class ProductDraftDTO extends BaseEntityDTO implements ProductL10nDTO @JsonInclude( JsonInclude.Include.NON_NULL ) private Map faq; + @ApiModelProperty( "Message to display to the user on subscription termination" ) + private String terminationMessage; + //region Auto-generated code public UrlEntityDTO getOriginal() { @@ -137,5 +140,17 @@ public void setFaq( Map faq ) { this.faq = faq; } + + @Override + public String getTerminationMessage() + { + return terminationMessage; + } + + @Override + public void setTerminationMessage( String terminationMessage ) + { + this.terminationMessage = terminationMessage; + } //endregion } diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductL10nDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductL10nDTO.java index 66c8a5266..288c5d41e 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductL10nDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ProductL10nDTO.java @@ -35,4 +35,8 @@ public interface ProductL10nDTO Map getFaq(); void setFaq( Map faq ); + + String getTerminationMessage(); + + void setTerminationMessage( String terminationMessage ); }