WIP 5

OneSignal · Aug 9, 2024 · ecaef33 · ecaef33
1 parent 274b886
commit ecaef33
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 15 deletions.
diff --git a/...nal/core/src/main/java/com/onesignal/user/internal/backend/ISubscriptionBackendService.kt b/...nal/core/src/main/java/com/onesignal/user/internal/backend/ISubscriptionBackendService.kt
@@ -34,7 +34,7 @@ interface ISubscriptionBackendService {
         appId: String,
         subscriptionId: String,
         subscription: SubscriptionObject,
-    ) : Long
+    ) : Long?
 
     /**
      * Delete an existing subscription.

diff --git a/...K/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt b/...K/onesignal/core/src/main/java/com/onesignal/user/internal/backend/IUserBackendService.kt
@@ -47,7 +47,7 @@ interface IUserBackendService {
         properties: PropertiesObject,
         refreshDeviceMetadata: Boolean,
         propertyiesDelta: PropertiesDeltasObject,
-    ) : Long
+    ) : Long?
 
     /**
      * Retrieve a user from the backend.

diff --git a/...core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt b/...core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt
@@ -34,15 +34,19 @@ internal class SubscriptionBackendService(
         }
 
         val responseBody = JSONObject(response.payload)
-        val offset = responseBody.getLong("offset")
+        var offset: Long? = null
+        if (responseBody.has("offset")) {
+            offset = responseBody.getLong("offset")
+        }
+
         return Pair(subscriptionJSON.getString("id"), offset)
     }
 
     override suspend fun updateSubscription(
         appId: String,
         subscriptionId: String,
         subscription: SubscriptionObject,
-    ) : Long {
+    ) : Long? {
         val requestJSON =
             JSONObject()
                 .put("subscription", JSONConverter.convertToJSON(subscription))
@@ -54,7 +58,11 @@ internal class SubscriptionBackendService(
         }
 
         val responseBody = JSONObject(response.payload)
-        return responseBody.getLong("offset")
+        return if (responseBody.has("offset")) {
+            responseBody.getLong("offset")
+        } else {
+            null
+        }
     }
 
     override suspend fun deleteSubscription(

diff --git a/...esignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt b/...esignal/core/src/main/java/com/onesignal/user/internal/backend/impl/UserBackendService.kt
@@ -52,7 +52,7 @@ internal class UserBackendService(
         properties: PropertiesObject,
         refreshDeviceMetadata: Boolean,
         propertyiesDelta: PropertiesDeltasObject,
-    ): Long {
+    ): Long? {
         val jsonObject =
             JSONObject()
                 .put("refresh_device_metadata", refreshDeviceMetadata)
@@ -72,10 +72,13 @@ internal class UserBackendService(
         }
 
         val responseBody = JSONObject(response.payload)
-        return responseBody.getLong("offset")
+        return if (responseBody.has("offset")) {
+            responseBody.getLong("offset")
+        } else {
+            null
+        }
     }
 
-
     override suspend fun getUser(
         appId: String,
         aliasLabel: String,

diff --git a/...core/src/test/java/com/onesignal/user/internal/backend/SubscriptionBackendServiceTests.kt b/...core/src/test/java/com/onesignal/user/internal/backend/SubscriptionBackendServiceTests.kt
@@ -42,7 +42,7 @@ class SubscriptionBackendServiceTests : FunSpec({
         val response = subscriptionBackendService.createSubscription("appId", aliasLabel, aliasValue, subscription)
 
         // Then
-        response shouldBe "subscriptionId"
+        response shouldBe Pair("subscriptionId", null)
         coVerify {
             spyHttpClient.post(
                 "apps/appId/users/by/$aliasLabel/$aliasValue/subscriptions",

diff --git a/...n-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt b/...n-app-messages/src/main/java/com/onesignal/inAppMessages/internal/InAppMessagesManager.kt
@@ -2,9 +2,9 @@ package com.onesignal.inAppMessages.internal
 
 import android.app.AlertDialog
 import com.onesignal.common.AndroidUtils
+import com.onesignal.common.ConsistencyManager
 import com.onesignal.common.IDManager
 import com.onesignal.common.JSONUtils
-import com.onesignal.common.ConsistencyManager
 import com.onesignal.common.consistency.IamFetchReadyCondition
 import com.onesignal.common.events.EventProducer
 import com.onesignal.common.exceptions.BackendException
@@ -68,7 +68,7 @@ internal class InAppMessagesManager(
     private val _lifecycle: IInAppLifecycleService,
     private val _languageContext: ILanguageContext,
     private val _time: ITime,
-    private val _consistencyManager: ConsistencyManager
+    private val _consistencyManager: ConsistencyManager,
 ) : IInAppMessagesManager,
     IStartableService,
     ISubscriptionChangedHandler,
@@ -205,7 +205,6 @@ internal class InAppMessagesManager(
 
     override fun onSubscriptionRemoved(subscription: ISubscription) { }
 
-
     override fun onSubscriptionChanged(
         subscription: ISubscription,
         args: ModelChangedArgs,

diff --git a/...ssages/src/main/java/com/onesignal/inAppMessages/internal/backend/IInAppBackendService.kt b/...ssages/src/main/java/com/onesignal/inAppMessages/internal/backend/IInAppBackendService.kt
@@ -20,7 +20,7 @@ internal interface IInAppBackendService {
     suspend fun listInAppMessages(
         appId: String,
         subscriptionId: String,
-        offset: Long? = null
+        offset: Long? = null,
     ): List<InAppMessage>?
 
     /**

diff --git a/...es/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt b/...es/src/main/java/com/onesignal/inAppMessages/internal/backend/impl/InAppBackendService.kt
@@ -22,7 +22,7 @@ internal class InAppBackendService(
     override suspend fun listInAppMessages(
         appId: String,
         subscriptionId: String,
-        offset: Long?
+        offset: Long?,
     ): List<InAppMessage>? {
         // Construct the URL with or without the Kafka offset parameter
         val url = buildString {

diff --git a/...-messages/src/test/java/com/onesignal/inAppMessages/internal/InAppMessagesManagerTests.kt b/...-messages/src/test/java/com/onesignal/inAppMessages/internal/InAppMessagesManagerTests.kt
@@ -53,7 +53,7 @@ class InAppMessagesManagerTests : FunSpec({
                 mockk<IInAppLifecycleService>(),
                 MockHelper.languageContext(),
                 MockHelper.time(1000),
-                mockk<ConsistencyManager>()
+                mockk<ConsistencyManager>(),
             )
 
         // When