refactor(benchmarks): use GET for last submission route + move to BenchmarkController

Author: angristan

src/benchmarks/benchmark.controller.ts

@@ -2,22 +2,31 @@ import {
   Body,
   Controller,
   Get,
+  NotFoundException,
   Param,
   Post,
+  Query,
   Request,
   UseGuards,
 } from '@nestjs/common';
 import { ApiOkResponse, ApiOperation } from '@nestjs/swagger';
 import { BenchmarkService } from 'src/benchmarks/benchmark.service';
 import { CreateBenchmarkDto } from 'src/benchmarks/dto/create-benchmark.dto';
+import { FindSubmissionIDDTO } from 'src/submissions/dto/find-submission-id.dto';
+import { FindSubmissionLangDTO } from 'src/submissions/dto/find-submission-lang.dto';
+import { Submission } from 'src/submissions/submission.entity';
+import { SubmissionsService } from 'src/submissions/submissions.service';
 import { ValidatedJWTReq } from '../auth/dto/validated-jwt-req';
 import { JwtAuthGuard } from '../auth/jwt-auth.guard';
 import { Benchmark } from './benchmark.entity';
 import { BenchmarkIdDto } from './dto/benchmarkId.dto';
 
 @Controller('benchmarks')
 export class BenchmarkController {
-  constructor(private readonly benchmarkService: BenchmarkService) {}
+  constructor(
+    private readonly benchmarkService: BenchmarkService,
+    private readonly submissionsService: SubmissionsService,
+  ) {}
 
   @ApiOperation({ summary: 'Create a benchmark' })
   @ApiOkResponse({ type: Benchmark, description: 'Created benchmark' })
@@ -46,4 +55,28 @@ export class BenchmarkController {
   ): Promise<Benchmark | undefined> {
     return this.benchmarkService.findOne(benchmarkIdDto.id);
   }
+
+  @ApiOperation({ summary: 'Get last submission for benchmark + language' })
+  @UseGuards(JwtAuthGuard)
+  @Get(':id/submissions/last')
+  async findLastForUserByLanguage(
+    @Request() req: ValidatedJWTReq,
+    @Query() query: FindSubmissionLangDTO,
+    @Param() params: FindSubmissionIDDTO,
+  ): Promise<Submission> {
+    const submission: Submission | undefined =
+      await this.submissionsService.findLastByLanguage(
+        {
+          benchmarkId: params.id,
+          language: query.language,
+        },
+        req.user,
+      );
+
+    if (!submission) {
+      throw new NotFoundException();
+    }
+
+    return submission;
+  }
 }

src/benchmarks/benchmark.module.ts

@@ -1,14 +1,16 @@
-import { Module, forwardRef } from '@nestjs/common';
-import { UsersModule } from 'src/users/users.module';
+import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
+import { SubmissionsModule } from 'src/submissions/submissions.module';
+import { UsersModule } from 'src/users/users.module';
+import { BenchmarkController } from './benchmark.controller';
 import { Benchmark } from './benchmark.entity';
 import { BenchmarkService } from './benchmark.service';
-import { BenchmarkController } from './benchmark.controller';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([Benchmark]),
     forwardRef(() => UsersModule),
+    SubmissionsModule,
   ],
   providers: [BenchmarkService],
   controllers: [BenchmarkController],

src/submissions/dto/find-submission-id.dto.ts

@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class FindSubmissionIDDTO {
+  @IsNotEmpty()
+  @IsString()
+  @ApiProperty()
+  id: string;
+}

src/submissions/dto/find-submission-lang.dto.ts

@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class FindSubmissionLangDTO {
+  @IsNotEmpty()
+  @IsString()
+  @ApiProperty()
+  language: string;
+}

src/submissions/submissions.controller.ts

@@ -6,14 +6,12 @@ import {
   NotFoundException,
   Param,
   Post,
-  Put,
   Request,
   UseGuards,
 } from '@nestjs/common';
 import { ValidatedJWTReq } from 'src/auth/dto/validated-jwt-req';
 import { JwtAuthGuard } from 'src/auth/jwt-auth.guard';
 import { CreateSubmissionDTO } from './dto/create-submission-dto';
-import { FindLastSubmissionByLanguageDTO } from './dto/find-last-submission-by-language.dto';
 import { FindSubmissionDTO } from './dto/find-submission.dto';
 import { Submission } from './submission.entity';
 import { SubmissionsService } from './submissions.service';
@@ -46,25 +44,6 @@ export class SubmissionsController {
     return submission;
   }
 
-  @UseGuards(JwtAuthGuard)
-  @Put()
-  async findLastForUserByLanguage(
-    @Request() req: ValidatedJWTReq,
-    @Body() findLastSubmissionByLanguageDTO: FindLastSubmissionByLanguageDTO,
-  ): Promise<Submission> {
-    const submission: Submission | undefined =
-      await this.submissionsService.findLastByLanguage(
-        findLastSubmissionByLanguageDTO,
-        req.user,
-      );
-
-    if (!submission) {
-      throw new NotFoundException();
-    }
-
-    return submission;
-  }
-
   @UseGuards(JwtAuthGuard)
   @Get(':id')
   async findOne(

src/submissions/submissions.module.ts

@@ -25,5 +25,6 @@ import { SubmissionsService } from './submissions.service';
   ],
   providers: [SubmissionsService],
   controllers: [SubmissionsController],
+  exports: [SubmissionsService],
 })
 export class SubmissionsModule {}