update deleteSubscription method to pass subscriptionType and subscriptionToken

Author: fadi-george

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/ISubscriptionBackendService.kt

@@ -43,11 +43,13 @@ interface ISubscriptionBackendService {
      * Delete an existing subscription.
      *
      * @param appId The ID of the OneSignal application this subscription exists under.
-     * @param subscriptionId The ID of the subscription to delete.
+     * @param subscriptionType The type of the subscription to delete.
+     * @param subscriptionToken The token/address of the subscription to delete.
      */
     suspend fun deleteSubscription(
         appId: String,
-        subscriptionId: String,
+        subscriptionType: SubscriptionType,
+        subscriptionToken: String,
         jwt: String? = null,
     )
 

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/backend/impl/SubscriptionBackendService.kt

@@ -88,10 +88,12 @@ internal class SubscriptionBackendService(
 
     override suspend fun deleteSubscription(
         appId: String,
-        subscriptionId: String,
+        subscriptionType: SubscriptionType,
+        subscriptionToken: String,
         jwt: String?,
     ) {
-        val response = _httpClient.delete("apps/$appId/subscriptions/$subscriptionId", OptionalHeaders(jwt = jwt))
+        val type = subscriptionType.name.lowercase()
+        val response = _httpClient.delete("apps/$appId/by/type/$type/token/$subscriptionToken/subscriptions", OptionalHeaders(jwt = jwt))
 
         if (!response.isSuccess) {
             throw BackendException(response.statusCode, response.payload, response.retryAfterSeconds)

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/DeleteSubscriptionOperation.kt

@@ -3,7 +3,9 @@ package com.onesignal.user.internal.operations
 import com.onesignal.common.IDManager
 import com.onesignal.core.internal.operations.GroupComparisonType
 import com.onesignal.core.internal.operations.Operation
+import com.onesignal.user.internal.backend.SubscriptionObject
 import com.onesignal.user.internal.operations.impl.executors.SubscriptionOperationExecutor
+import com.onesignal.user.internal.subscriptions.SubscriptionType
 
 /**
  * An [Operation] to delete a subscription from the OneSignal backend.
@@ -33,21 +35,45 @@ class DeleteSubscriptionOperation() : Operation(SubscriptionOperationExecutor.DE
      * and can be checked via [IDManager.isLocalId] to ensure correct processing.
      */
     var subscriptionId: String
-        get() = getStringProperty(::subscriptionId.name)
+    get() = getStringProperty(::subscriptionId.name)
+    private set(value) {
+        setStringProperty(::subscriptionId.name, value)
+    }
+
+    /**
+     * The type of subscription.
+     */
+    var type: SubscriptionType
+        get() = getEnumProperty(::type.name)
         private set(value) {
-            setStringProperty(::subscriptionId.name, value)
+            setEnumProperty(::type.name, value)
         }
 
+    /**
+     * The address-specific information for this subscription. Its contents depends on the type
+     * of subscription:
+     *
+     * * [SubscriptionType.EMAIL]: An email address.
+     * * [SubscriptionType.SMS]: A phone number in E.164 format.
+     */
+    var address: String
+    get() = getStringProperty(::address.name)
+    private set(value) {
+        setStringProperty(::address.name, value)
+    }
+
     override val createComparisonKey: String get() = "$appId.User.$onesignalId"
     override val modifyComparisonKey: String get() = "$appId.User.$onesignalId.Subscription.$subscriptionId"
     override val groupComparisonType: GroupComparisonType = GroupComparisonType.NONE
     override val canStartExecute: Boolean get() = !IDManager.isLocalId(onesignalId) && !IDManager.isLocalId(subscriptionId)
     override val applyToRecordId: String get() = subscriptionId
 
-    constructor(appId: String, onesignalId: String, subscriptionId: String) : this() {
+    constructor(appId: String, onesignalId: String, subscriptionId: String, type: SubscriptionType, address: String) : this() {
         this.appId = appId
         this.onesignalId = onesignalId
         this.subscriptionId = subscriptionId
+        this.type = type
+        this.address = address
     }
 
     override fun translateIds(map: Map<String, String>) {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/SubscriptionOperationExecutor.kt

@@ -284,7 +284,7 @@ internal class SubscriptionOperationExecutor(
 
     private suspend fun deleteSubscription(op: DeleteSubscriptionOperation): ExecutionResponse {
         try {
-            _subscriptionBackend.deleteSubscription(op.appId, op.subscriptionId, _identityModelStore.model.jwtToken)
+            _subscriptionBackend.deleteSubscription(op.appId, op.type, op.address, _identityModelStore.model.jwtToken)
 
             // remove the subscription model as a HYDRATE in case for some reason it still exists.
             _subscriptionModelStore.remove(op.subscriptionId, ModelChangeTags.HYDRATE)

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/listeners/SubscriptionModelStoreListener.kt

@@ -32,7 +32,7 @@ internal class SubscriptionModelStoreListener(
     }
 
     override fun getRemoveOperation(model: SubscriptionModel): Operation {
-        return DeleteSubscriptionOperation(_configModelStore.model.appId, _identityModelStore.model.onesignalId, model.id)
+        return DeleteSubscriptionOperation(_configModelStore.model.appId, _identityModelStore.model.onesignalId, model.id, model.type, model.address)
     }
 
     override fun getUpdateOperation(