Fix main team switch handling when leaving/deleting team + add second…

…ary team tests

app/db/seed/constants.ts

@@ -3,5 +3,6 @@ export const ADMIN_TEST_AVATAR = "6fc41a44b069a0d2152ac06d1e496c6c";
 export const NZAP_TEST_DISCORD_ID = "455039198672453645";
 export const NZAP_TEST_AVATAR = "f809176af93132c3db5f0a5019e96339"; // https://cdn.discordapp.com/avatars/455039198672453645/f809176af93132c3db5f0a5019e96339.webp?size=160
 export const NZAP_TEST_ID = 2;
+export const REGULAR_USER_TEST_ID = 2;
 
 export const AMOUNT_OF_CALENDAR_EVENTS = 200;

app/features/lfg/LFGRepository.server.ts

@@ -1,8 +1,8 @@
 import { sub } from "date-fns";
-import { type NotNull, sql } from "kysely";
+import { type NotNull, type Transaction, sql } from "kysely";
 import { jsonArrayFrom, jsonObjectFrom } from "kysely/helpers/sqlite";
 import { db } from "~/db/sql";
-import type { TablesInsertable } from "~/db/tables";
+import type { DB, TablesInsertable } from "~/db/tables";
 import { databaseTimestampNow, dateToDatabaseTimestamp } from "~/utils/dates";
 import { COMMON_USER_FIELDS } from "~/utils/kysely.server";
 import { LFG } from "./lfg-constants";
@@ -143,6 +143,9 @@ export function deletePost(id: number) {
 	return db.deleteFrom("LFGPost").where("id", "=", id).execute();
 }
 
