Merge pull request #13 from airrobe/eli/bestCategoryMappingLogicUpdate

Eli/best category mapping logic update
airrobe · Apr 27, 2022 · 7264aec · 7264aec
2 parents 81b5a86 + 0f8f21f
commit 7264aec
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 31 deletions.
diff --git a/AirRobeWidget/releases/AirRobeWidget-1.0.2.aar b/AirRobeWidget/releases/AirRobeWidget-1.0.2.aar
diff --git a/AirRobeWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/AirRobeWidget.kt b/AirRobeWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/AirRobeWidget.kt
@@ -63,6 +63,9 @@ object AirRobeWidget {
         getShoppingDataController.airRobeGetShoppingDataListener = object : AirRobeGetShoppingDataListener {
             override fun onSuccessGetShoppingDataApi(shopModel: AirRobeGetShoppingDataModel) {
                 widgetInstance.shopModel = shopModel
+                for (i in 0 until shopModel.data.shop.categoryMappings.count()) {
+                    widgetInstance.categoryMapping.categoryMappingsHashmap[shopModel.data.shop.categoryMappings[i].from] = shopModel.data.shop.categoryMappings[i]
+                }
             }
 
             override fun onFailedGetShoppingDataApi(error: String?) {
@@ -72,16 +75,11 @@ object AirRobeWidget {
         getShoppingDataController.start(config.appId, config.mode)
     }
 
-    fun checkMultiOptInEligibility(items: Array<CharSequence>): Boolean {
-        if (widgetInstance.shopModel == null || items.isNullOrEmpty()) {
+    fun checkMultiOptInEligibility(items: ArrayList<String>): Boolean {
+        if (widgetInstance.shopModel == null || items.isNullOrEmpty() || widgetInstance.categoryMapping.categoryMappingsHashmap.isNullOrEmpty()) {
             return false
         }
-
-        val newItems = arrayListOf<String>()
-        for (item in items) {
-            newItems.add(item.toString())
-        }
-        val to = widgetInstance.shopModel!!.checkCategoryEligible(newItems)
+        val to = widgetInstance.categoryMapping.checkCategoryEligible(items)
         return to != null
     }
 

diff --git a/...idget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/config/AirRobeWidgetInstance.kt b/...idget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/config/AirRobeWidgetInstance.kt
@@ -1,5 +1,6 @@
 package com.airrobe.widgetsdk.airrobewidget.config
 
+import com.airrobe.widgetsdk.airrobewidget.service.models.AirRobeCategoryMappingHashMap
 import com.airrobe.widgetsdk.airrobewidget.service.models.AirRobeGetShoppingDataModel
 
 internal object AirRobeWidgetInstance {
@@ -8,6 +9,7 @@ internal object AirRobeWidgetInstance {
             field = value
             changeListener?.onShopModelChange()
         }
+    var categoryMapping = AirRobeCategoryMappingHashMap(HashMap())
     var configuration: AirRobeWidgetConfig? = null
         set(value) {
             field = value

diff --git a/.../kotlin/com/airrobe/widgetsdk/airrobewidget/service/models/AirRobeGetShoppingDataModel.kt b/.../kotlin/com/airrobe/widgetsdk/airrobewidget/service/models/AirRobeGetShoppingDataModel.kt
@@ -2,6 +2,21 @@ package com.airrobe.widgetsdk.airrobewidget.service.models
 
 internal data class AirRobeGetShoppingDataModel (
     var data: AirRobeShoppingDataModel
+) {
+    fun isBelowPriceThreshold(department: String?, price: Float) : Boolean {
+        if (department.isNullOrEmpty()) return false
+        val applicablePriceThreshold = data.shop.minimumPriceThresholds.firstOrNull {
+            it.department?.lowercase() == department.lowercase()
+        } ?: data.shop.minimumPriceThresholds.firstOrNull {
+            it.default
+        } ?: return false
+
+        return price < (applicablePriceThreshold.minimumPriceCents / 100)
+    }
+}
+
+internal data class AirRobeCategoryMappingHashMap(
+    var categoryMappingsHashmap: HashMap<String, AirRobeCategoryMapping>
 ) {
     fun checkCategoryEligible(items: ArrayList<String>): String? {
         val eligibleItem = items.firstOrNull { bestCategoryMapping(factorize(it)) != null }
@@ -22,9 +37,8 @@ internal data class AirRobeGetShoppingDataModel (
     }
 
     private fun bestCategoryMapping(categoryArray: List<String>): String? {
-        val categoryMappings = data.shop.categoryMappings
         for (category in categoryArray) {
-            val filteredMapping = categoryMappings.firstOrNull { it.from == category }
+            val filteredMapping = categoryMappingsHashmap[category]
             if (filteredMapping != null) {
                 return if (filteredMapping.to.isNullOrEmpty() || filteredMapping.excluded) {
                     null
@@ -35,17 +49,6 @@ internal data class AirRobeGetShoppingDataModel (
         }
         return null
     }
-
-    fun isBelowPriceThreshold(department: String?, price: Float) : Boolean {
-        if (department.isNullOrEmpty()) return false
-        val applicablePriceThreshold = data.shop.minimumPriceThresholds.firstOrNull {
-            it.department?.lowercase() == department.lowercase()
-        } ?: data.shop.minimumPriceThresholds.firstOrNull {
-            it.default
-        } ?: return false
-
-        return price < (applicablePriceThreshold.minimumPriceCents / 100)
-    }
 }
 
 internal data class AirRobeShoppingDataModel(

diff --git a/...beWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeMultiOptIn.kt b/...beWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeMultiOptIn.kt
@@ -43,7 +43,7 @@ class AirRobeMultiOptIn @JvmOverloads constructor(
         Closed
     }
     private var expandType: ExpandType = ExpandType.Closed
-    private var items: Array<CharSequence>? = arrayOf()
+    private var items: ArrayList<String> = arrayListOf()
 
     var borderColor: Int =
         if (widgetInstance.borderColor == 0)
@@ -245,7 +245,7 @@ class AirRobeMultiOptIn @JvmOverloads constructor(
     }
 
     fun initialize(
-        items: Array<CharSequence> = arrayOf()
+        items: ArrayList<String> = arrayListOf()
     ) {
         this.items = items
         initializeOptInWidget()
@@ -258,7 +258,7 @@ class AirRobeMultiOptIn @JvmOverloads constructor(
             AirRobeSharedPreferenceManager.setOrderOptedIn(context, false)
             return
         }
-        if (widgetInstance.shopModel == null) {
+        if (widgetInstance.shopModel == null || widgetInstance.categoryMapping.categoryMappingsHashmap.isNullOrEmpty()) {
             Log.e(TAG, "Category Mapping Info is not loaded")
             visibility = GONE
             AirRobeSharedPreferenceManager.setOrderOptedIn(context, false)
@@ -271,11 +271,7 @@ class AirRobeMultiOptIn @JvmOverloads constructor(
             return
         }
 
-        val newItems = arrayListOf<String>()
-        for (item in items!!) {
-            newItems.add(item.toString())
-        }
-        val to = widgetInstance.shopModel!!.checkCategoryEligible(newItems)
+        val to = widgetInstance.categoryMapping.checkCategoryEligible(items)
         if (to != null) {
             visibility = VISIBLE
             AirRobeSharedPreferenceManager.setOrderOptedIn(context, AirRobeSharedPreferenceManager.getOptedIn(context))

diff --git a/AirRobeWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeOptIn.kt b/AirRobeWidget/src/main/kotlin/com/airrobe/widgetsdk/airrobewidget/widgets/AirRobeOptIn.kt
@@ -300,7 +300,7 @@ class AirRobeOptIn @JvmOverloads constructor(
             visibility = GONE
             return
         }
-        val to = widgetInstance.shopModel!!.checkCategoryEligible(arrayListOf(category!!))
+        val to = widgetInstance.categoryMapping.checkCategoryEligible(arrayListOf(category!!))
         if (to != null) {
             if (widgetInstance.shopModel!!.isBelowPriceThreshold(department, priceCents)) {
                 visibility = GONE

diff --git a/demo/libs/AirRobeWidget.aar b/demo/libs/AirRobeWidget.aar
diff --git a/demo/src/main/java/com/airrobe/widgetsdk/airrobedemo/activities/MultiOptInActivity.kt b/demo/src/main/java/com/airrobe/widgetsdk/airrobedemo/activities/MultiOptInActivity.kt
@@ -12,7 +12,7 @@ class MultiOptInActivity : AppCompatActivity() {
         setContentView(R.layout.activity_multi_opt_in)
         val optInWidget = findViewById<AirRobeMultiOptIn>(R.id.multi_opt_in_widget)
         optInWidget.initialize(
-            arrayOf("Accessories", "Accessories")
+            arrayListOf("Accessories", "Accessories")
         )
         // Way to set widget colors
 //        optInWidget.borderColor = Color.BLUE