feat: get last submission for user (PUT)

Author: Mikadows

src/submissions/dto/find-last-submission-by-language.dto.ts

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

src/submissions/submissions.controller.ts

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

src/submissions/submissions.service.ts

@@ -8,10 +8,11 @@ import {
 } 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 { User } from '../users/user.entity';
+import { FindLastSubmissionByLanguageDTO } from './dto/find-last-submission-by-language.dto';
 import { FindSubmissionDTO } from './dto/find-submission.dto';
 import { InsertSubmissionDTO } from './dto/insert-submission-dto';
 import { JobStatusDTO } from './dto/job-status.dto';
@@ -31,21 +32,13 @@ export class SubmissionsService {
     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,
-    });
+    const benchmark = await this.benchmarkService.findOne(
+      insertSubmissionDTO.benchmarkId,
+    );
 
-    if (!benchmark) {
-      throw new BadRequestException(
-        `Could not find benchmark: ${insertSubmissionDTO.benchmarkId}`,
-      );
+    if (benchmark) {
+      submission.benchmark = benchmark;
     }
-    submission.benchmark = benchmark;
 
     return submission.save();
   }
@@ -124,4 +117,36 @@ export class SubmissionsService {
       }
     }
   }
+
+  async findLastByLanguage(
+    filter: FindLastSubmissionByLanguageDTO,
+    requestUser: User,
+  ): Promise<Submission | undefined> {
+    const bench = await this.benchmarkService.findOne(filter.benchmarkId);
+    const matchedLanguage = await this.languageMatcher(filter.language);
+
+    if (!matchedLanguage) {
+      throw new BadRequestException(`Invalid language: ${filter.language}`);
+    }
+
+    return this.submissionsRepository.findOne({
+      where: [
+        {
+          user: requestUser,
+          benchmark: bench,
+          language: matchedLanguage,
+        },
+      ],
+      order: { createdAt: 'DESC' },
+    });
+  }
+
+  async languageMatcher(language: string): Promise<string | undefined> {
+    switch (language) {
+      case 'python':
+        return 'cpython3';
+      default:
+        return undefined;
+    }
+  }
 }