Merge pull request #173 from boostcampwm2023/feature-be-#172

[BE] feat#172 session log 스키마 수정
boostcampwm2023 · Nov 29, 2023 · 8bbb474 · 8bbb474
2 parents e49e1c7 + 40b840e
commit 8bbb474
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 23 deletions.
diff --git a/packages/backend/src/quizzes/quizzes.controller.ts b/packages/backend/src/quizzes/quizzes.controller.ts
@@ -10,6 +10,7 @@ import {
   Inject,
   Delete,
   UseGuards,
+  NotFoundException,
 } from '@nestjs/common';
 import {
   ApiTags,
@@ -136,10 +137,11 @@ export class QuizzesController {
           execCommandDto.message,
         ));
       } else if (execCommandDto.mode === MODE.EDITOR) {
-        const recentCommand = await this.sessionService.getRecentLog(
-          sessionId,
-          id,
-        );
+        const { mode: recentMode, message: recentMessage } =
+          await this.sessionService.getRecentLog(sessionId, id);
+        if (recentMode === MODE.EDITOR) {
+          throw new NotFoundException('편집기 명령 차례가 아닙니다');
+        }
 
         const bodyPreview =
           execCommandDto.message.length > 15
@@ -148,12 +150,12 @@ export class QuizzesController {
 
         this.logger.log(
           'info',
-          `running editor command "${recentCommand}" for container ${containerId} with body starts with "${bodyPreview}"`,
+          `running editor command "${recentMessage}" for container ${containerId} with body starts with "${bodyPreview}"`,
         );
 
         ({ message, result } = await this.containerService.runEditorCommand(
           containerId,
-          recentCommand,
+          recentMessage,
           execCommandDto.message,
         ));
       } else {
@@ -163,11 +165,7 @@ export class QuizzesController {
       }
 
       // 일단 editor일 때도 message를 저장합니다.
-      this.sessionService.pushLogBySessionId(
-        execCommandDto.message,
-        sessionId,
-        id,
-      );
+      this.sessionService.pushLogBySessionId(execCommandDto, sessionId, id);
 
       response.status(HttpStatus.OK).send({
         message,

diff --git a/packages/backend/src/session/schema/session.schema.ts b/packages/backend/src/session/schema/session.schema.ts
@@ -1,14 +1,15 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import { Document } from 'mongoose';
 
+const Action = {
+  Command: 'command',
+  Editor: 'editor',
+} as const;
+
+export type ActionType = (typeof Action)[keyof typeof Action];
+
 @Schema({ timestamps: true })
 export class Session extends Document {
-  // @Prop({ required: true })
-  // createdAt: Date;
-  //
-  // @Prop({ required: true })
-  // updatedAt: Date;
-
   @Prop()
   deletedAt: Date | null;
 
@@ -17,15 +18,26 @@ export class Session extends Document {
     type: Map,
     of: {
       status: { type: String, required: true },
-      logs: { type: [String], required: true },
+      logs: {
+        type: [
+          {
+            mode: { type: String, enum: Object.values(Action), required: true },
+            message: { type: String, required: true },
+          },
+        ],
+        required: true,
+      },
       containerId: { type: String, default: '' },
     },
   })
   problems: Map<
     number,
     {
       status: string;
-      logs: string[];
+      logs: {
+        mode: ActionType;
+        message: string;
+      }[];
       containerId: string;
     }
   >;

diff --git a/packages/backend/src/session/session.service.ts b/packages/backend/src/session/session.service.ts
@@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Logger } from 'winston';
 import { Model } from 'mongoose';
-import { Session } from './schema/session.schema';
+import { ActionType, Session } from './schema/session.schema';
 import { ObjectId } from 'typeorm';
 
 @Injectable()
@@ -71,7 +71,10 @@ export class SessionService {
     session.save();
   }
 
-  async getRecentLog(sessionId: string, problemId: number): Promise<string> {
+  async getRecentLog(
+    sessionId: string,
+    problemId: number,
+  ): Promise<{ mode: string; message: string }> {
     const session = await this.getSessionById(sessionId);
 
     const problemLogs = session?.problems.get(problemId)?.logs;
@@ -83,15 +86,15 @@ export class SessionService {
   }
 
   async pushLogBySessionId(
-    command: string,
+    log: { mode: ActionType; message: string },
     sessionId: string,
     problemId: number,
   ): Promise<void> {
     const session = await this.getSessionById(sessionId);
     if (!session.problems.get(problemId)) {
       throw new Error('problem not found');
     }
-    session.problems.get(problemId).logs.push(command);
+    session.problems.get(problemId).logs.push(log);
     session.save();
   }