refactor: 버그 수정

[#267]
boostcampwm2023 · Dec 7, 2023 · a5bf91b · a5bf91b
1 parent 3e192fc
commit a5bf91b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/backend/src/common/util.ts b/packages/backend/src/common/util.ts
@@ -56,9 +56,15 @@ export function isStringArray(obj: unknown): obj is string[] {
   );
 }
 
-export function graphParser(graph: string): string {
-  const graphParsed = JSON.parse(`[
-  ${graph.substring(0, graph.length - 1)}
-  ]`);
+export function graphParser(graph: string) {
+  const lines = graph.split('\n');
+  const graphParsed: object[] = [];
+  for (let i = 0; i < lines.length; i += 4) {
+    const id = lines[i];
+    const parentId = lines[i + 1];
+    const message = lines[i + 2];
+    const refs = lines[i + 3];
+    graphParsed.push({ id, parentId, message, refs });
+  }
   return graphParsed;
 }
diff --git a/packages/backend/src/containers/containers.service.ts b/packages/backend/src/containers/containers.service.ts
@@ -9,7 +9,7 @@ import { CommandService } from '../command/command.service';
 const DOCKER_QUIZZER_COMMAND = 'docker exec -w /home/quizzer/quiz/ -u quizzer';
 const RETRY_DELAY = 500;
 const MAX_RETRY = 3;
-const GRAPH_COMMAND = `git log --branches --pretty=format:'{"id":"%H","parentId":"%P","message":"%s","refs":"%D"},' --topo-order`;
+const GRAPH_COMMAND = `git log --branches --pretty=format:'%H%n%P%n%s%n%D' --topo-order`;
 const GRAPH_ESCAPE = '89BDBC3136461-17189F6963D26-9F1BC6D53A3ED';
 
 @Injectable()
@@ -42,7 +42,7 @@ export class ContainersService {
   }
 
   private getGitCommand(container: string, command: string): string {
-    return `git config --global core.editor /editor/output.sh; ${DOCKER_QUIZZER_COMMAND} ${container} /usr/local/bin/restricted-shell ${command}`;
+    return `${DOCKER_QUIZZER_COMMAND} ${container} sh -c "git config --global core.editor /editor/output.sh; ${command}"`;
   }
   async runGitCommand(
     container: string,
@@ -52,7 +52,7 @@ export class ContainersService {
       this.getGitCommand(container, command),
       `echo "${GRAPH_ESCAPE}" 1>&2`,
       `echo "${GRAPH_ESCAPE}"`,
-      this.getGitCommand(container, GRAPH_COMMAND),
+      `${DOCKER_QUIZZER_COMMAND} ${container} /usr/local/bin/restricted-shell ${GRAPH_COMMAND}`,
     );
 
     const graphMessage = stdoutData
@@ -105,7 +105,7 @@ export class ContainersService {
       this.getEditorCommand(container, message, command),
       `echo "${GRAPH_ESCAPE}" 1>&2`,
       `echo "${GRAPH_ESCAPE}"`,
-      this.getGitCommand(container, GRAPH_COMMAND),
+      `${DOCKER_QUIZZER_COMMAND} ${container} /usr/local/bin/restricted-shell ${GRAPH_COMMAND}`,
     );
 
     const graphMessage = stdoutData