[MP-2072] Reinstate device attributes (#124)

* [MP-2072] Reinstate device attributes * [MP-2072] Fix array handling and improve test coverage
sailthru · Dec 11, 2024 · db8a7fb · db8a7fb
1 parent c4e55d0
commit db8a7fb
Show file tree

Hide file tree

Showing 14 changed files with 1,220 additions and 71 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -68,6 +68,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 }
 
 repositories {
@@ -83,7 +86,7 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
 dependencies {
     //noinspection GradleDynamicVersion
     api "com.facebook.react:react-android:+"
-    api "com.marigold.sdk:marigold:23.0.0"
+    api "com.marigold.sdk:marigold:24.0.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1'

diff --git a/android/src/main/java/com/marigold/rnsdk/RNEngageBySailthruModule.kt b/android/src/main/java/com/marigold/rnsdk/RNEngageBySailthruModule.kt
@@ -9,12 +9,15 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.marigold.sdk.EngageBySailthru
 import com.marigold.sdk.Marigold
+import com.marigold.sdk.enums.MergeRules
+import com.marigold.sdk.model.AttributeMap
 import com.marigold.sdk.model.Purchase
 import org.json.JSONException
 import org.json.JSONObject
 import java.net.URI
 import java.net.URISyntaxException
 import java.util.ArrayList
+import java.util.Date
 
 class RNEngageBySailthruModule (reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
@@ -58,6 +61,51 @@ class RNEngageBySailthruModule (reactContext: ReactApplicationContext) : ReactCo
         })
     }
 
