feat: 컨테이너 복구

[#192]
boostcampwm2023 · Nov 30, 2023 · 147c345 · 147c345
1 parent ca70d2a
commit 147c345
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 7 deletions.
diff --git a/packages/backend/src/containers/containers.service.ts b/packages/backend/src/containers/containers.service.ts
@@ -5,6 +5,7 @@ import { CommandResponseDto } from '../quizzes/dto/command-response.dto';
 import shellEscape from 'shell-escape';
 import { v4 as uuidv4 } from 'uuid';
 import { SshService } from '../ssh/ssh.service';
+import { ActionType } from '../session/schema/session.schema';
 
 @Injectable()
 export class ContainersService {
@@ -106,4 +107,28 @@ export class ContainersService {
       throw new Error(stderrData);
     }
   }
+
+  async restoreContainer(logObject: {
+    status: string;
+    logs: {
+      mode: ActionType;
+      message: string;
+    }[];
+    containerId: string;
+  }): Promise<void> {
+    this.logger.log('info', 'restoring container...');
+    const { logs, containerId } = logObject;
+
+    let recentMessage = '';
+    for (const log of logs) {
+      if (log.mode === 'command') {
+        await this.runGitCommand(containerId, log.message);
+      } else if (log.mode === 'editor') {
+        await this.runEditorCommand(containerId, recentMessage, log.message);
+      } else {
+        throw new Error('Invalid log mode');
+      }
+      recentMessage = log.message;
+    }
+  }
 }
diff --git a/packages/backend/src/quizzes/quizzes.controller.ts b/packages/backend/src/quizzes/quizzes.controller.ts
@@ -141,6 +141,9 @@ export class QuizzesController {
           id,
           containerId,
         );
+        await this.containerService.restoreContainer(
+          await this.sessionService.getLogObject(sessionId, id),
+        );
       }
 
       // 리팩토링 필수입니다.
@@ -274,18 +277,29 @@ export class QuizzesController {
   ): Promise<SubmitDto> {
     if (!sessionId) return new Fail();
     try {
-      const containerId = await this.sessionService.getContainerIdBySessionId(
+      let containerId = await this.sessionService.getContainerIdBySessionId(
         sessionId,
         id,
       );
 
-      if (!containerId) {
-        return;
-      }
-
-      if (!(await this.containerService.isValidateContainerId(containerId))) {
+      if (
+        !containerId ||
+        !(await this.containerService.isValidateContainerId(containerId))
+      ) {
         // 재현해서 컨테이너 발급하기
-        return;
+        this.logger.log(
+          'info',
+          'no docker container or invalid container Id. creating container..',
+        );
+        containerId = await this.containerService.getContainer(id);
+        await this.sessionService.setContainerBySessionId(
+          sessionId,
+          id,
+          containerId,
+        );
+        await this.containerService.restoreContainer(
+          await this.sessionService.getLogObject(sessionId, id),
+        );
       }
 
       const result: boolean = await this.quizWizardService.submit(

diff --git a/packages/backend/src/session/session.service.ts b/packages/backend/src/session/session.service.ts
@@ -122,4 +122,12 @@ export class SessionService {
     session.save();
     this.logger.log('info', `session ${session._id as ObjectId} deleted`);
   }
+
+  async getLogObject(sessionId: string, problemId: number): Promise<any> {
+    const session = await this.getSessionById(sessionId);
+    if (!session.problems.get(problemId)) {
+      throw new Error('problem not found');
+    }
+    return session.problems.get(problemId);
+  }
 }