Skip to content

Reseller catalogs hierarchy #573

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

Merged
gionn merged 2 commits into from
Nov 3, 2020
Merged

Reseller catalogs hierarchy #573

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
9b4521c
Reseller catalogs hierarchy
malteo Oct 28, 2020
d41c39d
Show/hide inherited pricings
malteo Oct 28, 2020
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
13 changes: 13 additions & 0 deletions ...dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ResellerCatalogDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ public class ResellerCatalogDTO extends NamedEntityDTO
@Valid
private Map<UrlEntityDTO, UrlEntityDTO> categories;

@Valid
private UrlEntityDTO parent;

@ApiModelProperty( value = "When the catalog has been created", readOnly = true )
private Date createdAt;

Expand Down Expand Up @@ -101,6 +104,16 @@ public void setCategories( Map<UrlEntityDTO, UrlEntityDTO> categories )
this.categories = categories;
}

public UrlEntityDTO getParent()
{
return parent;
}

public void setParent( UrlEntityDTO parent )
{
this.parent = parent;
}

public Date getCreatedAt()
{
return createdAt;
Expand Down
12 changes: 12 additions & 0 deletions ...main/java/com/cloudesire/platform/apiclient/dto/model/enums/ResellerPricingHierarchy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
9 changes: 9 additions & 0 deletions ...pi-client/src/main/java/com/cloudesire/platform/apiclient/query/ResellerPricingQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
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";
private static final String CATALOG_ID = "catalogId";
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 )
{
Expand Down Expand Up @@ -43,4 +46,10 @@ public ResellerPricingQuery setUnpriced( Boolean unpriced )
put( UNPRICED, unpriced );
return this;
}

public ResellerPricingQuery setHierarchy( ResellerPricingHierarchy hierarchy )
{
put( HIERARCHY, hierarchy );
return this;
}
}