fix: resolve merge error

CarletonComputerScienceSociety · Jun 14, 2024 · 42be03c · 42be03c
1 parent 0f2ab2c
commit 42be03c
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/app/challenges-platform/services/submissions-service.ts b/app/challenges-platform/services/submissions-service.ts
@@ -32,16 +32,11 @@ export const findByUuid = async (
   const challengeResult = await ChallengesService.findById(record.challengeId);
   if (!challengeResult.ok) {
     return Err(new Error("Failed to find challenge"));
+  } else if (challengeResult.val.deleted === true) {
+    return Err(new Error("Challenge is deleted"));
   }
-<<<<<<< AJP/reviews-findByUuid
 
   const participantResult = await ParticipantsService.findById(record.participantId);
-=======
-  if (challengeResult.val.deleted === true) {
-    return Err(new Error("Challenge is deleted"));
-  }
-  const participantResult = await ParticipantsService.findByUuid(participantId);
->>>>>>> main
   if (!participantResult.ok) {
     return Err(new Error("Failed to find participant"));
   }