Merge pull request #400 from wafflestudio/develop

Release

Author: asp345

core/src/main/kotlin/common/util/CoroutineUtils.kt

@@ -0,0 +1,36 @@
+package com.wafflestudio.snutt.common.util
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.delay
+import java.util.concurrent.Executors
+
+object CoroutineUtils {
+    val Dispatchers.Loom: CoroutineDispatcher
+        get() = Executors.newVirtualThreadPerTaskExecutor().asCoroutineDispatcher()
+    val applicationScope = CoroutineScope(SupervisorJob() + Dispatchers.Loom)
+
+    suspend fun <T> retryWithExponentialBackoff(
+        retries: Int = 10,
+        initialDelay: Long = 1000L,
+        factor: Long = 2L,
+        block: suspend () -> T,
+    ): T {
+        var currentDelay = initialDelay
+        for (i in 1..retries) {
+            try {
+                return block()
+            } catch (e: Exception) {
+                if (i == retries) {
+                    throw e
+                }
+                delay(currentDelay)
+                currentDelay *= factor
+            }
+        }
+        throw IllegalStateException("Can't reach here")
+    }
+}

core/src/main/kotlin/notification/service/DeviceService.kt

@@ -4,10 +4,10 @@ import com.wafflestudio.snutt.common.cache.Cache
 import com.wafflestudio.snutt.common.cache.CacheKey
 import com.wafflestudio.snutt.common.client.ClientInfo
 import com.wafflestudio.snutt.common.push.PushClient
+import com.wafflestudio.snutt.common.util.CoroutineUtils
 import com.wafflestudio.snutt.notification.data.UserDevice
 import com.wafflestudio.snutt.notification.repository.UserDeviceRepository
 import com.wafflestudio.snutt.users.repository.UserRepository
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import org.springframework.stereotype.Service
 import java.time.LocalDateTime
@@ -27,39 +27,39 @@ class DeviceService internal constructor(
         val cacheKey = CacheKey.LOCK_ADD_FCM_REGISTRATION_ID.build(userId, registrationId)
         if (!cache.acquireLock(cacheKey)) return
 
-        coroutineScope {
-            launch {
+        CoroutineUtils.applicationScope.launch {
+            CoroutineUtils.retryWithExponentialBackoff {
                 pushClient.subscribeGlobalTopic(registrationId)
             }
+        }
 
-            launch {
-                val userDevice =
-                    clientInfo.deviceId?.let {
-                        userDeviceRepository.findByUserIdAndDeviceIdAndIsDeletedFalse(userId, it)
-                    } ?: userDeviceRepository.findByUserIdAndFcmRegistrationIdAndIsDeletedFalse(userId, registrationId)
+        try {
+            val userDevice =
+                clientInfo.deviceId?.let {
+                    userDeviceRepository.findByUserIdAndDeviceIdAndIsDeletedFalse(userId, it)
+                } ?: userDeviceRepository.findByUserIdAndFcmRegistrationIdAndIsDeletedFalse(userId, registrationId)
 
-                userDevice?.apply {
-                    if (updateIfChanged(clientInfo, registrationId)) {
-                        userDeviceRepository.save(this)
-                    }
-                } ?: run {
-                    userDeviceRepository.save(
-                        UserDevice(
-                            userId = userId,
-                            osType = clientInfo.osType,
-                            osVersion = clientInfo.osVersion,
-                            deviceId = clientInfo.deviceId,
-                            deviceModel = clientInfo.deviceModel,
-                            appType = clientInfo.appType,
-                            appVersion = clientInfo.appVersion,
-                            fcmRegistrationId = registrationId,
-                        ),
-                    )
+            userDevice?.apply {
+                if (updateIfChanged(clientInfo, registrationId)) {
+                    userDeviceRepository.save(this)
                 }
+            } ?: run {
+                userDeviceRepository.save(
+                    UserDevice(
+                        userId = userId,
+                        osType = clientInfo.osType,
+                        osVersion = clientInfo.osVersion,
+                        deviceId = clientInfo.deviceId,
+                        deviceModel = clientInfo.deviceModel,
+                        appType = clientInfo.appType,
+                        appVersion = clientInfo.appVersion,
+                        fcmRegistrationId = registrationId,
+                    ),
+                )
             }
+        } finally {
+            cache.releaseLock(cacheKey)
         }
-
-        cache.releaseLock(cacheKey)
     }
 
     private fun UserDevice.updateIfChanged(
@@ -90,17 +90,16 @@ class DeviceService internal constructor(
     suspend fun removeRegistrationId(
         userId: String,
         registrationId: String,
-    ) = coroutineScope {
-        launch {
-            pushClient.unsubscribeGlobalTopic(registrationId)
-        }
-
-        launch {
-            userDeviceRepository.findByUserIdAndFcmRegistrationIdAndIsDeletedFalse(userId, registrationId)?.let {
-                it.isDeleted = true
-                userDeviceRepository.save(it)
+    ) {
+        CoroutineUtils.applicationScope.launch {
+            CoroutineUtils.retryWithExponentialBackoff {
+                pushClient.unsubscribeGlobalTopic(registrationId)
             }
         }
+        userDeviceRepository.findByUserIdAndFcmRegistrationIdAndIsDeletedFalse(userId, registrationId)?.let {
+            it.isDeleted = true
+            userDeviceRepository.save(it)
+        }
     }
 
     suspend fun getUserDevices(userId: String): List<UserDevice> =