feat: correct targetingData in OptableTargeting

Author: ValentinPostindustria

android_sdk/src/main/java/co/optable/android_sdk/OptableSDK.kt

@@ -9,7 +9,6 @@ import co.optable.android_sdk.core.network.NetworkClient
 import co.optable.android_sdk.core.network.NetworkResponse
 import co.optable.android_sdk.core.network.RequestInterceptor
 import co.optable.android_sdk.core.network.ResponseInterceptor
-import co.optable.android_sdk.core.network.edge.TargetingResponse
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
@@ -33,6 +32,7 @@ class OptableSDK(
     private val consentsManager = ConsentsManager(storage)
     private val adIdManager = GoogleAdIdManager(config)
     private val networkClient = createNetworkClient()
+    private val useCases = UseCases()
 
     /**
      * Calls the Optable Sandbox "identify" API, passing it the list of IDs,
@@ -142,18 +142,19 @@ class OptableSDK(
         GlobalScope.launch {
             val response = networkClient.targeting(ids)
 
-            MainScope().launch {
-                val optableResult = when (response) {
-                    is NetworkResponse.Success -> {
-                        val targeting = createOptableTargeting(response.result)
-                        storage.setTargeting(targeting)
-                        OptableResult.Success(targeting)
-                    }
+            val optableResult = when (response) {
+                is NetworkResponse.Success -> {
+                    val targeting = useCases.parseTargetingResponse(response.result)
+                    storage.setTargeting(targeting)
+                    OptableResult.Success(targeting)
+                }
 
-                    is NetworkResponse.Error -> {
-                        OptableResult.Error(response.message)
-                    }
+                is NetworkResponse.Error -> {
+                    OptableResult.Error(response.message)
                 }
+            }
+
+            MainScope().launch {
                 listener.onComplete(optableResult)
             }
         }
@@ -216,32 +217,5 @@ class OptableSDK(
         return NetworkClient(config, requestInterceptor, responseInterceptor)
     }
 
-    private fun createOptableTargeting(response: TargetingResponse): OptableTargeting {
-        val audiences = response.audience ?: return OptableTargeting(emptyMap(), response.ortb2.toString(), emptyMap())
-
-        val gamTargetingKeywords = mutableMapOf<String, List<String>>()
-        val targetingData = mutableMapOf<String, String>()
-
-        for (audience in audiences) {
-            val keyspace = audience.asJsonObject.get("keyspace").asString
-
-            if (keyspace == null || keyspace.isBlank()) continue
-
-            val ids = audience.asJsonObject.get("ids").asJsonArray
-            val gamIds = mutableListOf<String>()
-            for (id in ids) {
-                gamIds.add(id.asJsonObject.get("id").asString)
-            }
-
-            gamTargetingKeywords[keyspace] = gamIds
-            targetingData[keyspace] =  audience.toString()
-        }
-
-        return OptableTargeting(
-            gamTargetingKeywords,
-            response.ortb2.toString(),
-            targetingData,
-        )
-    }
 }
 

android_sdk/src/main/java/co/optable/android_sdk/OptableTargeting.kt

@@ -1,14 +1,17 @@
 package co.optable.android_sdk
 
+import org.json.JSONObject
+
+
 /**
  * @param gamTargetingKeywords Targeting keywords for GAM.
  * Should be applied to `AdManagerAdRequest.Builder.addCustomTargeting`.
  * @param openRtbJson Partial OpenRTB JSON string. Should be merged with OpenRTB request.
  * For Prebid SDK use `TargetingParams.setGlobalOrtbConfig`.
- * @param targetingData Complete audience JSON strings grouped by keyspace. Allows dynamically parsing custom fields.
+ * @param targetingData Complete JSON response. Allows dynamically parsing custom fields.
  */
 data class OptableTargeting(
     val gamTargetingKeywords: Map<String, List<String>>,
     val openRtbJson: String?,
-    val targetingData: Map<String, String>,
+    val targetingData: JSONObject,
 )

android_sdk/src/main/java/co/optable/android_sdk/core/UseCases.kt

@@ -0,0 +1,59 @@
+package co.optable.android_sdk.core
+
+import android.util.Log
+import co.optable.android_sdk.OptableTargeting
+import com.google.gson.JsonObject
+import org.json.JSONObject
+
+class UseCases {
+
+    fun parseTargetingResponse(responseJson: JsonObject): OptableTargeting {
+        val gamTargetingKeywords = parseTargetingKeywords(responseJson)
+        val openRtbJson = parseOpenRtbJson(responseJson)
+        val targetingData = parseTargetingData(responseJson)
+        return OptableTargeting(gamTargetingKeywords, openRtbJson, targetingData)
+    }
+
+    private fun parseTargetingData(responseJson: JsonObject): JSONObject {
+        var targetingData = JSONObject()
+        try {
+            targetingData = JSONObject(responseJson.toString())
+        } catch (e: Exception) {
+        }
+        return targetingData
+    }
+
+    private fun parseOpenRtbJson(responseJson: JsonObject): String? {
+        var openRtbJson: String? = null
+        try {
+            openRtbJson = responseJson.getAsJsonObject("ortb2").toString()
+        } catch (e: Exception) {
+            Log.d("OptableSDK", "Can't parse OpenRTB: ${e.message}")
+        }
+        return openRtbJson
+    }
+
+    private fun parseTargetingKeywords(responseJson: JsonObject): MutableMap<String, List<String>> {
+        val gamTargetingKeywords = mutableMapOf<String, List<String>>()
+        try {
+            val audienceJsonArray = responseJson.getAsJsonArray("audience")
+            for (audience in audienceJsonArray) {
+                val keyspace = audience.asJsonObject.get("keyspace").asString
+
+                if (keyspace == null || keyspace.isBlank()) continue
+
+                val ids = audience.asJsonObject.get("ids").asJsonArray
+                val gamIds = mutableListOf<String>()
+                for (id in ids) {
+                    gamIds.add(id.asJsonObject.get("id").asString)
+                }
+
+                gamTargetingKeywords[keyspace] = gamIds
+            }
+        } catch (e: Exception) {
+            Log.d("OptableSDK", "Can't parse GAM targeting keywords: ${e.message}")
+        }
+        return gamTargetingKeywords
+    }
+
+}

android_sdk/src/main/java/co/optable/android_sdk/core/network/NetworkClient.kt

@@ -3,7 +3,7 @@ package co.optable.android_sdk.core.network
 import co.optable.android_sdk.OptableConfig
 import co.optable.android_sdk.OptableIdentifiers
 import co.optable.android_sdk.core.network.edge.EdgeService
-import co.optable.android_sdk.core.network.edge.TargetingResponse
+import com.google.gson.JsonObject
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.OkHttpClient
@@ -51,7 +51,7 @@ internal class NetworkClient(
         }
     }
 
-    suspend fun targeting(idList: OptableIdentifiers): NetworkResponse<TargetingResponse> {
+    suspend fun targeting(idList: OptableIdentifiers): NetworkResponse<JsonObject> {
         return runSafe {
             val ids = idList.generateEIDs()
             edgeService.targeting(ids)

android_sdk/src/main/java/co/optable/android_sdk/core/network/edge/EdgeService.kt

@@ -4,6 +4,7 @@
  */
 package co.optable.android_sdk.core.network.edge
 
+import com.google.gson.JsonObject
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
@@ -13,7 +14,7 @@ import retrofit2.http.Query
 interface EdgeService {
 
     @GET("targeting")
-    suspend fun targeting(@Query("id") idList: List<String>): Response<TargetingResponse>
+    suspend fun targeting(@Query("id") idList: List<String>): Response<JsonObject>
 
     @POST("identify")
     suspend fun identify(@Body idList: List<String>): Response<Unit>