fix(Queue): exec 메서드 수정

- 유효하지 않은(입금 두개 이상) 요청이 들어올 경우, queue에서 같은 id의 deposit 요청 제거 후 실행되도록 수정

src/index.ts

@@ -14,11 +14,21 @@ export class App {
   }
 
   async start() {
-    await this.bankAccountService.deposit(1, 5000);
+    await Promise.all([
+      this.bankAccountService.deposit(1, 5000),
+      this.bankAccountService.withdrawal(1, 5000),
+      this.bankAccountService.deposit(1, 5000),
+    ]);
+
     const balance = await this.bankAccountService.getBalance(1);
+
+    return balance;
   }
 }
 
 const app = new App();
 
-Promise.all([app.start(), app.start()]);
+(async () => {
+  const result = await app.start();
+  console.log(result);
+})();

src/service/Queue.ts

@@ -1,4 +1,5 @@
 import { BankAccount } from "../repository/BankAccountRepository";
+import { sleep } from "../utils/sleep";
 
 export type BankAccountUpdateAction = "deposit" | "withdrawal";
 
@@ -9,7 +10,7 @@ export type BankAccountQueueNode = {
 };
 
 export interface BankAccountServiceQueue {
-  isValid: () => void;
+  isValid: (id: number) => void;
   push: (node: BankAccountQueueNode) => Promise<any>;
   dequeue: () => () => Promise<BankAccount>;
   exec: () => void;
@@ -33,21 +34,21 @@ export class BankAccountServiceQueueImpl implements BankAccountServiceQueue {
     }, {} as Record<number, number>);
   };
 
-  isValid = () => {
+  isValid = (id: number) => {
     const depositActionCountMap = this.getDepositActionCount(this.queue);
-
-    const isInvalidAction = Object.values(depositActionCountMap).some(
-      (count) => count > 1
-    );
-
-    if (isInvalidAction) {
-      throw new Error("같은 아이디로 동시에 입금할 수 없습니다.");
-    }
+    console.log(this.queue);
+    return !(depositActionCountMap[id] > 1);
+    // const isInvalidAction = Object.values(depositActionCountMap).some(
+    //   (count) => count > 1
+    // );
+
+    // if (isInvalidAction) {
+    //   throw new Error("같은 아이디로 동시에 입금할 수 없습니다.");
+    // }
   };
 
   async push(node: BankAccountQueueNode) {
     this.queue.push(node);
-    this.isValid();
 
     if (!this.isExec) {
       this.isExec = true;
@@ -62,7 +63,20 @@ export class BankAccountServiceQueueImpl implements BankAccountServiceQueue {
 
   // 재귀함수 사용
   async exec() {
-    const { func } = this.queue[0];
+    const { func, id } = this.queue[0];
+
+    await sleep(0);
+
+    if (!this.isValid(id)) {
+      this.queue = this.queue.filter(
+        (node) => !(node.id === id && node.action === "deposit")
+      );
+
+      if (this.queue.length > 0) {
+        this.exec();
+      }
+      return;
+    }
 
     await func().then(() => {
       this.dequeue();

src/utils/sleep.ts

@@ -1,4 +1,4 @@
-export function sleep(ms: number) {
+export async function sleep(ms: number) {
   const wakeUpTime = Date.now() + ms;
   while (Date.now() < wakeUpTime) {}
 }