Fixed submissions

Author: brandonw504

app/(api)/_actions/logic/matchTeams.ts

@@ -6,6 +6,8 @@ import JudgeGroupToTeam from '@typeDefs/judgeGroupToTeam';
 import parseAndReplace from '@utils/request/parseAndReplace';
 import { getManyJudgeGroups } from '@actions/judgeGroups/getJudgeGroup';
 import { getManyTeams } from '@actions/teams/getTeams';
+import { createSubmission } from '@actions/submissions/createSubmission';
+import { getManyJudges } from '@actions/judges/getJudge';
 
 function checkMatches(matches: JudgeGroupToTeam[], teamsLength: number) {
   if (matches.length < 2 * teamsLength) return false;
@@ -35,5 +37,19 @@ export default async function matchTeams() {
   const parsedMatches = await parseAndReplace(matches);
   const valid = checkMatches(parsedMatches, teams.length);
 
-  if (valid) await LinkManyJudgeGroupsToTeams(matches);
+  if (valid) {
+    await LinkManyJudgeGroupsToTeams(matches);
+
+    for (const match of parsedMatches) {
+      const judges = (
+        await getManyJudges({
+          judge_group_id: match.judge_group_id,
+        })
+      ).body;
+
+      for (const judge of judges) {
+        await createSubmission(judge._id, match.team_id.toString());
+      }
+    }
+  }
 }

app/(api)/_actions/submissions/createSubmission.ts

@@ -0,0 +1,18 @@
+'use server';
+
+import { CreateSubmission } from '@datalib/submissions/createSubmission';
+
+export async function createSubmission(judge_id: string, team_id: string) {
+  await CreateSubmission({
+    judge_id: {
+      '*convertId': {
+        id: judge_id,
+      },
+    },
+    team_id: {
+      '*convertId': {
+        id: team_id,
+      },
+    },
+  });
+}

app/(api)/_datalib/submissions/createSubmission.ts

@@ -6,15 +6,11 @@ import isBodyEmpty from '@utils/request/isBodyEmpty';
 import NoContentError from '@utils/response/NoContentError';
 import HttpError from '@utils/response/HttpError';
 import parseAndReplace from '@utils/request/parseAndReplace';
-import {
-  NotFoundError,
-  DuplicateError,
-  BadRequestError,
-} from '@utils/response/Errors';
+import { NotFoundError, DuplicateError } from '@utils/response/Errors';
 
 export const CreateSubmission = async (body: {
-  judge_id: string;
-  team_id: string;
+  judge_id: object;
+  team_id: object;
 }) => {
   try {
     if (isBodyEmpty(body)) {
@@ -28,6 +24,7 @@ export const CreateSubmission = async (body: {
     });
 
     if (judge === null) {
+      console.log(`judge with id: ${body.judge_id} not found.`);
       throw new NotFoundError(`judge with id: ${body.judge_id} not found.`);
     }
 
@@ -36,6 +33,7 @@ export const CreateSubmission = async (body: {
     });
 
     if (team === null) {
+      console.log(`team with id: ${body.team_id} not found.`);
       throw new NotFoundError(`team with id: ${body.team_id} not found.`);
     }
 
@@ -45,17 +43,10 @@ export const CreateSubmission = async (body: {
     });
 
     if (existingSubmission) {
+      console.log('Submission already exists');
       throw new DuplicateError('Submission already exists');
     }
 
-    const judgeGroupToTeam = await db.collection('judgeGroupToTeams').findOne({
-      judge_group_id: judge.judge_group_id,
-    });
-
-    if (judgeGroupToTeam.team_id.toString() !== body.team_id.toString()) {
-      throw new BadRequestError('Judge is not judging this team.');
-    }
-
     const creationStatus = await db
       .collection('submissions')
       .insertOne(parsedBody);

app/(api)/_utils/grouping/matchingAlgorithm.ts

@@ -20,8 +20,10 @@ export default function matchingAlgorithm(
   const matches: JudgeGroupToTeam[] = [];
 
   for (const team of filteredTeams) {
+    console.log(team.name);
     teamAssignments.sort((group1, group2) => group1.teams - group2.teams);
 
+    let pairedGroup = '';
     for (let i = 0; i < 2; i++) {
       const chosenTrack = team.tracks[i];
       const foundTrack = tracks.find((track) => track.name === chosenTrack);
@@ -30,26 +32,31 @@ export default function matchingAlgorithm(
       let idx = 0;
       while (
         idx < teamAssignments.length &&
-        teamAssignments[idx].judgeGroup.type !== foundTrack.type
+        (teamAssignments[idx].judgeGroup.type !== foundTrack.type ||
+          pairedGroup === teamAssignments[idx].judgeGroup._id)
       ) {
         idx++;
       }
 
-      teamAssignments[idx].teams++;
+      if (idx < teamAssignments.length) {
+        teamAssignments[idx].teams++;
 
-      matches.push({
-        judge_group_id: {
-          '*convertId': {
-            id: teamAssignments[idx].judgeGroup._id,
+        matches.push({
+          judge_group_id: {
+            '*convertId': {
+              id: teamAssignments[idx].judgeGroup._id,
+            },
           },
-        },
-        team_id: {
-          '*convertId': {
-            id: team._id,
+          team_id: {
+            '*convertId': {
+              id: team._id,
+            },
           },
-        },
-        round: teamAssignments[idx].teams,
-      });
+          round: teamAssignments[idx].teams,
+        });
+
+        pairedGroup = teamAssignments[idx].judgeGroup._id ?? '';
+      }
     }
   }