From c216eab2b0384657014a47b1056a4b495d266a19 Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Fri, 19 Jun 2020 16:57:50 +0200 Subject: [PATCH 1/2] Approve subscriptions per product --- .../apiclient/dto/model/dto/ProductDTO.java | 13 +++++++++++++ 1 file changed, 13 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 03b902a46..1b346b2f6 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 @@ -204,6 +204,9 @@ public class ProductDTO extends NamedEntityDTO implements ProductL10nDTO, Compar private SubscriptionsPerProduct subscriptionsPerProduct; + @ApiModelProperty( "Require approvation for customer subscriptions" ) + private Boolean subscriptionApproval; + public ProductDTO( String name, String identifier, ProductType type, UrlEntityDTO company ) { this( name, identifier, type ); @@ -757,6 +760,16 @@ public void setSubscriptionsPerProduct( SubscriptionsPerProduct subscriptionsPer this.subscriptionsPerProduct = subscriptionsPerProduct; } + public Boolean getSubscriptionApproval() + { + return subscriptionApproval; + } + + public void setSubscriptionApproval( Boolean subscriptionApproval ) + { + this.subscriptionApproval = subscriptionApproval; + } + @Override public boolean equals( Object o ) { From 2d79a06617c7a68fcc0c5c16c1aad71d292a419b Mon Sep 17 00:00:00 2001 From: Matteo Giordano Date: Mon, 3 Aug 2020 12:24:58 +0200 Subject: [PATCH 2/2] Rename --- .../apiclient/dto/model/enums/DeploymentStatusEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatusEnum.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatusEnum.java index 1d730b784..f6990cb24 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatusEnum.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/DeploymentStatusEnum.java @@ -12,7 +12,7 @@ public enum DeploymentStatusEnum STOPPED, FAILED, /** requires approval by admin */ - PRE_APPROVAL, + REQUIRES_APPROVAL, UNDEPLOY_SENT, /** app that requires post-configuration */ POST_CONFIGURATION,