diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ResellerCatalogDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ResellerCatalogDTO.java index a3918a161..fcac436dd 100644 --- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ResellerCatalogDTO.java +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ResellerCatalogDTO.java @@ -26,6 +26,9 @@ public class ResellerCatalogDTO extends NamedEntityDTO @Valid private Map categories; + @Valid + private UrlEntityDTO parent; + @ApiModelProperty( value = "When the catalog has been created", readOnly = true ) private Date createdAt; @@ -101,6 +104,16 @@ public void setCategories( Map categories ) this.categories = categories; } + public UrlEntityDTO getParent() + { + return parent; + } + + public void setParent( UrlEntityDTO parent ) + { + this.parent = parent; + } + public Date getCreatedAt() { return createdAt; diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/ResellerPricingHierarchy.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/ResellerPricingHierarchy.java new file mode 100644 index 000000000..e14f84a55 --- /dev/null +++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/enums/ResellerPricingHierarchy.java @@ -0,0 +1,12 @@ +package com.cloudesire.platform.apiclient.dto.model.enums; + +import io.swagger.annotations.ApiModelProperty; + +public enum ResellerPricingHierarchy +{ + @ApiModelProperty( "Hide inherited pricings (default)" ) + THIS, + + @ApiModelProperty( "Show inherited pricings" ) + FULL +} diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/ResellerPricingQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/ResellerPricingQuery.java index 0188f823d..103727584 100644 --- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/ResellerPricingQuery.java +++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/ResellerPricingQuery.java @@ -1,5 +1,7 @@ package com.cloudesire.platform.apiclient.query; +import com.cloudesire.platform.apiclient.dto.model.enums.ResellerPricingHierarchy; + public class ResellerPricingQuery extends BaseQuery { private static final String RESELLER_ID = "resellerId"; @@ -7,6 +9,7 @@ public class ResellerPricingQuery extends BaseQuery private static final String PRODUCT_ID = "productId"; private static final String PRODUCT_VERSION_ID = "productVersionId"; private static final String UNPRICED = "unpriced"; + private static final String HIERARCHY = "hierarchy"; public ResellerPricingQuery setPageRequest( PageRequestQuery pageRequestQuery ) { @@ -43,4 +46,10 @@ public ResellerPricingQuery setUnpriced( Boolean unpriced ) put( UNPRICED, unpriced ); return this; } + + public ResellerPricingQuery setHierarchy( ResellerPricingHierarchy hierarchy ) + { + put( HIERARCHY, hierarchy ); + return this; + } }