fix: login operation not removed from queue within postCreateDelay

Author: jinliu9508

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationRepo.kt

@@ -241,18 +241,6 @@ internal class OperationRepo(
                     queue.forEach { it.operation.translateIds(response.idTranslations) }
                 }
                 response.idTranslations.values.forEach { _newRecordState.add(it) }
-                // Stall processing the queue so the backend's DB has to time
-                // reflect the change before we do any other operations to it.
-                // NOTE: Future: We could run this logic in a
-                // coroutineScope.launch() block so other operations not
-                // effecting this these id's can still be done in parallel,
-                // however other parts of the system don't currently account
-                // for this so this is not safe to do.
-                val waitTime = _configModelStore.model.opRepoPostCreateDelay
-                delay(waitTime)
-                synchronized(queue) {
-                    if (queue.isNotEmpty()) waiter.wake(LoopWaiterMessage(false, waitTime))
-                }
             }
 
             var highestRetries = 0
@@ -316,7 +304,11 @@ internal class OperationRepo(
                 }
             }
 
+            // wait for retry and post create waiters to start next operation
             delayBeforeNextExecution(highestRetries, response.retryAfterSeconds)
+            if (response.idTranslations != null) {
+                delayForPostCreate(_configModelStore.model.opRepoPostCreateDelay)
+            }
         } catch (e: Throwable) {
             Logging.log(LogLevel.ERROR, "Error attempting to execute operation: $ops", e)
 
@@ -345,6 +337,22 @@ internal class OperationRepo(
         }
     }
 
+    /**
+     * Stall processing the queue so the backend's DB has to time
+     * reflect the change before we do any other operations to it.
+     * NOTE: Future: We could run this logic in a
+     * coroutineScope.launch() block so other operations not
+     * effecting this these id's can still be done in parallel,
+     * however other parts of the system don't currently account
+     * for this so this is not safe to do.
+     */
+    suspend fun delayForPostCreate(postCreateDelay: Long) {
+        delay(postCreateDelay)
+        synchronized(queue) {
+            if (queue.isNotEmpty()) waiter.wake(LoopWaiterMessage(false, postCreateDelay))
+        }
+    }
+
     internal fun getNextOps(bucketFilter: Int): List<OperationQueueItem>? {
         return synchronized(queue) {
             val startingOp =

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt

@@ -215,7 +215,7 @@ class OperationRepoTests : FunSpec({
         // Given
         val mocks = Mocks()
         val opRepo = mocks.operationRepo
-        coEvery { opRepo.delayBeforeNextExecution(any(), any()) } just runs
+        coEvery { opRepo.delayBeforeNextExecution(any(), any(), any()) } just runs
         coEvery {
             mocks.executor.execute(any())
         } returns ExecutionResponse(ExecutionResult.FAIL_RETRY) andThen ExecutionResponse(ExecutionResult.SUCCESS)
@@ -239,7 +239,7 @@ class OperationRepoTests : FunSpec({
                     it[0] shouldBe operation
                 },
             )
-            opRepo.delayBeforeNextExecution(1, null)
+            opRepo.delayBeforeNextExecution(1, null, 0)
             mocks.executor.execute(
                 withArg {
                     it.count() shouldBe 1