move away from distinct and use branded types

Author: ameer2468

apps/web/actions/organization/create-space.ts

@@ -2,12 +2,16 @@
 
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
-import { nanoId, nanoIdLength } from "@cap/database/helpers";
+import { nanoId } from "@cap/database/helpers";
 import { spaceMembers, spaces } from "@cap/database/schema";
-import { Space, User } from "@cap/web-domain";
+import {
+	Space,
+	SpaceMemberId,
+	type SpaceMemberRole,
+	User,
+} from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
-import { v4 as uuidv4 } from "uuid";
 import { uploadSpaceIcon } from "./upload-space-icon";
 
 interface CreateSpaceResponse {
@@ -108,10 +112,9 @@ export async function createSpace(
 		if (memberUserIds.length > 0) {
 			const spaceMembersToInsert = memberUserIds.map((userId) => {
 				// Creator is always Admin, others are member
-				const role =
-					userId === user.id ? ("Admin" as const) : ("member" as const);
+				const role: SpaceMemberRole = userId === user.id ? "Admin" : "member";
 				return {
-					id: uuidv4().substring(0, nanoIdLength),
+					id: SpaceMemberId.make(nanoId()),
 					spaceId,
 					userId: User.UserId.make(userId),
 					role,

apps/web/app/(org)/dashboard/dashboard-data.ts

@@ -6,7 +6,6 @@ import {
 	organizationMembers,
 	organizations,
 	sharedVideos,
-	spaceMembers,
 	spaces,
 	users,
 	videos,
@@ -135,7 +134,7 @@ export async function getDashboardData(user: typeof userSelectProps) {
 				return yield* db
 					.use((db) =>
 						db
-							.selectDistinct({
+							.select({
 								id: spaces.id,
 								primary: spaces.primary,
 								privacy: spaces.privacy,
@@ -152,18 +151,20 @@ export async function getDashboardData(user: typeof userSelectProps) {
         )`,
 							})
 							.from(spaces)
-							.leftJoin(spaceMembers, eq(spaces.id, spaceMembers.spaceId))
-							.leftJoin(users, eq(spaceMembers.userId, users.id))
 							.where(
 								and(
 									eq(spaces.organizationId, activeOrganizationId),
 									or(
 										// User is the space creator
 										eq(spaces.createdById, user.id),
-										// User is a member of the space
-										eq(spaceMembers.userId, user.id),
 										// Space is public within the organization
 										eq(spaces.privacy, "Public"),
+										// User is a member of the space
+										sql`EXISTS (
+          SELECT 1 FROM space_members 
+          WHERE space_members.spaceId = spaces.id 
+          AND space_members.userId = ${user.id}
+        )`,
 									),
 								),
 							),

packages/web-domain/src/Space.ts

@@ -6,3 +6,12 @@ export type SpaceId = typeof SpaceIdOrOrganisationId.Type;
 
 export const SpaceIdOrOrganisationId = Schema.Union(SpaceId, OrganisationId);
 export type SpaceIdOrOrganisationId = typeof SpaceIdOrOrganisationId.Type;
+
+export const SpaceMemberId = Schema.String.pipe(Schema.brand("SpaceMemberId"));
+export type SpaceMemberId = typeof SpaceMemberId.Type;
+
+export const SpaceMemberRole = Schema.Union(
+	Schema.Literal("Admin"),
+	Schema.Literal("member"),
+);
+export type SpaceMemberRole = typeof SpaceMemberRole.Type;

packages/web-domain/src/index.ts

@@ -14,6 +14,7 @@ export { Rpcs } from "./Rpcs.ts";
 export * as S3Bucket from "./S3Bucket.ts";
 export { S3Error } from "./S3Bucket.ts";
 export * as Space from "./Space.ts";
+export { SpaceMemberId, SpaceMemberRole } from "./Space.ts";
 export * as User from "./User.ts";
 export { UserId } from "./User.ts";
 export * as Video from "./Video.ts";