Fix user device unregistration in case of failed PNs

sama-app · Nov 17, 2021 · ec85609 · ec85609
1 parent 0bf52bf
commit ec85609
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/src/main/java/com/sama/comms/infrastructure/FirebaseNotificationSender.kt b/app/src/main/java/com/sama/comms/infrastructure/FirebaseNotificationSender.kt
@@ -48,7 +48,7 @@ class FirebaseNotificationSender(private val deviceRegistrationService: UserDevi
                     // Remove unregistered devices
                     if (e.messagingErrorCode == MessagingErrorCode.UNREGISTERED) {
                         kotlin.runCatching {
-                            deviceRegistrationService.unregister(UnregisterDeviceCommand(deviceId))
+                            deviceRegistrationService.unregister(receiverUserId, UnregisterDeviceCommand(deviceId))
                         }.onFailure {
                             logger.error("Error unregistering device#${deviceId}", it)
                         }

diff --git a/app/src/main/java/com/sama/users/application/UserDeviceRegistrationApplicationService.kt b/app/src/main/java/com/sama/users/application/UserDeviceRegistrationApplicationService.kt
@@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional
 @Service
 class UserDeviceRegistrationApplicationService(
     private val userRepository: UserRepository,
-    private val authUserService: AuthUserService
+    private val authUserService: AuthUserService,
 ) : UserDeviceRegistrationService {
 
     @Transactional(readOnly = true)
@@ -35,11 +35,16 @@ class UserDeviceRegistrationApplicationService(
     }
 
     @Transactional
-    override fun unregister(command: UnregisterDeviceCommand): Boolean {
-        val userId = authUserService.currentUserId()
+    override fun unregister(userId: UserId, command: UnregisterDeviceCommand): Boolean {
         val changes = userRepository.findDeviceRegistrationsByIdOrThrow(userId)
             .unregister(command.deviceId)
         userRepository.save(changes)
         return true
     }
+
+    @Transactional
+    override fun unregister(command: UnregisterDeviceCommand): Boolean {
+        val userId = authUserService.currentUserId()
+        return unregister(userId, command)
+    }
 }
diff --git a/app/src/main/java/com/sama/users/application/UserDeviceRegistrationService.kt b/app/src/main/java/com/sama/users/application/UserDeviceRegistrationService.kt
@@ -1,10 +1,13 @@
 package com.sama.users.application
 
+import com.sama.common.InternalApi
 import com.sama.users.domain.UserId
 
 interface UserDeviceRegistrationService {
     fun me(): UserDeviceRegistrationsDTO
     fun find(userId: UserId): UserDeviceRegistrationsDTO
     fun register(command: RegisterDeviceCommand): Boolean
+    @InternalApi
+    fun unregister(userId: UserId, command: UnregisterDeviceCommand): Boolean
     fun unregister(command: UnregisterDeviceCommand): Boolean
 }