+    @ReactMethod
+    fun setAttributes(readableMap: ReadableMap, promise: Promise) {
+        val attributeMap = try {
+            getAttributeMap(readableMap)
+        } catch (e: JSONException) {
+            promise.reject(ERROR_CODE_DEVICE, e.message)
+            return
+        }
+        createEngageBySailthru(promise)?.setAttributes(attributeMap, object : EngageBySailthru.AttributesHandler {
+            override fun onSuccess() {
+                promise.resolve(null)
+            }
+
+            override fun onFailure(error: Error) {
+                promise.reject(ERROR_CODE_DEVICE, error.message)
+            }
+        })
+    }
+
+    @ReactMethod
+    fun removeAttribute(key: String, promise: Promise) {
+       createEngageBySailthru(promise)?.removeAttribute(key, object : EngageBySailthru.AttributesHandler {
+            override fun onSuccess() {
+                promise.resolve(null)
+            }
+
+            override fun onFailure(error: Error) {
+                promise.reject(ERROR_CODE_DEVICE, error.message)
+            }
+        })
+    }
+
+    @ReactMethod
+    fun clearAttributes(promise: Promise) {
+        createEngageBySailthru(promise)?.clearAttributes(object : EngageBySailthru.AttributesHandler {
+            override fun onSuccess() {
+                promise.resolve(true)
+            }
+
+            override fun onFailure(error: Error) {
+                promise.reject(ERROR_CODE_DEVICE, error.message)
+            }
+        })
+    }
+
     @ReactMethod
     fun setUserId(userId: String?, promise: Promise) {
         createEngageBySailthru(promise)?.setUserId(userId, object : Marigold.MarigoldHandler<Void?> {
@@ -240,4 +288,77 @@ class RNEngageBySailthruModule (reactContext: ReactApplicationContext) : ReactCo
         promise.reject(ERROR_CODE_PURCHASE, e.message)
         null
     }
+
+    @VisibleForTesting
+    @Throws(JSONException::class)
+    fun getAttributeMap(readableMap: ReadableMap): AttributeMap {
+        val attributeMapJson = jsonConverter.convertMapToJson(readableMap)
+        val attributes = attributeMapJson.getJSONObject("attributes")
+        val attributeMap = AttributeMap()
+        val mergeRule = MergeRules.entries[attributeMapJson.getInt("mergeRule")]
+        attributeMap.setMergeRules(mergeRule)
+        attributes.keys().forEach { key ->
+            val attribute = attributes.getJSONObject(key)
+            convertValue(key, attribute, attributeMap)
+        }
+        return attributeMap
+    }
+
+    private fun convertValue(key: String, attribute: JSONObject, attributeMap: AttributeMap) {
+        val attributeType = attribute.getString("type")
+        when (attributeType) {
+            "string" -> {
+                attributeMap.putString(key, attribute.getString("value"))
+            }
+            "stringArray" -> {
+                val array: ArrayList<String> = ArrayList()
+                val values = attribute.getJSONArray("value")
+                for (i in 0 until values.length()) {
+                    array.add(values.get(i) as String)
+                }
+                attributeMap.putStringArray(key, array)
+            }
+            "integer" -> {
+                attributeMap.putInt(key, attribute.getInt("value"))
+            }
+            "integerArray" -> {
+                val array: ArrayList<Int> = ArrayList()
+                val values = attribute.getJSONArray("value")
+                for (i in 0 until values.length()) {
+                    val j = values.getInt(i)
+                    array.add(j)
+                }
+                attributeMap.putIntArray(key, array)
+            }
+            "boolean" -> {
+                attributeMap.putBoolean(key, attribute.getBoolean("value"))
+            }
+            "float" -> {
+                attributeMap.putFloat(key, attribute.getDouble("value").toFloat())
+            }
+            "floatArray" -> {
+                val array: ArrayList<Float> = ArrayList()
+                val values = attribute.getJSONArray("value")
+                for (i in 0 until values.length()) {
+                    val value = (values.get(i).toString()).toFloat()
+                    array.add(value)
+                }
+                attributeMap.putFloatArray(key, array)
+            }
+            "date" -> {
+                val value = Date(attribute.getLong("value"))
+                attributeMap.putDate(key, value)
+            }
+            "dateArray" -> {
+                val array: ArrayList<Date> = ArrayList()
+                val values = attribute.getJSONArray("value")
+                for (i in 0 until values.length()) {
+                    val dateValue = values.getLong(i)
+                    val date = Date(dateValue)
+                    array.add(date)
+                }
+                attributeMap.putDateArray(key, array)
+            }
+        }
+    }
 }
diff --git a/android/src/main/java/com/marigold/rnsdk/RNMarigoldModule.kt b/android/src/main/java/com/marigold/rnsdk/RNMarigoldModule.kt
@@ -29,7 +29,7 @@ class RNMarigoldModule(reactContext: ReactApplicationContext) : ReactContextBase
                 val setWrapperMethod = companionClass.getDeclaredMethod("setWrapper", *cArg)
 
                 setWrapperMethod.isAccessible = true
-                setWrapperMethod.invoke(Marigold.Companion, "React Native", "13.0.0")
+                setWrapperMethod.invoke(Marigold.Companion, "React Native", "14.0.0")
             } catch (e: NoSuchMethodException) {
                 e.printStackTrace()
             } catch (e: IllegalAccessException) {

diff --git a/android/src/test/java/com/marigold/rnsdk/JsonConverterTest.kt b/android/src/test/java/com/marigold/rnsdk/JsonConverterTest.kt
@@ -181,7 +181,7 @@ class JsonConverterTest {
 
         val writableArray = jsonConverter.convertJsonToArray(jsonArray)
 
-        assertEquals("thing", writableArray.getMap(0).getString("some"))
+        assertEquals("thing", writableArray.getMap(0)?.getString("some"))
     }
 
     @Test
@@ -195,7 +195,7 @@ class JsonConverterTest {
 
         val writableArray = jsonConverter.convertJsonToArray(jsonArray)
 
-        assertEquals("inner string", writableArray.getArray(0).getString(0))
+        assertEquals("inner string", writableArray.getArray(0)?.getString(0))
     }
 
     @Test
@@ -221,8 +221,8 @@ class JsonConverterTest {
         assertEquals(123, writableArray.getInt(1))
         assertEquals(1.23, writableArray.getDouble(2), 0.001)
         assertEquals("test string", writableArray.getString(3))
-        assertEquals("thing", writableArray.getMap(4).getString("some"))
-        assertEquals("inner string", writableArray.getArray(5).getString(0))
+        assertEquals("thing", writableArray.getMap(4)?.getString("some"))
+        assertEquals("inner string", writableArray.getArray(5)?.getString(0))
     }