Merge pull request #450 from adamstoffel/fix-use-subscription-query-d…

…eletes
psteinroe · May 14, 2024 · a8e5d2d · a8e5d2d
2 parents 6acc709 + 230a0b1
commit a8e5d2d
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 3 deletions.
diff --git a/.changeset/small-trainers-flow.md b/.changeset/small-trainers-flow.md
@@ -0,0 +1,6 @@
+---
+"@supabase-cache-helpers/postgrest-react-query": patch
+"@supabase-cache-helpers/postgrest-swr": patch
+---
+
+fix: correctly handle delete payloads in useSubscriptionQuery
diff --git a/...e-subscription-query-integration.spec.tsx → ...e-subscription-query.integration.spec.tsx b/...e-subscription-query-integration.spec.tsx → ...e-subscription-query.integration.spec.tsx
@@ -107,6 +107,15 @@ describe('useSubscriptionQuery', () => {
     );
     expect(screen.getByTestId('count').textContent).toEqual('count: 1');
     await screen.findByText('cbCalled: true', {}, { timeout: 10000 });
+    await act(async () => {
+      await client
+        .from('contact')
+        .delete()
+        .eq('username', USERNAME_1)
+        .throwOnError();
+    });
+    await screen.findByText('count: 0', {}, { timeout: 10000 });
+    expect(screen.getByTestId('count').textContent).toEqual('count: 0');
     unmount();
   });
 });
diff --git a/packages/postgrest-react-query/__tests__/subscribe/use-subscription.integration.spec.tsx b/packages/postgrest-react-query/__tests__/subscribe/use-subscription.integration.spec.tsx
@@ -87,6 +87,15 @@ describe('useSubscription', () => {
     await screen.findByText('ticket_number: 5', {}, { timeout: 10000 });
     expect(screen.getByTestId('count').textContent).toEqual('count: 1');
     await screen.findByText('cbCalled: true', {}, { timeout: 10000 });
+    await act(async () => {
+      await client
+        .from('contact')
+        .delete()
+        .eq('username', USERNAME_1)
+        .throwOnError();
+    });
+    await screen.findByText('count: 0', {}, { timeout: 10000 });
+    expect(screen.getByTestId('count').textContent).toEqual('count: 0');
     unmount();
   });
 });
diff --git a/packages/postgrest-react-query/src/subscribe/use-subscription-query.ts b/packages/postgrest-react-query/src/subscribe/use-subscription-query.ts
@@ -147,7 +147,7 @@ function useSubscriptionQuery<
           } else if (
             payload.eventType === REALTIME_POSTGRES_CHANGES_LISTEN_EVENT.DELETE
           ) {
-            await deleteItem(data as Record<string, unknown>);
+            await deleteItem(payload.old);
           }
           if (opts?.callback) {
             opts.callback({

diff --git a/packages/postgrest-swr/__tests__/subscribe/use-subscription-query.integration.spec.tsx b/packages/postgrest-swr/__tests__/subscribe/use-subscription-query.integration.spec.tsx
@@ -116,6 +116,15 @@ describe('useSubscriptionQuery', () => {
     );
     expect(screen.getByTestId('count').textContent).toEqual('count: 1');
     await screen.findByText('cbCalled: true', {}, { timeout: 10000 });
+    await act(async () => {
+      await client
+        .from('contact')
+        .delete()
+        .eq('username', USERNAME_1)
+        .throwOnError();
+    });
+    await screen.findByText('count: 0', {}, { timeout: 10000 });
+    expect(screen.getByTestId('count').textContent).toEqual('count: 0');
     unmount();
   });
 });
diff --git a/packages/postgrest-swr/__tests__/subscribe/use-subscription.integration.spec.tsx b/packages/postgrest-swr/__tests__/subscribe/use-subscription.integration.spec.tsx
@@ -89,9 +89,18 @@ describe('useSubscription', () => {
         .eq('username', USERNAME_1)
         .throwOnError();
     });
-    await screen.findByText('cbCalled: true', {}, { timeout: 10000 });
     await screen.findByText('ticket_number: 5', {}, { timeout: 20000 });
+    await screen.findByText('cbCalled: true', {}, { timeout: 10000 });
     expect(screen.getByTestId('count').textContent).toEqual('count: 1');
+    await act(async () => {
+      await client
+        .from('contact')
+        .delete()
+        .eq('username', USERNAME_1)
+        .throwOnError();
+    });
+    await screen.findByText('count: 0', {}, { timeout: 10000 });
+    expect(screen.getByTestId('count').textContent).toEqual('count: 0');
     unmount();
   });
 });
diff --git a/packages/postgrest-swr/src/subscribe/use-subscription-query.ts b/packages/postgrest-swr/src/subscribe/use-subscription-query.ts
@@ -135,7 +135,7 @@ function useSubscriptionQuery<
           } else if (
             payload.eventType === REALTIME_POSTGRES_CHANGES_LISTEN_EVENT.DELETE
           ) {
-            await deleteItem(data as Record<string, unknown>);
+            await deleteItem(payload.old);
           }
           if (opts?.callback) {
             opts.callback({