Fix prepared maps missing 3rd place match crash

Sendouc · Dec 23, 2024 · 1665715 · 1665715
1 parent 62fafdd
commit 1665715
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/app/features/tournament-bracket/core/PreparedMaps.test.ts b/app/features/tournament-bracket/core/PreparedMaps.test.ts
@@ -3,8 +3,8 @@ import type { PreparedMaps as PreparedMapsType } from "~/db/tables";
 import * as PreparedMaps from "./PreparedMaps";
 import { testTournament } from "./tests/test-utils";
 
-describe("PreparedMaps - resolvePreparedForTheBracket", () => {
-	const tournament = testTournament({
+const getTestTournament = (thirdPlaceMatchesForBoth = true) =>
+	testTournament({
 		ctx: {
 			settings: {
 				bracketProgression: [
@@ -19,7 +19,9 @@ describe("PreparedMaps - resolvePreparedForTheBracket", () => {
 						type: "single_elimination",
 						name: "Top Cut",
 						requiresCheckIn: false,
-						settings: {},
+						settings: {
+							thirdPlaceMatch: true,
+						},
 						sources: [
 							{
 								bracketIdx: 0,
@@ -31,7 +33,9 @@ describe("PreparedMaps - resolvePreparedForTheBracket", () => {
 						type: "single_elimination",
 						name: "Underground Bracket",
 						requiresCheckIn: false,
-						settings: {},
+						settings: {
+							thirdPlaceMatch: thirdPlaceMatchesForBoth,
+						},
 						sources: [
 							{
 								bracketIdx: 0,
@@ -44,6 +48,9 @@ describe("PreparedMaps - resolvePreparedForTheBracket", () => {
 		},
 	});
 
+describe("PreparedMaps - resolvePreparedForTheBracket", () => {
+	const tournament = getTestTournament();
+
 	test("returns null if no prepared maps at all", () => {
 		const prepared = PreparedMaps.resolvePreparedForTheBracket({
 			tournament,
@@ -106,6 +113,26 @@ describe("PreparedMaps - resolvePreparedForTheBracket", () => {
 
 		expect(prepared).not.toBeNull();
 	});
+
+	test("returns null if the sibling does not have third place match while this one does", () => {
+		const tournament = getTestTournament(false);
+
+		const prepared = PreparedMaps.resolvePreparedForTheBracket({
+			tournament,
+			bracketIdx: 1,
+			preparedByBracket: [
+				null,
+				null,
+				{
+					authorId: 1,
+					createdAt: 1,
+					maps: [],
+				},
+			],
+		});
+
+		expect(prepared).toBeNull();
+	});
 });
 
 describe("PreparedMaps - eliminationTeamCountOptions", () => {

diff --git a/app/features/tournament-bracket/core/PreparedMaps.ts b/app/features/tournament-bracket/core/PreparedMaps.ts
@@ -35,7 +35,8 @@ export function resolvePreparedForTheBracket({
 			compare(
 				bracket.sources?.map((s) => s.bracketIdx),
 				bracketPreparingFor.sources?.map((s) => s.bracketIdx),
-			)
+			) &&
+			compare(bracket.settings, bracketPreparingFor.settings)
 		) {
 			const bracketMaps = preparedByBracket?.[anotherBracketIdx];