fix: sync raven push user tokens (#2075)

* fix(notification): use delete_doc for unsubscribing notification

* feat(notification): add SyncDataButton component

* fix(notification): group user tokens into chunks for push notifications

Author: prathameshkurunkar7

frontend/src/pages/settings/PushNotifications.tsx

@@ -215,15 +215,7 @@ const PushNotifications = () => {
                                 <RegisterSiteButton mutate={mutate} ravenSettings={ravenSettings} />}
 
                             {isRavenCloud && ravenSettings?.push_notification_service === "Raven"
-                                && ravenSettings?.push_notification_server_url && ravenSettings?.vapid_public_key && <Button
-                                    onClick={() => call.post('raven.api.notification.sync_user_tokens_to_raven_cloud').then(() => {
-                                        toast.success('Data syncing to Raven Cloud...')
-                                    })}
-                                    type='button'
-                                    variant='soft'
-                                    className='not-cal'>
-                                    Sync Data to Raven Cloud
-                                </Button>}
+                                && ravenSettings?.push_notification_server_url && ravenSettings?.vapid_public_key && <SyncDataButton />}
 
                             {!isRavenCloud && <Button
                                 asChild
@@ -270,4 +262,25 @@ const RegisterSiteButton = ({ mutate, ravenSettings }: { mutate: VoidFunction, r
 
 }
 
+const SyncDataButton = () => {
+    const { call, loading } = useFrappePostCall('raven.api.notification.sync_user_tokens_to_raven_cloud')
+
+    const syncData = () => {
+        toast.promise(call({}), {
+            loading: 'Syncing data to Raven Cloud...',
+            success: 'Data synced to Raven Cloud.',
+            error: (error) => 'Failed to sync data to Raven Cloud. ' + (getErrorMessage(error))
+        })
+    }
+
+    return <Button
+        onClick={syncData}
+        disabled={loading}
+        variant='soft'
+        type='button'
+        className='not-cal'>
+        {loading ? "Syncing Data to Raven Cloud..." : "Sync Data to Raven Cloud"}
+    </Button>
+}
+
 export const Component = PushNotifications

raven/api/notification.py

@@ -104,6 +104,14 @@ def unsubscribe(fcm_token: str) -> None:
 	Remove the FCM token from the database
 	"""
 
-	frappe.db.delete("Raven Push Token", {"fcm_token": fcm_token, "user": frappe.session.user})
+	# Check if the FCM token exists
+	token_name = frappe.db.exists(
+		"Raven Push Token", {"fcm_token": fcm_token, "user": frappe.session.user}
+	)
+	if not token_name:
+		frappe.throw(_("FCM token not found"))
+
+	# Delete the FCM token from the database using delete_doc to ensure that on_trash method gets called to delete the token from RC/FCP.
+	frappe.delete_doc("Raven Push Token", token_name)
 
 	return "Unsubscribed"

raven/raven_cloud_notifications.py

@@ -65,8 +65,21 @@ def sync_users_tokens_to_raven_cloud():
 	raven_settings = frappe.get_single("Raven Settings")
 	tokens = frappe.db.get_all("Raven Push Token", fields=["user", "fcm_token"], order_by="user")
 
-	# We need to divide these into chunks of 10
-	chunks = [tokens[i : i + 10] for i in range(0, len(tokens), 10)]
+	# Group tokens by user to ensure all tokens for a user are in the same chunk
+	user_tokens = {}
+	for token in tokens:
+		user_tokens.setdefault(token["user"], []).append(token)
+
+		# Build chunks where all tokens for a user stay together
+	chunks = []
+	current_chunk = []
+	for user, user_token_list in user_tokens.items():
+		if len(current_chunk) + len(user_token_list) > 10 and current_chunk:
+			chunks.append(current_chunk)
+			current_chunk = []
+		current_chunk.extend(user_token_list)
+	if current_chunk:
+		chunks.append(current_chunk)
 
 	for chunk in chunks:
 		client = FrappeClient(