fix: apply self reference for duplicated submissions

Author: Mikadows

src/migrations/1626996924860-AddDuplicatedSubmission.ts

@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AddDuplicatedSubmission1626996924860 implements MigrationInterface {
+    name = 'AddDuplicatedSubmission1626996924860'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "submissions" ADD "selfId" uuid`);
+        await queryRunner.query(`ALTER TABLE "submissions" ADD CONSTRAINT "FK_8cc0cfc3583dbe9e530311136f6" FOREIGN KEY ("selfId") REFERENCES "submissions"("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_8cc0cfc3583dbe9e530311136f6"`);
+        await queryRunner.query(`ALTER TABLE "submissions" DROP COLUMN "selfId"`);
+    }
+
+}

src/submissions/submission.entity.ts

@@ -1,15 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { ApiProperty } from '@nestjs/swagger';
 import { User } from 'src/users/user.entity';
-import { jsonArrayMember, jsonMember, jsonObject } from 'typedjson';
+import { jsonMember, jsonObject } from 'typedjson';
 import {
   BaseEntity,
   Column,
   CreateDateColumn,
   Entity,
-  JoinTable,
-  ManyToMany,
   ManyToOne,
+  OneToMany,
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm';
@@ -111,12 +110,12 @@ export class Submission extends BaseEntity {
   @ApiProperty({ type: () => Benchmark })
   benchmark: Benchmark;
 
-  @ApiProperty()
-  @JoinTable()
-  @jsonArrayMember(() => Submission)
-  @ManyToMany(
-    () => Submission,
+  @ManyToOne(
+    (type) => Submission,
     (submission) => submission.duplicatedSubmissions,
   )
+  self: Submission;
+
+  @OneToMany((type) => Submission, (submission) => submission.self)
   duplicatedSubmissions: Submission[];
 }

src/submissions/submissions.service.ts

@@ -56,6 +56,7 @@ export class SubmissionsService {
       submission.benchmark,
       insertSubmissionDTO.language,
     );
+    // submission.self = submission;
 
     return submission.save();
   }
@@ -115,7 +116,16 @@ export class SubmissionsService {
     // }
 
     // Fallback to DB
-    return this.submissionsRepository.findOne({ id: queriedSubmission.id });
+    return this.submissionsRepository.findOne({
+      where: [
+        {
+          id: queriedSubmission.id,
+        },
+      ],
+      relations: ['duplicatedSubmissions'],
+      order: { createdAt: 'DESC' },
+    });
+    // return this.submissionsRepository.findOne({ id: queriedSubmission.id });
   }
 
   @RabbitSubscribe({
@@ -190,6 +200,7 @@ export class SubmissionsService {
           language: matchedLanguage,
         },
       ],
+      relations: ['duplicatedSubmissions'],
       order: { createdAt: 'DESC' },
     });
   }