fix: idempotency is per-client (#275)

migrations/1699887339_notifications-primary-key-includes-client-id.sql

@@ -0,0 +1,8 @@
+ALTER TABLE public.notifications
+    DROP CONSTRAINT notifications_pkey;
+
+ALTER TABLE public.notifications
+    ALTER COLUMN id SET NOT NULL;
+
+ALTER TABLE public.notifications
+    ADD PRIMARY KEY (id, client_id);

src/stores/notification.rs

@@ -48,11 +48,12 @@ impl NotificationStore for sqlx::PgPool {
         payload: &MessagePayload,
     ) -> stores::Result<Notification> {
         let res = sqlx::query_as::<sqlx::postgres::Postgres, Notification>(
-            "INSERT INTO public.notifications (id, tenant_id, client_id, last_payload)
-VALUES ($1, $2, $3, $4)
-ON CONFLICT (id)
-    DO UPDATE SET last_received_at  = now()
-RETURNING *;",
+            "
+            INSERT INTO public.notifications (id, tenant_id, client_id, last_payload)
+            VALUES ($1, $2, $3, $4)
+            ON CONFLICT (id, client_id)
+                DO UPDATE SET last_received_at  = now()
+            RETURNING *;",
         )
         .bind(id)
         .bind(tenant_id)

tests/functional/stores/notification.rs

@@ -55,17 +55,31 @@ async fn notification_multiple_clients_same_payload(ctx: &mut StoreContext) {
         blob: "example-payload".to_string(),
     };
 
-    let client_id = create_client(&ctx.clients).await;
+    let client_id1 = create_client(&ctx.clients).await;
     let res = ctx
         .notifications
-        .create_or_update_notification(&message_id, TENANT_ID, &client_id, &payload)
+        .create_or_update_notification(&message_id, TENANT_ID, &client_id1, &payload)
         .await;
     assert!(res.is_ok());
 
-    let client_id = create_client(&ctx.clients).await;
+    let client_id2 = create_client(&ctx.clients).await;
     let res = ctx
         .notifications
-        .create_or_update_notification(&message_id, TENANT_ID, &client_id, &payload)
+        .create_or_update_notification(&message_id, TENANT_ID, &client_id2, &payload)
         .await;
     assert!(res.is_ok());
+
+    let notification1 = ctx
+        .notifications
+        .get_notification(&message_id, &client_id1, TENANT_ID)
+        .await
+        .unwrap();
+    assert_eq!(notification1.client_id, client_id1);
+
+    let notification2 = ctx
+        .notifications
+        .get_notification(&message_id, &client_id2, TENANT_ID)
+        .await
+        .unwrap();
+    assert_eq!(notification2.client_id, client_id2);
 }