From 75c419e9ae9cacbd543cbf4cf7844c65a9f5d5e4 Mon Sep 17 00:00:00 2001
From: Matteo Giordano <Matteo.Giordano@eng.it>
Date: Tue, 30 Jun 2020 17:49:58 +0200
Subject: [PATCH] Filter channel pricings by product version

---
 .../apiclient/api/DistributorPricingApi.java  | 11 ++++++
 .../query/DistributorPricingQuery.java        | 39 +++++++++++++++++++
 .../apiclient/query/ResellerPricingQuery.java | 23 +++++++----
 3 files changed, 65 insertions(+), 8 deletions(-)
 create mode 100644 cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/DistributorPricingQuery.java

diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/DistributorPricingApi.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/DistributorPricingApi.java
index ac7e3a046..4275a6300 100644
--- a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/DistributorPricingApi.java
+++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/api/DistributorPricingApi.java
@@ -2,6 +2,7 @@
 
 import com.cloudesire.platform.apiclient.dto.model.dto.DistributorPricingDTO;
 import com.cloudesire.platform.apiclient.dto.model.dto.PercentagePricingPatchDTO;
+import com.cloudesire.platform.apiclient.query.DistributorPricingQuery;
 import retrofit2.Call;
 import retrofit2.http.Body;
 import retrofit2.http.DELETE;
@@ -24,9 +25,19 @@ public interface DistributorPricingApi
     @GET( "distributorPricing" )
     Call<List<DistributorPricingDTO>> getAll();
 
+    @GET( "distributorPricing" )
+    Call<List<DistributorPricingDTO>> getAll( @QueryMap DistributorPricingQuery query );
+
+    /**
+     * @deprecated by {@link #getAll(DistributorPricingQuery)}
+     */
     @GET( "distributorPricing" )
     Call<List<DistributorPricingDTO>> getAll( @QueryMap Map<String, String> pageRequest );
 
+    /**
+     * @deprecated by {@link #getAll(DistributorPricingQuery)}
+     */
+    @Deprecated
     @GET( "distributorPricing" )
     Call<List<DistributorPricingDTO>> getAll(
             @Query( "productId" ) Integer productId,
diff --git a/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/DistributorPricingQuery.java b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/DistributorPricingQuery.java
new file mode 100644
index 000000000..0faa2bf3c
--- /dev/null
+++ b/cloudesire-api-client/src/main/java/com/cloudesire/platform/apiclient/query/DistributorPricingQuery.java
@@ -0,0 +1,39 @@
+package com.cloudesire.platform.apiclient.query;
+
+public class DistributorPricingQuery extends BaseQuery
+{
+    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 DEPRECATED = "deprecated";
+
+    public DistributorPricingQuery setPageRequest( PageRequestQuery pageRequestQuery )
+    {
+        putAll( pageRequestQuery );
+        return this;
+    }
+
+    public DistributorPricingQuery setCatalogId( Integer id )
+    {
+        put( CATALOG_ID, id );
+        return this;
+    }
+
+    public DistributorPricingQuery setProductId( Integer id )
+    {
+        put( PRODUCT_ID, id );
+        return this;
+    }
+
+    public DistributorPricingQuery setProductVersionId( Integer id )
+    {
+        put( PRODUCT_VERSION_ID, id );
+        return this;
+    }
+
+    public DistributorPricingQuery setDeprecated( Boolean deprecated )
+    {
+        put( DEPRECATED, deprecated );
+        return this;
+    }
+}
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 7e64b5e98..0188f823d 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
@@ -5,6 +5,7 @@ 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";
 
     public ResellerPricingQuery setPageRequest( PageRequestQuery pageRequestQuery )
@@ -13,27 +14,33 @@ public ResellerPricingQuery setPageRequest( PageRequestQuery pageRequestQuery )
         return this;
     }
 
-    public ResellerPricingQuery setResellerId( Integer name )
+    public ResellerPricingQuery setResellerId( Integer id )
     {
-        put( RESELLER_ID, name );
+        put( RESELLER_ID, id );
         return this;
     }
 
-    public ResellerPricingQuery setCatalogId( Integer name )
+    public ResellerPricingQuery setCatalogId( Integer id )
     {
-        put( CATALOG_ID, name );
+        put( CATALOG_ID, id );
         return this;
     }
 
-    public ResellerPricingQuery setProductId( Integer name )
+    public ResellerPricingQuery setProductId( Integer id )
     {
-        put( PRODUCT_ID, name );
+        put( PRODUCT_ID, id );
         return this;
     }
 
-    public ResellerPricingQuery setUnpriced( Boolean name )
+    public ResellerPricingQuery setProductVersionId( Integer id )
     {
-        put( UNPRICED, name );
+        put( PRODUCT_VERSION_ID, id );
+        return this;
+    }
+
+    public ResellerPricingQuery setUnpriced( Boolean unpriced )
+    {
+        put( UNPRICED, unpriced );
         return this;
     }
 }