feat: link submissions to benchmarks

Author: Mikadows

src/benchmarks/benchmark.entity.ts

@@ -5,10 +5,12 @@ import {
   CreateDateColumn,
   Entity,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm';
 import { ApiProperty } from '@nestjs/swagger';
 import { User } from 'src/users/user.entity';
+import { Submission } from '../submissions/submission.entity';
 
 @Entity('benchmarks')
 export class Benchmark extends BaseEntity {
@@ -41,6 +43,9 @@ export class Benchmark extends BaseEntity {
   @Column()
   difficulty: string;
 
+  @OneToMany((type) => Submission, (submission) => submission.benchmark)
+  submissions: Submission[];
+
   @ManyToOne((type) => User, (user) => user.benchmarks, { eager: true })
   @ApiProperty({ type: () => User })
   creator: User;

src/migrations/1622922117706-LinkSubmissionsToBenchmark.ts

@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class LinkSubmissionsToBenchmark1622922117706 implements MigrationInterface {
+    name = 'LinkSubmissionsToBenchmark1622922117706'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "submissions" ADD "benchmarkId" uuid NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "submissions" ADD CONSTRAINT "FK_7955266ebab72540a466f5c2d65" FOREIGN KEY ("benchmarkId") REFERENCES "benchmarks"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "submissions" DROP CONSTRAINT "FK_7955266ebab72540a466f5c2d65"`);
+        await queryRunner.query(`ALTER TABLE "submissions" DROP COLUMN "benchmarkId"`);
+    }
+
+}

src/submissions/dto/create-submission-dto.ts

@@ -11,4 +11,9 @@ export class CreateSubmissionDTO {
   @IsString()
   @ApiProperty()
   code: string;
+
+  @IsNotEmpty()
+  @IsString()
+  @ApiProperty()
+  benchmarkId: string;
 }

src/submissions/dto/insert-submission-dto.ts

@@ -1,6 +1,8 @@
 import { User } from 'src/users/user.entity';
 
 export class InsertSubmissionDTO {
+  benchmarkId: string;
+
   language: string;
 
   code: string;

src/submissions/submission.entity.ts

@@ -11,6 +11,7 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
+import { Benchmark } from '../benchmarks/benchmark.entity';
 
 @jsonObject
 @Entity('submissions')
@@ -64,4 +65,11 @@ export class Submission extends BaseEntity {
   @ApiProperty({ type: () => User })
   @jsonMember(() => User)
   user: User;
+
+  @ManyToOne(() => Benchmark, (benchmark) => benchmark.submissions, {
+    nullable: false,
+    eager: true,
+  })
+  @ApiProperty({ type: () => Benchmark })
+  benchmark: Benchmark;
 }

src/submissions/submissions.module.ts

@@ -2,6 +2,7 @@ import { RabbitMQModule } from '@golevelup/nestjs-rabbitmq';
 import { CacheModule, forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { UsersModule } from 'src/users/users.module';
+import { BenchmarkModule } from '../benchmarks/benchmark.module';
 import { Submission } from './submission.entity';
 import { SubmissionsController } from './submissions.controller';
 import { SubmissionsService } from './submissions.service';
@@ -20,6 +21,7 @@ import { SubmissionsService } from './submissions.service';
       ],
       uri: process.env.RABBITMQ_URL || 'amqp://admin:admin@localhost:5672/',
     }),
+    forwardRef(() => BenchmarkModule),
   ],
   providers: [SubmissionsService],
   controllers: [SubmissionsController],

src/submissions/submissions.service.ts

@@ -1,9 +1,17 @@
 import { RabbitSubscribe } from '@golevelup/nestjs-rabbitmq';
-import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  CACHE_MANAGER,
+  forwardRef,
+  Inject,
+  Injectable,
+} from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Cache } from 'cache-manager';
+import { isUUID } from 'class-validator';
 import { TypedJSON } from 'typedjson';
 import { Repository } from 'typeorm';
+import { BenchmarkService } from '../benchmarks/benchmark.service';
 import { FindSubmissionDTO } from './dto/find-submission.dto';
 import { InsertSubmissionDTO } from './dto/insert-submission-dto';
 import { JobStatusDTO } from './dto/job-status.dto';
@@ -15,12 +23,30 @@ export class SubmissionsService {
     @InjectRepository(Submission)
     private submissionsRepository: Repository<Submission>,
     @Inject(CACHE_MANAGER) private cacheManager: Cache,
+    @Inject(forwardRef(() => BenchmarkService))
+    private benchmarkService: BenchmarkService,
   ) {}
 
   async create(insertSubmissionDTO: InsertSubmissionDTO): Promise<Submission> {
     const submission = new Submission(insertSubmissionDTO);
     submission.status = 'waiting';
 
+    if (!isUUID(insertSubmissionDTO.benchmarkId)) {
+      throw new BadRequestException(
+        `Invalid benchmark id: ${insertSubmissionDTO.benchmarkId}`,
+      );
+    }
+    const benchmark = await this.benchmarkService.findOne({
+      id: insertSubmissionDTO.benchmarkId,
+    });
+
+    if (!benchmark) {
+      throw new BadRequestException(
+        `Could not find benchmark: ${insertSubmissionDTO.benchmarkId}`,
+      );
+    }
+    submission.benchmark = benchmark;
+
     return submission.save();
   }