Corrections, linting, etc.

Author: maparent

apps/website/test/integration/list-group-members.test.ts

@@ -33,9 +33,7 @@ const signedInClient = async (spaceId: number): Promise<DGSupabaseClient> => {
 describe("list group members flow", { tags: ["database"] }, () => {
   let spaceId1: number;
   let spaceId2: number;
-  let spaceAccountId1: number;
   let spaceAccountUuid1: string;
-  let spaceAccountId2: number;
   let spaceAccountUuid2: string;
   let client1: DGSupabaseClient;
   let client2: DGSupabaseClient;
@@ -64,7 +62,6 @@ describe("list group members flow", { tags: ["database"] }, () => {
     assert(!accountReq1.error);
     assert(accountReq1.data);
     assert(accountReq1.data.dg_account);
-    spaceAccountId1 = accountReq1.data.id;
     spaceAccountUuid1 = accountReq1.data.dg_account;
     const s2 = await fetchOrCreateSpaceDirect({
       name: "vitest-s2",
@@ -88,7 +85,6 @@ describe("list group members flow", { tags: ["database"] }, () => {
     assert(!accountReq2.error);
     assert(accountReq2.data);
     assert(accountReq2.data.dg_account);
-    spaceAccountId2 = accountReq2.data.id;
     spaceAccountUuid2 = accountReq2.data.dg_account;
   });
 
@@ -109,14 +105,14 @@ describe("list group members flow", { tags: ["database"] }, () => {
     // Step 1: user1 creates a group
     const groupId = await createGroup(client1, "vitest-invite-group");
     assert(groupId !== null, "createGroup should return a group ID");
-    createdGroupId = groupId!;
+    createdGroupId = groupId;
 
     // Step 2: Add another member
     const { error: errorAddMember } = await client1
       .from("group_membership")
       .insert({
-        member_id: spaceAccountUuid2,
-        group_id: groupId,
+        member_id: spaceAccountUuid2, // eslint-disable-line @typescript-eslint/naming-convention
+        group_id: groupId, // eslint-disable-line @typescript-eslint/naming-convention
         admin: false,
       });
     assert(!errorAddMember);
@@ -125,17 +121,17 @@ describe("list group members flow", { tags: ["database"] }, () => {
     const { error: errorPublishSpace1 } = await client1
       .from("SpaceAccess")
       .insert({
-        space_id: spaceId1,
-        account_uid: groupId,
+        space_id: spaceId1, // eslint-disable-line @typescript-eslint/naming-convention
+        account_uid: groupId, // eslint-disable-line @typescript-eslint/naming-convention
         permissions: "partial",
       });
     assert(!errorPublishSpace1);
 
     const { error: errorPublishSpace2 } = await client2
       .from("SpaceAccess")
       .insert({
-        space_id: spaceId2,
-        account_uid: groupId,
+        space_id: spaceId2, // eslint-disable-line @typescript-eslint/naming-convention
+        account_uid: groupId, // eslint-disable-line @typescript-eslint/naming-convention
         permissions: "partial",
       });
     assert(!errorPublishSpace2);
@@ -145,8 +141,7 @@ describe("list group members flow", { tags: ["database"] }, () => {
     const { data: data1, error: error1 } = await client1.rpc(
       "spaces_in_group",
       {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        p_group_id: createdGroupId,
+        p_group_id: createdGroupId, // eslint-disable-line @typescript-eslint/naming-convention
       },
     );
     assert(error1 === null, error1 ? error1.message : "");
@@ -164,8 +159,7 @@ describe("list group members flow", { tags: ["database"] }, () => {
     const { data: data2, error: error2 } = await client2.rpc(
       "spaces_in_group",
       {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        p_group_id: createdGroupId,
+        p_group_id: createdGroupId, // eslint-disable-line @typescript-eslint/naming-convention
       },
     );
     assert(error2 === null, error2 ? error2.message : "");

packages/database/supabase/migrations/20260512130625_group_members_function.sql

@@ -38,13 +38,13 @@ CREATE TYPE public.group_space_info AS (
     admin boolean
 );
 
-CREATE OR REPLACE FUNCTION public.spaces_in_group(p_group_id UUID) RETURNS SETOF public."Space"
+CREATE OR REPLACE FUNCTION public.spaces_in_group(p_group_id UUID) RETURNS SETOF public.group_space_info
 STABLE
 SET search_path = ''
 LANGUAGE sql AS $$
     SELECT sp.id, sp.name, sp.platform, gm.admin FROM public."Space" AS sp
-    JOIN public.my_pseudo_accounts AS pa ON (sp.id = space_id)
+    JOIN public.my_pseudo_accounts AS pa ON (sp.id = pa.space_id)
     JOIN public.group_membership AS gm ON (gm.member_id = pa.dg_account)
-    JOIN public.group_membership AS gm2 ON (gm2.member_id = auth.uid() AND gm2.group_id = gm.group_id)
-    AND gm.group_id = p_group_id;
+    JOIN public.group_membership AS gm2 ON (gm2.group_id = gm.group_id)
+    AND gm.group_id = p_group_id AND gm2.member_id = auth.uid();
 $$;

packages/database/supabase/schemas/account.sql

@@ -477,15 +477,15 @@ CREATE TYPE public.group_space_info AS (
     admin boolean
 );
 
-CREATE OR REPLACE FUNCTION public.spaces_in_group(p_group_id UUID) RETURNS SETOF public."Space"
+CREATE OR REPLACE FUNCTION public.spaces_in_group(p_group_id UUID) RETURNS SETOF public.group_space_info
 STABLE
 SET search_path = ''
 LANGUAGE sql AS $$
     SELECT sp.id, sp.name, sp.platform, gm.admin FROM public."Space" AS sp
-    JOIN public.my_pseudo_accounts AS pa ON (sp.id = space_id)
+    JOIN public.my_pseudo_accounts AS pa ON (sp.id = pa.space_id)
     JOIN public.group_membership AS gm ON (gm.member_id = pa.dg_account)
-    JOIN public.group_membership AS gm2 ON (gm2.member_id = auth.uid() AND gm2.group_id = gm.group_id)
-    AND gm.group_id = p_group_id;
+    JOIN public.group_membership AS gm2 ON (gm2.group_id = gm.group_id)
+    AND gm.group_id = p_group_id AND gm2.member_id = auth.uid();
 $$;
 
 DROP POLICY IF EXISTS platform_account_policy ON public."PlatformAccount";