Refactored order handling system

Author: amir-shiati

AndroidWoocommerceSDK/src/main/java/com/amirshiati/androidwoocommercesdk/AttributeManager.java

@@ -3,18 +3,13 @@
 import android.net.Uri;
 
 import com.amirshiati.androidwoocommercesdk.enums.AttributeManagerType;
-import com.amirshiati.androidwoocommercesdk.enums.AttributeOrderBy;
-import com.amirshiati.androidwoocommercesdk.enums.CategoryManagerType;
-import com.amirshiati.androidwoocommercesdk.helper.AttributeJsonConverter;
-import com.amirshiati.androidwoocommercesdk.helper.CategoryJsonConverter;
-import com.amirshiati.androidwoocommercesdk.helper.Utils;
+import com.amirshiati.androidwoocommercesdk.json.AttributeJsonConverter;
 import com.amirshiati.androidwoocommercesdk.helper.Volley;
 import com.amirshiati.androidwoocommercesdk.interfaces.OnGetAttributeFinished;
 import com.amirshiati.androidwoocommercesdk.interfaces.OnGetAttributesFinished;
 import com.amirshiati.androidwoocommercesdk.interfaces.OnGetJsonArrayFinished;
 import com.amirshiati.androidwoocommercesdk.interfaces.OnGetJsonObjectFinished;
 import com.amirshiati.androidwoocommercesdk.model.Attribute;
-import com.amirshiati.androidwoocommercesdk.model.Category;
 import com.android.volley.Request;
 import com.android.volley.VolleyError;
 

AndroidWoocommerceSDK/src/main/java/com/amirshiati/androidwoocommercesdk/CategoryManager.java

@@ -5,7 +5,7 @@
 import com.amirshiati.androidwoocommercesdk.enums.CategoryManagerType;
 import com.amirshiati.androidwoocommercesdk.enums.CategoryOrderBy;
 import com.amirshiati.androidwoocommercesdk.enums.OrderSort;
-import com.amirshiati.androidwoocommercesdk.helper.CategoryJsonConverter;
+import com.amirshiati.androidwoocommercesdk.json.CategoryJsonConverter;
 import com.amirshiati.androidwoocommercesdk.helper.Utils;
 import com.amirshiati.androidwoocommercesdk.helper.Volley;
 import com.amirshiati.androidwoocommercesdk.interfaces.OnGetCategoriesFinished;

AndroidWoocommerceSDK/src/main/java/com/amirshiati/androidwoocommercesdk/OrderManager.java

@@ -8,7 +8,7 @@
 import com.amirshiati.androidwoocommercesdk.enums.ProductStatus;
 import com.amirshiati.androidwoocommercesdk.enums.ProductStockStatus;
 import com.amirshiati.androidwoocommercesdk.enums.ProductType;
-import com.amirshiati.androidwoocommercesdk.helper.ProductJsonConverter;
+import com.amirshiati.androidwoocommercesdk.json.ProductJsonConverter;
 import com.amirshiati.androidwoocommercesdk.helper.Utils;
 import com.amirshiati.androidwoocommercesdk.helper.Volley;
 import com.amirshiati.androidwoocommercesdk.interfaces.OnGetJsonArrayFinished;

AndroidWoocommerceSDK/src/main/java/com/amirshiati/androidwoocommercesdk/ProductManager.java

@@ -7,19 +7,12 @@
 import com.amirshiati.androidwoocommercesdk.enums.CategoryManagerType;
 import com.amirshiati.androidwoocommercesdk.enums.OrderManageType;
 import com.amirshiati.androidwoocommercesdk.enums.ProductManagerType;
-import com.amirshiati.androidwoocommercesdk.helper.ProductJsonConverter;
+import com.amirshiati.androidwoocommercesdk.handler.OrderHandler;
 import com.amirshiati.androidwoocommercesdk.helper.UriBuilder;
+import com.amirshiati.androidwoocommercesdk.helper.UriBuilderSingleton;
 import com.amirshiati.androidwoocommercesdk.helper.Volley;
-import com.amirshiati.androidwoocommercesdk.interfaces.OnGetJsonArrayFinished;
-import com.amirshiati.androidwoocommercesdk.interfaces.OnGetProductsFinished;
-import com.amirshiati.androidwoocommercesdk.model.Product;
-import com.android.volley.Request;
-import com.android.volley.VolleyError;
-
-import org.json.JSONArray;
-
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
+import com.amirshiati.androidwoocommercesdk.interfaces.OnResponse;
+import com.amirshiati.androidwoocommercesdk.interfaces.ParamBuilder;
 
 public class WooSDK {
 
@@ -31,6 +24,7 @@ public class WooSDK {
     private int timeOut = 10000;
 
     private Volley volley;
+    private UriBuilderSingleton uriBuilderSingleton;
 
     public WooSDK(Context context, String ckKey, String csKey, String domainName) {
         this.context = context;
@@ -39,6 +33,7 @@ public WooSDK(Context context, String ckKey, String csKey, String domainName) {
         this.domainName = domainName;
 
         volley = new Volley(context, ckKey, csKey, timeOut);
+        uriBuilderSingleton = UriBuilderSingleton.getInstance(domainName);
     }
 
     public ProductManager getProducts() {
@@ -65,12 +60,14 @@ public AttributeManager getAttributes(long attributeId) {
         return new AttributeManager(UriBuilder.getAttribute(domainName, attributeId), AttributeManagerType.GETATTRIBUTE, volley);
     }
 
-    public OrderManager getOrders() {
-        return new OrderManager(UriBuilder.getOrders(domainName), OrderManageType.GETORDERS, volley);
+    public void getOrder(long id, OnResponse onResponse) {
+        OrderHandler orderHandler = new OrderHandler(uriBuilderSingleton, volley);
+        orderHandler.get(id, onResponse);
     }
 
-    public OrderManager getOrder(long orderId) {
-        return new OrderManager(UriBuilder.getOrder(domainName, orderId), OrderManageType.GETORDER, volley);
+    public void getOrders(ParamBuilder paramBuilder, OnResponse onResponse) {
+        OrderHandler orderHandler = new OrderHandler(uriBuilderSingleton, volley);
+        orderHandler.getList(paramBuilder, onResponse);
     }
 
 }