refactor: extract isExpiredInvoice to utils and reuse in LNbits processor

Author: kanishka0411

src/app/maintenance-worker.ts

@@ -12,6 +12,7 @@ import { createLogger } from '../factories/logger-factory'
 import { delayMs } from '../utils/misc'
 import { INip05VerificationRepository } from '../@types/repositories'
 import { InvoiceStatus } from '../@types/invoice'
+import { isExpiredInvoice } from '../utils/invoice'
 import { Nip05Verification } from '../@types/nip05'
 import { Settings } from '../@types/settings'
 
@@ -21,10 +22,8 @@ const CLEAR_OLD_EVENTS_TIMEOUT_MS = 5000
 
 const logger = createLogger('maintenance-worker')
 
-const isNotFoundError = (error: unknown): boolean => (error as any)?.response?.status === 404
-
-const isExpiredInvoice = (invoice: { expiresAt?: Date | null }): boolean =>
-  invoice.expiresAt instanceof Date && invoice.expiresAt.getTime() <= Date.now()
+const isNotFoundError = (error: unknown): boolean =>
+  (error as any)?.response?.status === 404
 
 /**
  * Merge a re-verification outcome onto an existing verification row.

src/payments-processors/lnbits-payment-processor.ts

@@ -5,6 +5,7 @@ import { Invoice, InvoiceStatus, InvoiceUnit } from '../@types/invoice'
 import { AxiosInstance } from 'axios'
 import { createLogger } from '../factories/logger-factory'
 import { Factory } from '../@types/base'
+import { isExpiredInvoice } from '../utils/invoice'
 import { Pubkey } from '../@types/base'
 import { Settings } from '../@types/settings'
 
@@ -53,7 +54,6 @@ export class LNbitsPaymentsProcessor implements IPaymentsProcessor {
       })
       const invoice = new LNbitsInvoice()
       const data = response.data
-      const expiresAt = new Date(data.details.expiry * 1000)
       invoice.id = data.details.payment_hash
       invoice.pubkey = data.details.extra.internalId
       invoice.bolt11 = data.details.bolt11
@@ -62,16 +62,16 @@ export class LNbitsPaymentsProcessor implements IPaymentsProcessor {
         invoice.amountPaid = BigInt(Math.floor(data.details.amount / 1000))
       }
       invoice.unit = InvoiceUnit.SATS
+      invoice.expiresAt = new Date(data.details.expiry * 1000)
       if (data.paid) {
         invoice.status = InvoiceStatus.COMPLETED
-      } else if (expiresAt.getTime() <= Date.now()) {
+      } else if (isExpiredInvoice(invoice)) {
         invoice.status = InvoiceStatus.EXPIRED
       } else {
         invoice.status = InvoiceStatus.PENDING
       }
       invoice.description = data.details.memo
       invoice.confirmedAt = data.paid ? new Date(data.details.time * 1000) : null
-      invoice.expiresAt = expiresAt
       invoice.createdAt = new Date(data.details.time * 1000)
       invoice.updatedAt = new Date()
       return invoice

src/utils/invoice.ts

@@ -0,0 +1,2 @@
+export const isExpiredInvoice = (invoice: { expiresAt?: Date | null }): boolean =>
+  invoice.expiresAt instanceof Date && invoice.expiresAt.getTime() <= Date.now()