From 82c76bb9703e3d32566fa562db088046c49c8f5c Mon Sep 17 00:00:00 2001
From: Gilbert Kimutai <gilbertkimutai@gmail.com>
Date: Tue, 19 Mar 2019 06:35:29 +0300
Subject: [PATCH] Support for sending arrays in url for filters with arrays
 Also able to get similar products in one call

---
 .../me/gilo/wc/ui/product/ProductActivity.kt  | 20 ++++++++++++---
 .../woodroid/models/filters/ListFilter.java   | 25 ++++++++++++++++---
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt b/app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt
index 641e517..62c3244 100644
--- a/app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt
+++ b/app/src/main/java/me/gilo/wc/ui/product/ProductActivity.kt
@@ -3,6 +3,7 @@ package me.gilo.wc.ui.product
 import android.os.Bundle
 import android.support.v7.widget.LinearLayoutManager
 import android.text.Html
+import android.util.Log
 import android.view.View
 import kotlinx.android.synthetic.main.activity_product.*
 import kotlinx.android.synthetic.main.content_product.*
@@ -14,12 +15,15 @@ import me.gilo.wc.common.Status
 import me.gilo.wc.ui.state.ProgressDialogFragment
 import me.gilo.wc.viewmodels.ProductViewModel
 import me.gilo.woodroid.models.Product
+import me.gilo.woodroid.models.filters.ProductFilter
 import java.util.ArrayList
 
 class ProductActivity : BaseActivity() {
 
     lateinit var viewModel: ProductViewModel
-    val TAG = this::getLocalClassName
+    val TAG = this::getLocalClassName.toString()
+
+    var related_ids : IntArray = intArrayOf()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -34,7 +38,7 @@ class ProductActivity : BaseActivity() {
 
         if (productId != 0){
             product(productId)
-            similarProducts()
+
         }
 
         fab.setOnClickListener{addToCart(productId)}
@@ -46,7 +50,7 @@ class ProductActivity : BaseActivity() {
     private lateinit var products: ArrayList<Product>
 
     //TODO(Use the include product filter to get related products from API)
-    private fun similarProducts() {
+    private fun similarProducts(product: Product) {
         val layoutManager = LinearLayoutManager(baseContext, LinearLayoutManager.HORIZONTAL, false)
         rvShop.layoutManager = layoutManager
         rvShop.isNestedScrollingEnabled = false
@@ -56,7 +60,14 @@ class ProductActivity : BaseActivity() {
         adapter = HomeProductAdapter(products)
         rvShop.adapter = adapter
 
-        viewModel.products().observe(this, android.arch.lifecycle.Observer { response ->
+        val filter = ProductFilter()
+        filter.include = product.related_ids.toIntArray()
+
+        for (id in product.related_ids){
+            Log.d("Related ids", "" + id)
+        }
+
+        viewModel.products(filter).observe(this, android.arch.lifecycle.Observer { response ->
             when (response!!.status()) {
                 Status.LOADING -> {
 
@@ -121,6 +132,7 @@ class ProductActivity : BaseActivity() {
                 Status.SUCCESS -> {
                     val product = response.data()
                     setUpPage(product)
+                    similarProducts(product)
 
                 }
 
diff --git a/woodroid/src/main/java/me/gilo/woodroid/models/filters/ListFilter.java b/woodroid/src/main/java/me/gilo/woodroid/models/filters/ListFilter.java
index 364d780..9d184fb 100644
--- a/woodroid/src/main/java/me/gilo/woodroid/models/filters/ListFilter.java
+++ b/woodroid/src/main/java/me/gilo/woodroid/models/filters/ListFilter.java
@@ -1,10 +1,9 @@
 package me.gilo.woodroid.models.filters;
 
+import android.util.Log;
 import me.gilo.woodroid.utils.Converter;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public class ListFilter {
 
@@ -146,7 +145,25 @@ public class ListFilter {
     }
 
     public void addFilter(String filter, Object value){
-        filters.put(filter, value.toString());
+        if (value.getClass().isArray()){
+            if (value instanceof int[]) {
+                String values = "";
+                int[] items = (int[]) value;
+                for (int item : items){
+                    values += item + ",";
+                }
+
+                filters.put(filter, ""+values.substring(0, values.length() - 1));
+
+            }else {
+                List list = Arrays.asList(value);
+                for (Object item : list) {
+                    filters.put(filter, item.toString());
+                }
+            }
+        }else {
+            filters.put(filter, value.toString());
+        }
     }
 
     public Map<String, String> getFilters() {