Merge pull request #9 from InternetMaximalism/refactor

withdrawal manager

Author: signature18632

packages/collector/src/service/withdrawal.service.ts

@@ -2,15 +2,15 @@ import {
   QueueManager,
   type RequestingWithdrawal,
   WithdrawalGroupStatus,
+  WithdrawalManager,
   WithdrawalPrisma,
   WithdrawalStatus,
   logger,
-  withdrawalManager,
   withdrawalPrisma,
 } from "@intmax2-withdrawal-aggregator/shared";
 
 export const fetchRequestingWithdrawals = async () => {
-  const processedUUIDs = await withdrawalManager.getAllProcessedUUIDs();
+  const processedUUIDs = await WithdrawalManager.getInstance().getAllProcessedUUIDs();
 
   const requestingWithdrawals = await withdrawalPrisma.withdrawal.findMany({
     select: {
@@ -35,7 +35,7 @@ export const createWithdrawalGroup = async (group: RequestingWithdrawal[]) => {
   const queueManager = QueueManager.getInstance("withdrawal-aggregator");
   const now = new Date();
 
-  const groupId = await withdrawalManager.addGroup({
+  const groupId = await WithdrawalManager.getInstance().addGroup({
     requestingWithdrawals: group.map((withdrawal) => ({
       uuid: withdrawal.uuid,
     })),

packages/processor/src/service/job.service.ts

@@ -4,7 +4,7 @@ import {
   WithdrawalStatus,
   logger,
   timeOperation,
-  withdrawalManager,
+  WithdrawalManager,
   withdrawalPrisma,
 } from "@intmax2-withdrawal-aggregator/shared";
 import { EXECUTION_REVERTED_ERROR_MESSAGE } from "../constants";
@@ -15,6 +15,7 @@ export const processQueueJob = async (jobData: QueueJobData) => {
 };
 
 const performJob = async (data: QueueJobData): Promise<void> => {
+  const withdrawalManager = WithdrawalManager.getInstance();
   const { groupId } = data.payload;
 
   try {

packages/shared/src/lib/withdrawalManager.ts

@@ -3,6 +3,7 @@ import type { WithdrawalGroup } from "../types";
 import { RedisClient } from "./redis";
 
 export class WithdrawalManager {
+  private static instance: WithdrawalManager;
   private redis: Redis;
   private readonly keyPrefix = "withdrawal:";
   private readonly groupSetKey = "withdrawal:groups";
@@ -12,6 +13,13 @@ export class WithdrawalManager {
     this.redis = RedisClient.getInstance().getClient()!;
   }
 
+  public static getInstance(): WithdrawalManager {
+    if (!WithdrawalManager.instance) {
+      WithdrawalManager.instance = new WithdrawalManager();
+    }
+    return WithdrawalManager.instance;
+  }
+
   private getKey(id: string): string {
     return `${this.keyPrefix}${id}`;
   }
@@ -76,5 +84,3 @@ export class WithdrawalManager {
     return groups.flatMap((group) => group.requestingWithdrawals.map(({ uuid }) => uuid));
   }
 }
-
-export const withdrawalManager = new WithdrawalManager();