Handle merge issues

Author: kalilsn

core/lib/authentication/actions.ts

@@ -6,12 +6,18 @@ import { captureException } from "@sentry/nextjs";
 import * as Sentry from "@sentry/nextjs";
 import { z } from "zod";
 
-import type { Communities, CommunitiesId, CommunityMemberships, Users, UsersId } from "db/public";
+import type {
+	Communities,
+	CommunitiesId,
+	CommunityMemberships,
+	FormsId,
+	Users,
+	UsersId,
+} from "db/public";
 import { AuthTokenType, MemberRole } from "db/public";
 import { logger } from "logger";
 
-import type { Prettify, XOR } from "../types";
-import type { SafeUser } from "~/lib/server/user";
+import type { Prettify } from "../types";
 import { compiledSignupFormSchema } from "~/app/components/Signup/schema";
 import { db } from "~/kysely/database";
 import { isUniqueConstraintError } from "~/kysely/errors";
@@ -29,9 +35,8 @@ import {
 import { LAST_VISITED_COOKIE } from "../../app/components/LastVisitedCommunity/constants";
 import { findCommunityBySlug } from "../server/community";
 import * as Email from "../server/email";
-import { insertCommunityMember, selectCommunityMember } from "../server/member";
+import { insertCommunityMemberships, selectCommunityMemberships } from "../server/member";
 import { invalidateTokensForUser } from "../server/token";
-import { isClientExceptionOptions } from "../serverActions";
 import { SignupErrors } from "./errors";
 import { getLoginData } from "./loginData";
 
@@ -214,22 +219,24 @@ const addUserToCommunity = defineServerAction(async function addUserToCommunity(
 	 * @default MemberRole.contributor
 	 */
 	role?: MemberRole;
+	forms: FormsId[];
 }) {
-	const existingMembership = await selectCommunityMember({
+	const existingMemberships = await selectCommunityMemberships({
 		userId: props.userId,
 		communityId: props.communityId,
 	}).executeTakeFirst();
 
-	if (existingMembership) {
+	if (existingMemberships) {
 		return {
 			error: "User already in community",
 		};
 	}
 
-	const newMembership = await insertCommunityMember({
+	const newMembership = await insertCommunityMemberships({
 		userId: props.userId,
 		communityId: props.communityId,
 		role: props.role ?? MemberRole.contributor,
+		forms: props.forms,
 	}).executeTakeFirstOrThrow();
 
 	return {
@@ -268,10 +275,11 @@ export const publicJoinCommunity = defineServerAction(async function joinCommuni
 		return SignupErrors.NOT_ALLOWED({ communityName: community.name });
 	}
 
-	const member = await insertCommunityMember({
+	const member = await insertCommunityMemberships({
 		userId: user.id,
 		communityId: community.id,
 		role: toBeGrantedRole,
+		forms: [], // TODO: fetch these from invite token as well maybe?
 	}).executeTakeFirstOrThrow();
 
 	// don't redirect, better to do it client side, better ux
@@ -349,11 +357,12 @@ export const publicSignup = defineServerAction(async function signup(props: {
 			});
 
 			// TODO: add to community
-			const newMember = await insertCommunityMember(
+			const newMember = await insertCommunityMemberships(
 				{
 					userId: newUser.id,
 					communityId: community.id,
 					role: props.role ?? MemberRole.contributor,
+					forms: [], //TODO: make these customizable
 				},
 				trx
 			).executeTakeFirstOrThrow();

core/lib/server/member.ts

@@ -2,6 +2,7 @@ import { jsonObjectFrom } from "kysely/helpers/postgres";
 
 import type {
 	CommunitiesId,
+	CommunityMembershipsId,
 	FormsId,
 	MemberRole,
 	NewCommunityMemberships,
@@ -10,11 +11,49 @@ import type {
 	UsersId,
 } from "db/public";
 
+import type { XOR } from "../types";
 import { db } from "~/kysely/database";
 import { autoCache } from "./cache/autoCache";
 import { autoRevalidate } from "./cache/autoRevalidate";
 import { SAFE_USER_SELECT } from "./user";
 
+/**
+ * Either get a membership by its community membership id, or all memberships by userId and communityId
+ * TODO: this should probably return a user with the community memberships attached
+ */
+export const selectCommunityMemberships = (
+	props: XOR<{ id: CommunityMembershipsId }, { userId: UsersId; communityId: CommunitiesId }>,
+	trx = db
+) => {
+	return autoCache(
+		trx
+			.selectFrom("community_memberships")
+			.select((eb) => [
+				"community_memberships.id",
+				"community_memberships.userId",
+				"community_memberships.createdAt",
+				"community_memberships.updatedAt",
+				"community_memberships.role",
+				"community_memberships.communityId",
+				jsonObjectFrom(
+					eb
+						.selectFrom("users")
+						.select(SAFE_USER_SELECT)
+						.whereRef("users.id", "=", "community_memberships.userId")
+				)
+					.$notNull()
+					.as("user"),
+			])
+			.$if(Boolean(props.userId), (eb) =>
+				eb.where("community_memberships.userId", "=", props.userId!)
+			)
+			.$if(Boolean(props.communityId), (eb) =>
+				eb.where("community_memberships.communityId", "=", props.communityId!)
+			)
+			.$if(Boolean(props.id), (eb) => eb.where("community_memberships.id", "=", props.id!))
+	);
+};
+
 export const selectAllCommunityMemberships = (
 	{ communityId }: { communityId: CommunitiesId },
 	trx = db