Submission status check

app/challenges-platform/index.ts

@@ -1,12 +1,12 @@
 export {
+  AccessibleChallengesService,
   ChallengesService,
   ParticipantsService,
   ReviewsService,
   SubmissionService,
-  AccessibleChallengesService,
 } from "./services";
-import { Transformer } from "./models";
 import { transformers } from "../../config/challenges-platform/transformers";
+import { Transformer } from "./models";
 import { BaseTransformer } from "./models/Transformer";
 
 class ChallengesPlatform {

app/challenges-platform/models/index.ts

@@ -1,4 +1,4 @@
-export { Challenge, Format, Evaluation } from "./Challenge";
+export { Challenge, Evaluation, Format } from "./Challenge";
 export { Participant } from "./Participant";
 export { Review, Status } from "./Review";
 export { Submission } from "./Submission";

app/challenges-platform/services/accessible-challenges-service.ts

@@ -1,7 +1,7 @@
-import { accessibleChallenges } from "../../../db/schema";
-import { Ok, Result } from "ts-results";
 import { eq } from "drizzle-orm";
+import { Ok, Result } from "ts-results";
 import { db } from "../../../db";
+import { accessibleChallenges } from "../../../db/schema";
 import { Challenge, Participant } from "../models";
 
 export const count = async (

app/challenges-platform/services/challenges-service.ts

@@ -1,10 +1,10 @@
 import { eq } from "drizzle-orm";
-import { Ok, Err, Result } from "ts-results";
-import { Challenge, Format, Evaluation } from "../models/Challenge";
+import { Err, Ok, Result } from "ts-results";
+import { uuid } from "../../../app/common";
 import { db } from "../../../db";
 import { challenges } from "../../../db/schema";
-import { uuid } from "../../../app/common";
 import { challengesPlatform } from "../index";
+import { Challenge } from "../models/Challenge";
 
 export const findByUuid = async (
   id: string,

app/challenges-platform/services/participants-service.ts

@@ -1,9 +1,9 @@
 import { eq } from "drizzle-orm";
-import { Ok, Err, Result } from "ts-results";
-import { Participant } from "../models/Participant";
+import { Err, Ok, Result } from "ts-results";
+import { uuid } from "../../../app/common";
 import { db } from "../../../db";
 import { participants } from "../../../db/schema";
-import { uuid } from "../../../app/common";
+import { Participant } from "../models/Participant";
 
 export const findByUuid = async (
   id: string,

app/challenges-platform/services/reviews-service.ts

@@ -1,9 +1,9 @@
 import { eq } from "drizzle-orm";
-import { Ok, Err, Result } from "ts-results";
-import { Review, Status } from "../models/Review";
+import { Err, Ok, Result } from "ts-results";
+import { uuid } from "../../../app/common";
 import { db } from "../../../db";
 import { reviews } from "../../../db/schema";
-import { uuid } from "../../../app/common";
+import { Review, Status } from "../models/Review";
 
 export const findByUuid = async (
   id: string,
@@ -29,7 +29,15 @@ export const create = async (
   body: string,
 ): Promise<Result<Review, Error>> => {
   // TODO: add a check to make sure the submission exists
-  // TODO: check if submission has already been approved or rejected, handle accordingly
+
+  const check = await db
+    .select()
+    .from(reviews)
+    .where(eq(reviews.submissionId, submissionId));
+
+  if (check.length > 0) {
+    return Err(new Error("Submission has already been reviewed"));
+  }
 
   const id = uuid.create();
 

app/challenges-platform/services/submissions-service.ts

@@ -1,15 +1,15 @@
 import { eq } from "drizzle-orm";
-import { Ok, Err, Result } from "ts-results";
+import { Err, Ok, Result } from "ts-results";
+import { challengesPlatform } from "..";
+import { uuid } from "../../../app/common";
 import { db } from "../../../db";
 import { submissions } from "../../../db/schema";
-import { uuid } from "../../../app/common";
 import { Challenge, Participant, Submission } from "../models";
 import {
   AccessibleChallengesService,
   ChallengesService,
   ParticipantsService,
 } from "../services";
-import { challengesPlatform } from "..";
 
 export const findByUuid = async (
   id: string,

config/challenges-platform/transformers.ts

@@ -1,7 +1,7 @@
-import { GithubIssueTransformer } from "../../app/event-management/models/GithubIssueChallenge";
+import { Transformer } from "../../app/challenges-platform/models";
 import { FlagTransformer } from "../../app/event-management/models/FlagChallenge";
+import { GithubIssueTransformer } from "../../app/event-management/models/GithubIssueChallenge";
 import { PhotoTransformer } from "../../app/event-management/models/PhotoChallenge";
-import { Transformer } from "../../app/challenges-platform/models";
 
 export const transformers: { [name: string]: typeof Transformer } = {
   flag: FlagTransformer,

config/express/index.ts

@@ -1,7 +1,7 @@
-import express, { Express } from "express";
 import cors from "cors";
 import dotenv from "dotenv";
-import { notFound, errorHandler } from "./middleware";
+import express, { Express } from "express";
+import { errorHandler, notFound } from "./middleware";
 import { default as restRouter } from "./router";
 
 dotenv.config();

db/index.ts

@@ -1,9 +1,9 @@
+import Database from "better-sqlite3";
+import dotenv from "dotenv";
 import {
   drizzle,
   type BetterSQLite3Database,
 } from "drizzle-orm/better-sqlite3";
-import Database from "better-sqlite3";
-import dotenv from "dotenv";
 
 import * as schema from "./schema";
 

drizzle.config.ts

@@ -1,5 +1,5 @@
-import type { Config } from "drizzle-kit";
 import dotenv from "dotenv";
+import type { Config } from "drizzle-kit";
 
 dotenv.config();
 

test/challenges-platform/factories/accessible-challenge-factory.ts

@@ -1,11 +1,11 @@
-import { challengeFactory } from "./challenge-factory";
-import { participantFactory } from "./participant-factory";
 import {
   Challenge,
   Participant,
 } from "../../../app/challenges-platform/models";
 import { db } from "../../../db";
 import { accessibleChallenges } from "../../../db/schema";
+import { challengeFactory } from "./challenge-factory";
+import { participantFactory } from "./participant-factory";
 
 export const accessibleChallengeFactory = async ({
   challenge,

test/challenges-platform/factories/participant-factory.ts

@@ -1,5 +1,5 @@
-import { ParticipantsService } from "../../../app/challenges-platform/services";
 import { Participant } from "../../../app/challenges-platform/models";
+import { ParticipantsService } from "../../../app/challenges-platform/services";
 
 export const participantFactory = async (
   email?: string,

test/challenges-platform/factories/submission-factory.ts

@@ -1,11 +1,11 @@
-import { challengeFactory } from "./challenge-factory";
-import { participantFactory } from "./participant-factory";
+import { SubmissionService } from "../../../app/challenges-platform";
 import {
   Challenge,
   Participant,
   Submission,
 } from "../../../app/challenges-platform/models";
-import { SubmissionService } from "../../../app/challenges-platform";
+import { challengeFactory } from "./challenge-factory";
+import { participantFactory } from "./participant-factory";
 
 export const submissionFactory = async ({
   participant,

test/challenges-platform/models/Transformer.test.ts

@@ -1,9 +1,9 @@
-import { BaseTransformer } from "../../../app/challenges-platform/models/Transformer";
 import {
   Challenge,
   Evaluation,
   Format,
 } from "../../../app/challenges-platform/models";
+import { BaseTransformer } from "../../../app/challenges-platform/models/Transformer";
 
 describe("BaseTransformer", () => {
   describe("newChallenge", () => {

test/challenges-platform/services/accessible-challenges-service.test.ts

@@ -1,7 +1,7 @@
+import { AccessibleChallengesService } from "../../../app/challenges-platform";
+import { accessibleChallengeFactory } from "../factories/accessible-challenge-factory";
 import { challengeFactory } from "../factories/challenge-factory";
 import { participantFactory } from "../factories/participant-factory";
-import { accessibleChallengeFactory } from "../factories/accessible-challenge-factory";
-import { AccessibleChallengesService } from "../../../app/challenges-platform";
 
 describe("AccessibleChallengesService", () => {
   describe("count", () => {

test/challenges-platform/services/challenges-service.test.ts

@@ -1,9 +1,10 @@
-import { ChallengesService } from "../../../app/challenges-platform";
-import { challengeFactory } from "../factories/challenge-factory";
-import { CustomTransformer, CustomChallenge } from "../custom-transformer";
-import { challengesPlatform } from "../../../app/challenges-platform";
-import { desc } from "drizzle-orm";
+import {
+  ChallengesService,
+  challengesPlatform,
+} from "../../../app/challenges-platform";
 import { uuid } from "../../../app/common";
+import { CustomChallenge, CustomTransformer } from "../custom-transformer";
+import { challengeFactory } from "../factories/challenge-factory";
 
 describe("ChallengesService", () => {
   describe("findByUuid", () => {

test/challenges-platform/services/participants-service.test.ts

@@ -1,6 +1,6 @@
 import { ParticipantsService } from "../../../app/challenges-platform";
-import { participantFactory } from "../factories/participant-factory";
 import { uuid } from "../../../app/common";
+import { participantFactory } from "../factories/participant-factory";
 
 describe("ParticipantsService", () => {
   describe("create", () => {

test/challenges-platform/services/reviews-service.test.ts

@@ -1,11 +1,9 @@
 import { ReviewsService } from "../../../app/challenges-platform";
 import { Status } from "../../../app/challenges-platform/models";
 import { uuid } from "../../../app/common";
+import { accessibleChallengeFactory } from "../factories/accessible-challenge-factory";
 import { reviewFactory } from "../factories/review-factory";
-import { challengeFactory } from "../factories/challenge-factory";
-import { participantFactory } from "../factories/participant-factory";
 import { submissionFactory } from "../factories/submission-factory";
-import { accessibleChallengeFactory } from "../factories/accessible-challenge-factory";
 
 describe("ReviewsService", () => {
   describe("create", () => {
@@ -29,6 +27,31 @@ describe("ReviewsService", () => {
         expect(result.val.comment).toBe(body);
       });
     });
+    describe("when submission has already been reviewed", () => {
+      it("returns an error", async () => {
+        const [challenge, participant] = await accessibleChallengeFactory();
+        const submission = await submissionFactory({
+          challenge: challenge,
+          participant: participant,
+        });
+        const body = "Nice work";
+        await reviewFactory({
+          submission: submission,
+          body: body,
+        });
+
+        const result = await ReviewsService.create(
+          Status.APPROVED,
+          submission.id,
+          body,
+        );
+
+        expect(result.err).toBe(true);
+        expect(result.val.toString()).toBe(
+          "Error: Submission has already been reviewed",
+        );
+      });
+    });
     describe("when submission does not exist", () => {
       it("returns an error", async () => {
         const invalidId = -1;

test/challenges-platform/services/submissions-service.test.ts

@@ -2,10 +2,10 @@ import {
   ChallengesService,
   SubmissionService,
 } from "../../../app/challenges-platform";
+import { uuid } from "../../../app/common";
+import { accessibleChallengeFactory } from "../factories/accessible-challenge-factory";
 import { challengeFactory } from "../factories/challenge-factory";
 import { participantFactory } from "../factories/participant-factory";
-import { accessibleChallengeFactory } from "../factories/accessible-challenge-factory";
-import { uuid } from "../../../app/common";
 
 describe("SubmissionService", () => {
   describe("findByUuid", () => {

test/event-management/models/FlagChallenge.test.ts

@@ -1,7 +1,9 @@
-import { FlagChallenge } from "../../../app/event-management/models/FlagChallenge";
-import { FlagChallengeSubmission } from "../../../app/event-management/models/FlagChallenge";
 import { Format } from "../../../app/challenges-platform/models";
-import { FlagTransformer } from "../../../app/event-management/models/FlagChallenge";
+import {
+  FlagChallenge,
+  FlagChallengeSubmission,
+  FlagTransformer,
+} from "../../../app/event-management/models/FlagChallenge";
 import { challengeFactory } from "../../challenges-platform/factories/challenge-factory";
 import { participantFactory } from "../../challenges-platform/factories/participant-factory";