fix: schedule handler

src/index.ts

@@ -1,11 +1,15 @@
 import { connectDatabase } from './database'
 import { startGrpcServer } from './grpc'
 import { logger } from './logger'
+import { scheduleTotalAmountUpdate } from './usecase/getTotalAmount'
+import { scheduleListContributorsUpdate } from './usecase/listContributors'
 
 async function main() {
   logger.info('starting...')
   await connectDatabase()
   await startGrpcServer()
+  scheduleListContributorsUpdate()
+  scheduleTotalAmountUpdate()
 }
 
 main()

src/usecase/getTotalAmount.ts

@@ -9,7 +9,6 @@ export async function getTotalAmountUseCase(
   mandatory: boolean
 ): Promise<number> {
   if ((mandatory || !cachedTotalAmount) && !pending) await updateData()
-  else if (pending) await pending
   return cachedTotalAmount!
 }
 
@@ -40,8 +39,12 @@ function delay(ms: number) {
   })
 }
 
-schedule.scheduleJob('*/15,45 * * * *', async () => {
-  pending = updateData()
-  await pending
-  pending = undefined
-})
+export let updateTotalAmountJob: schedule.Job | undefined
+
+export function scheduleTotalAmountUpdate() {
+  updateTotalAmountJob = schedule.scheduleJob('*/15,45 * * * *', async () => {
+    pending = updateData()
+    await pending
+    pending = undefined
+  })
+}

src/usecase/listContributors.ts

@@ -5,6 +5,7 @@ import { logger, logger as schedulerLogger } from '../logger'
 import schedule from 'node-schedule'
 
 let cachedUsers: PaymentUser[] | undefined
+let pending: Promise<void> | undefined
 
 /**
  * 寄付してくれたユーザー一覧を取得
@@ -15,7 +16,7 @@ let cachedUsers: PaymentUser[] | undefined
 export async function listContributorUseCase(
   mandatory: boolean
 ): Promise<PaymentUser[]> {
-  if (mandatory || !cachedUsers) await updateData()
+  if ((mandatory || !cachedUsers) && !pending) await updateData()
   return cachedUsers!
 }
 
@@ -35,4 +36,15 @@ async function updateData() {
   logger.info('寄付者一覧の更新完了')
 }
 
-schedule.scheduleJob('*/0,30 * * * *', () => updateData())
+export let updateListContributorsJob: schedule.Job | undefined
+
+export function scheduleListContributorsUpdate() {
+  updateListContributorsJob = schedule.scheduleJob(
+    '*/0,30 * * * *',
+    async () => {
+      pending = updateData()
+      await pending
+      pending = undefined
+    }
+  )
+}