feat(submission): add message and error properties

Author: angristan

src/migrations/1625638887120-AddErrorAndMEssageSubmissions.ts

@@ -0,0 +1,16 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class AddErrorAndMEssageSubmissions1625638887120 implements MigrationInterface {
+    name = 'AddErrorAndMEssageSubmissions1625638887120'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "submissions" ADD "message" character varying`);
+        await queryRunner.query(`ALTER TABLE "submissions" ADD "error" character varying`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "submissions" DROP COLUMN "error"`);
+        await queryRunner.query(`ALTER TABLE "submissions" DROP COLUMN "message"`);
+    }
+
+}

src/submissions/dto/job-status.dto.ts

@@ -8,6 +8,12 @@ export class JobStatusDTO {
   @jsonMember
   status: string;
 
+  @jsonMember
+  message: string;
+
+  @jsonMember
+  error: string;
+
   @jsonMember
   stdout: string;
 

src/submissions/submission.entity.ts

@@ -51,6 +51,16 @@ export class Submission extends BaseEntity {
   @Column({ nullable: true })
   stderr: string;
 
+  @jsonMember
+  @ApiProperty()
+  @Column({ nullable: true })
+  message: string;
+
+  @jsonMember
+  @ApiProperty()
+  @Column({ nullable: true })
+  error: string;
+
   @jsonMember
   @ApiProperty()
   @Column({ default: 0 })

src/submissions/submissions.controller.ts

@@ -38,7 +38,7 @@ export class SubmissionsController {
     await this.amqpConnection.publish('jobs_ex', 'jobs_rk', {
       id: submission.id,
       code: createSubmissionDTO.code,
-      variant: createSubmissionDTO.language,
+      language: createSubmissionDTO.language,
     });
 
     return submission;

src/submissions/submissions.service.ts

@@ -44,6 +44,8 @@ export class SubmissionsService {
   async setStatus(
     id: string,
     status: string,
+    message: string,
+    error: string,
     stdout?: string,
     stderr?: string,
     execDuration?: number,
@@ -59,6 +61,12 @@ export class SubmissionsService {
       if (stderr) {
         submission.stderr = stderr;
       }
+      if (message) {
+        submission.message = message;
+      }
+      if (error) {
+        submission.error = error;
+      }
       if (execDuration) {
         submission.execDuration = execDuration;
       }
@@ -104,6 +112,8 @@ export class SubmissionsService {
       await this.setStatus(
         jobStatus.id,
         jobStatus.status,
+        jobStatus.message,
+        jobStatus.error,
         jobStatus.stdout,
         jobStatus.stderr,
         jobStatus.exec_duration,