-export function deletePostsByTeamId(teamId: number) {
-	return db.deleteFrom("LFGPost").where("teamId", "=", teamId).execute();
+export function deletePostsByTeamId(teamId: number, trx?: Transaction<DB>) {
+	return (trx ?? db)
+		.deleteFrom("LFGPost")
+		.where("teamId", "=", teamId)
+		.execute();
 }

app/features/sendouq/routes/q.looking.test.ts

@@ -204,9 +204,10 @@ describe("Private user note sorting", () => {
 	});
 	const matchAction = wrappedAction<typeof matchSchema>({
 		action: rawMatchAction,
-		params: { id: "1" },
 	});
 
+	const matchActionParams = { id: "1" };
+
 	test("users with positive note sorted first", async () => {
 		await matchAction(
 			{
@@ -215,7 +216,7 @@ describe("Private user note sorting", () => {
 				sentiment: "POSITIVE",
 				comment: "test",
 			},
-			{ user: "admin" },
+			{ user: "admin", params: matchActionParams },
 		);
 
 		const data = await lookingLoader({ user: "admin" });
@@ -231,7 +232,7 @@ describe("Private user note sorting", () => {
 				sentiment: "NEGATIVE",
 				comment: "test",
 			},
-			{ user: "admin" },
+			{ user: "admin", params: matchActionParams },
 		);
 
 		const data = await lookingLoader({ user: "admin" });
@@ -249,7 +250,7 @@ describe("Private user note sorting", () => {
 				sentiment: "POSITIVE",
 				comment: "test",
 			},
-			{ user: "admin" },
+			{ user: "admin", params: matchActionParams },
 		);
 		await matchAction(
 			{
@@ -258,7 +259,7 @@ describe("Private user note sorting", () => {
 				sentiment: "NEGATIVE",
 				comment: "test",
 			},
-			{ user: "admin" },
+			{ user: "admin", params: matchActionParams },
 		);
 
 		const data = await lookingLoader({ user: "admin" });

app/features/team/TeamRepository.server.ts

@@ -4,6 +4,7 @@ import { nanoid } from "nanoid";
 import { INVITE_CODE_LENGTH } from "~/constants";
 import { db } from "~/db/sql";
 import type { DB, Tables } from "~/db/tables";
+import * as LFGRepository from "~/features/lfg/LFGRepository.server";
 import { databaseTimestampNow } from "~/utils/dates";
 import invariant from "~/utils/invariant";
 import { COMMON_USER_FIELDS } from "~/utils/kysely.server";
@@ -107,6 +108,7 @@ export async function teamsByMemberUserId(
 		.select([
 			"TeamMemberWithSecondary.teamId as id",
 			"TeamMemberWithSecondary.isOwner",
+			"TeamMemberWithSecondary.isMainTeam",
 		])
 		.where("userId", "=", userId)
 		.execute();
@@ -200,6 +202,52 @@ export function switchMainTeam({
 	});
 }
 
+export function del(teamId: number) {
+	return db.transaction().execute(async (trx) => {
+		const members = await trx
+			.selectFrom("TeamMember")
+			.select(["TeamMember.userId"])
+			.where("teamId", "=", teamId)
+			.execute();
+
+		// switch main team to another if they at least one secondary team
+		for (const member of members) {
+			const currentTeams = await teamsByMemberUserId(member.userId, trx);
+
+			const teamToSwitchTo = currentTeams.find((team) => team.id !== teamId);
+
+			if (!teamToSwitchTo) continue;
+
+			await trx
+				.updateTable("AllTeamMember")
+				.set({
+					isMainTeam: 1,
+				})
+				.where("userId", "=", member.userId)
+				.where("teamId", "=", teamToSwitchTo.id)
+				.execute();
+		}
+
+		await trx
+			.updateTable("AllTeamMember")
+			.set({
+				isMainTeam: 0,
+			})
+			.where("AllTeamMember.teamId", "=", teamId)
+			.execute();
+
+		await LFGRepository.deletePostsByTeamId(teamId, trx);
+
+		await trx
+			.updateTable("AllTeam")
+			.set({
+				deletedAt: databaseTimestampNow(),
+			})
+			.where("id", "=", teamId)
+			.execute();
+	});
+}
+
 export function addNewTeamMember({
 	userId,
 	teamId,
@@ -245,8 +293,9 @@ export function removeTeamMember({
 		invariant(teamToLeave, "User is not a member of this team");
 		invariant(!teamToLeave.isOwner, "Owner cannot leave the team");
 
+		const wasMainTeam = teamToLeave.isMainTeam;
 		const newMainTeam = currentTeams.find((team) => team.id !== teamId);
-		if (newMainTeam) {
+		if (wasMainTeam && newMainTeam) {
 			await trx
 				.updateTable("AllTeamMember")
 				.set({
@@ -261,6 +310,7 @@ export function removeTeamMember({
 			.updateTable("AllTeamMember")
 			.set({
 				leftAt: databaseTimestampNow(),
+				isMainTeam: 0,
 			})
 			.where("userId", "=", userId)
 			.where("teamId", "=", teamId)

app/features/team/actions/t.$customUrl.server.ts

@@ -30,13 +30,15 @@ export const action: ActionFunction = async ({ request, params }) => {
 				teamId: team.id,
 				userId: user.id,
 			});
+
 			break;
 		}
 		case "MAKE_MAIN_TEAM": {
 			await TeamRepository.switchMainTeam({
 				userId: user.id,
 				teamId: team.id,
 			});
+
 			break;
 		}
 		default: {

app/features/team/routes/t.$customUrl.edit.tsx

@@ -18,7 +18,6 @@ import { Label } from "~/components/Label";
 import { Main } from "~/components/Main";
 import { SubmitButton } from "~/components/SubmitButton";
 import { requireUserId } from "~/features/auth/core/user.server";
-import * as LFGRepository from "~/features/lfg/LFGRepository.server";
 import { isAdmin } from "~/permissions";
 import {
 	type SendouRouteHandle,
@@ -36,7 +35,6 @@ import {
 	uploadImagePage,
 } from "~/utils/urls";
 import * as TeamRepository from "../TeamRepository.server";
-import { deleteTeam } from "../queries/deleteTeam.server";
 import { TEAM } from "../team-constants";
 import { editTeamSchema, teamParamsSchema } from "../team-schemas.server";
 import { canAddCustomizedColors, isTeamOwner } from "../team-utils";
@@ -89,8 +87,7 @@ export const action: ActionFunction = async ({ request, params }) => {
 
 	switch (data._action) {
 		case "DELETE": {
-			await LFGRepository.deletePostsByTeamId(team.id);
-			deleteTeam(team.id);
+			await TeamRepository.del(team.id);
 
 			throw redirect(TEAM_SEARCH_PAGE);
 		}