OUT-2902: failed sync logs being replaced by another

src/app/api/quickbooks/invoice/invoice.service.ts

@@ -858,10 +858,11 @@ export class InvoiceService extends BaseService {
     }
 
     // check if the entity invoice has successful event paid
-    const syncLog = await this.syncLogService.getOneByCopilotIdAndEventType(
-      payload.data.id,
-      EventType.PAID,
-    )
+    const syncLog = await this.syncLogService.getOneByCopilotIdAndEventType({
+      copilotId: payload.data.id,
+      eventType: EventType.PAID,
+      entityType: EntityType.INVOICE,
+    })
 
     if (syncLog?.status === LogStatus.SUCCESS) {
       console.info('InvoiceService#webhookInvoicePaid | Invoice already paid')
@@ -893,10 +894,11 @@ export class InvoiceService extends BaseService {
     }
 
     // get invoice sync log
-    const invoiceLog = await this.syncLogService.getOneByCopilotIdAndEventType(
-      payload.data.id,
-      EventType.CREATED,
-    )
+    const invoiceLog = await this.syncLogService.getOneByCopilotIdAndEventType({
+      copilotId: payload.data.id,
+      eventType: EventType.CREATED,
+      entityType: EntityType.INVOICE,
+    })
 
     if (!invoiceLog) {
       console.error(
@@ -986,10 +988,11 @@ export class InvoiceService extends BaseService {
     }
 
     // get invoice sync log
-    const invoiceLog = await this.syncLogService.getOneByCopilotIdAndEventType(
-      payload.id,
-      EventType.CREATED,
-    )
+    const invoiceLog = await this.syncLogService.getOneByCopilotIdAndEventType({
+      copilotId: payload.id,
+      eventType: EventType.CREATED,
+      entityType: EntityType.INVOICE,
+    })
 
     if (!invoiceLog) {
       console.error(
@@ -1073,10 +1076,11 @@ export class InvoiceService extends BaseService {
     }
 
     // get invoice sync log
-    const invoiceLog = await this.syncLogService.getOneByCopilotIdAndEventType(
-      payload.id,
-      EventType.CREATED,
-    )
+    const invoiceLog = await this.syncLogService.getOneByCopilotIdAndEventType({
+      copilotId: payload.id,
+      eventType: EventType.CREATED,
+      entityType: EntityType.INVOICE,
+    })
 
     if (!invoiceLog) {
       console.error(

src/app/api/quickbooks/payment/payment.service.ts

@@ -169,6 +169,7 @@ export class PaymentService extends BaseService {
           feeAmount: (payload.Line[0].Amount * 100).toFixed(2),
           remark: 'Absorbed fees',
           qbItemName: 'Assembly Fees',
+          errorMessage: '',
         },
       )
     } catch (error: unknown) {

src/app/api/quickbooks/product/product.service.ts

@@ -22,15 +22,15 @@ import {
 } from '@/type/dto/webhook.dto'
 import { CopilotAPI } from '@/utils/copilotAPI'
 import IntuitAPI, { IntuitAPITokensType } from '@/utils/intuitAPI'
-import { and, count, desc, eq, inArray, isNull, not, sql } from 'drizzle-orm'
+import { and, count, desc, eq, inArray, isNull, not, SQL } from 'drizzle-orm'
 import { convert } from 'html-to-text'
 import { z } from 'zod'
 import { SyncLogService } from '@/app/api/quickbooks/syncLog/syncLog.service'
 import { EntityType, EventType, LogStatus } from '@/app/api/core/types/log'
 import dayjs from 'dayjs'
 import APIError from '@/app/api/core/exceptions/api'
 import httpStatus from 'http-status'
-import { QBSyncLog, QBSyncLogCreateSchemaType } from '@/db/schema/qbSyncLogs'
+import { QBSyncLog, QBSyncLogWithEntityType } from '@/db/schema/qbSyncLogs'
 import User from '@/app/api/core/models/User.model'
 import { SettingService } from '@/app/api/quickbooks/setting/setting.service'
 import { replaceBeforeParens, replaceSpecialCharsForQB } from '@/utils/string'
@@ -605,7 +605,7 @@ export class ProductService extends BaseService {
       payload.map(async (item) => {
         const copilotId = item.id
 
-        const payload: QBSyncLogCreateSchemaType = {
+        const payload: QBSyncLogWithEntityType = {
           portalId: this.user.workspaceId,
           entityType: EntityType.PRODUCT,
           eventType: EventType.UNMAPPED,
@@ -645,13 +645,20 @@ export class ProductService extends BaseService {
       productPrice?: string
     },
   ) {
-    const conditions = [
-      eq(QBSyncLog.portalId, this.user.workspaceId),
-      eventType === EventType.UPDATED
-        ? (eq(QBSyncLog.copilotId, copilotId), // product update should be reflected to all the products with multiple prices
-          eq(QBSyncLog.status, LogStatus.FAILED))
-        : eq(QBSyncLog.copilotPriceId, z.string().parse(opts.copilotPriceId)), // product create should have different price Id,
-    ].filter(Boolean)
+    const conditions: SQL[] = [eq(QBSyncLog.portalId, this.user.workspaceId)]
+
+    if (eventType === EventType.UPDATED) {
+      conditions.push(
+        eq(QBSyncLog.copilotId, copilotId), // product update should be reflected to all the products with multiple prices
+        eq(QBSyncLog.eventType, eventType),
+        eq(QBSyncLog.status, LogStatus.FAILED),
+        eq(QBSyncLog.quickbooksId, quickbooksId),
+      )
+    } else {
+      conditions.push(
+        eq(QBSyncLog.copilotPriceId, z.string().parse(opts.copilotPriceId)), // product create should have different price Id,
+      )
+    }
 
     await this.syncLogService.updateOrCreateQBSyncLog(
       {

src/app/api/quickbooks/sync/sync.service.ts

@@ -17,7 +17,7 @@
 import CustomLogger from '@/utils/logger'
 import { QBSyncLog, QBSyncLogSelectSchemaType } from '@/db/schema/qbSyncLogs'
 import { z } from 'zod'
 import { and, eq, inArray, max } from 'drizzle-orm'
 import { WhereClause } from '@/type/common'
 import { TokenService } from '@/app/api/quickbooks/token/token.service'
 import { QBPortalConnection } from '@/db/schema/qbPortalConnections'
@@ -410,7 +410,7 @@
       })
       // 1. get all failed sync logs group by the entity type
       const failedSyncLogs =
-        await this.syncLogService.getFailedSyncLogsByEntityType(includeDeleted)
+        await this.syncLogService.getAllFailedLogsForWorkspace(includeDeleted)
 
       if (failedSyncLogs.length === 0) {
         CustomLogger.info({
@@ -479,6 +479,7 @@
           eq(QBPortalConnection.portalId, this.user.workspaceId),
           ['id'],
         )
+
         const deleteLogs = this.syncLogService.updateQBSyncLog(
           {
             deletedAt: new Date(),

src/app/api/quickbooks/syncLog/syncLog.service.ts

@@ -8,6 +8,7 @@ import {
   QBSyncLogSelectSchemaType,
   QBSyncLogUpdateSchema,
   QBSyncLogUpdateSchemaType,
+  QBSyncLogWithEntityType,
 } from '@/db/schema/qbSyncLogs'
 import { WhereClause } from '@/type/common'
 import { orderMap } from '@/utils/drizzle'
@@ -66,15 +67,21 @@ export class SyncLogService extends BaseService {
     return log
   }
 
-  async getOneByCopilotIdAndEventType(
-    copilotId: string,
-    eventType?: EventType,
-  ) {
+  async getOneByCopilotIdAndEventType({
+    copilotId,
+    eventType,
+    entityType,
+  }: {
+    copilotId: string
+    eventType: EventType
+    entityType: EntityType
+  }) {
     const conditions = [
       eq(QBSyncLog.portalId, this.user.workspaceId),
       eq(QBSyncLog.copilotId, copilotId),
-      eventType ? eq(QBSyncLog.eventType, eventType) : undefined,
-    ].filter(Boolean) // removes undefined
+      eq(QBSyncLog.eventType, eventType),
+      eq(QBSyncLog.entityType, entityType),
+    ]
 
     const query = this.db.query.QBSyncLog.findFirst({
       where: and(...conditions),
@@ -94,18 +101,23 @@ export class SyncLogService extends BaseService {
   }
 
   async updateOrCreateQBSyncLog(
-    payload: QBSyncLogCreateSchemaType,
+    payload: QBSyncLogWithEntityType,
     conditions?: WhereClause,
   ) {
     let existingLog
 
     if (conditions) {
-      existingLog = await this.getOne(conditions)
+      const sqlConditions = and(
+        ...[conditions],
+        eq(QBSyncLog.entityType, payload.entityType),
+      ) as WhereClause
+      existingLog = await this.getOne(sqlConditions)
     } else {
-      existingLog = await this.getOneByCopilotIdAndEventType(
-        payload.copilotId,
-        payload.eventType,
-      )
+      existingLog = await this.getOneByCopilotIdAndEventType({
+        copilotId: payload.copilotId,
+        eventType: payload.eventType,
+        entityType: payload.entityType,
+      })
     }
 
     if (existingLog) {
@@ -129,7 +141,7 @@ export class SyncLogService extends BaseService {
   /**
    * Get all failed sync logs
    */
-  async getFailedSyncLogsByEntityType(
+  async getAllFailedLogsForWorkspace(
     includeDeleted: boolean,
   ): Promise<QBSyncLogSelectSchemaType[] | []> {
     return await this.db.query.QBSyncLog.findMany({

src/app/api/quickbooks/webhook/webhook.service.ts

@@ -8,7 +8,7 @@
 import { ProductService } from '@/app/api/quickbooks/product/product.service'
 import { SettingService } from '@/app/api/quickbooks/setting/setting.service'
 import { SyncLogService } from '@/app/api/quickbooks/syncLog/syncLog.service'
 import { AccountErrorCodes } from '@/constant/intuitErrorCode'
 import { QBSyncLog } from '@/db/schema/qbSyncLogs'
 import {
   InvoiceCreatedResponseSchema,
@@ -20,7 +20,7 @@
   WebhookEventResponseSchema,
   WebhookEventResponseType,
 } from '@/type/dto/webhook.dto'
 import { refreshTokenExpireMessage, validateAccessToken } from '@/utils/auth'
 import { CopilotAPI } from '@/utils/copilotAPI'
 import { ErrorMessageAndCode, getMessageAndCodeFromError } from '@/utils/error'
 import { IntuitAPITokensType } from '@/utils/intuitAPI'
@@ -154,7 +154,10 @@
         parsedInvoiceResource.data.total,
         getMessageAndCodeFromError(error),
       )
-      throw error
+      console.error(
+        `WebhookService#handleWebhookEvent#invoiceCreated :: Error | Portal Id: ${this.user.workspaceId} | Invoice: ${parsedInvoiceResource.data.id}`,
+      )
+      return
     }
   }
 
@@ -187,7 +190,10 @@
         parsedVoidedInvoiceResource.data.total,
         getMessageAndCodeFromError(error),
       )
-      throw error
+      console.error(
+        `WebhookService#handleWebhookEvent#handleInvoiceVoided :: Error | Portal Id: ${this.user.workspaceId} | Invoice: ${parsedVoidedInvoiceResource.data.id}`,
+      )
+      return
     }
   }
 
@@ -216,7 +222,10 @@
         deletePayload.total,
         getMessageAndCodeFromError(error),
       )
-      throw error
+      console.error(
+        `WebhookService#handleWebhookEvent#handleInvoiceDeleted :: Error | Portal Id: ${this.user.workspaceId} | Invoice: ${deletePayload.id}`,
+      )
+      return
     }
   }
 
@@ -257,7 +266,10 @@
         deletedAt: getDeletedAtForAuthAccountCategoryLog(errorWithCode),
         category: getCategory(errorWithCode),
       })
-      throw error
+      console.error(
+        `WebhookService#handleWebhookEvent#handleInvoicePaid :: Error | Portal Id: ${this.user.workspaceId} | Invoice: ${parsedPaidInvoiceResource.data.id}`,
+      )
+      return
     }
   }
 
@@ -298,7 +310,10 @@
         deletedAt: getDeletedAtForAuthAccountCategoryLog(errorWithCode),
         category: getCategory(errorWithCode),
       })
-      throw error
+      console.error(
+        `WebhookService#handleWebhookEvent#handleProductUpdated :: Error | Portal Id: ${this.user.workspaceId} | Product: ${parsedProductResource.data.id}`,
+      )
+      return
     }
   }
 
@@ -351,7 +366,10 @@
         },
         conditions,
       )
-      throw error
+      console.error(
+        `WebhookService#handleWebhookEvent#handlePriceCreated :: Error | Portal Id: ${this.user.workspaceId} | PriceId: ${priceResource.id}`,
+      )
+      return
     }
   }
 
@@ -383,10 +401,11 @@
       }
 
       const syncLogService = new SyncLogService(this.user)
-      const syncLog = await syncLogService.getOneByCopilotIdAndEventType(
-        parsedPaymentSucceedResource.data.id,
-        EventType.SUCCEEDED,
-      )
+      const syncLog = await syncLogService.getOneByCopilotIdAndEventType({
+        copilotId: parsedPaymentSucceedResource.data.id,
+        eventType: EventType.SUCCEEDED,
+        entityType: EntityType.PAYMENT,
+      })
       if (syncLog?.status === LogStatus.SUCCESS) {
         console.info(
           'WebhookService#webhookPaymentSucceeded | Payment already succeeded',
@@ -432,7 +451,10 @@
           deletedAt: getDeletedAtForAuthAccountCategoryLog(errorWithCode),
           category: getCategory(errorWithCode),
         })
-        throw error
+        console.error(
+          `WebhookService#handleWebhookEvent#handlePaymentSucceeded :: Error | Portal Id: ${this.user.workspaceId} | Payment: ${parsedPaymentSucceedResource.data.id}`,
+        )
+        return
       }
     }
   }

src/db/schema/qbSyncLogs.ts

@@ -53,6 +53,14 @@ export const QBSyncLog = table('qb_sync_logs', {
 export const QBSyncLogCreateSchema = createInsertSchema(QBSyncLog)
 export type QBSyncLogCreateSchemaType = z.infer<typeof QBSyncLogCreateSchema>
 
+export type QBSyncLogWithEntityType = Omit<
+  QBSyncLogCreateSchemaType,
+  'entityType'
+> & {
+  entityType: EntityType
+  eventType: EventType
+}
+
 export const QBSyncLogSelectSchema = createSelectSchema(QBSyncLog)
 export type QBSyncLogSelectSchemaType = z.infer<typeof QBSyncLogSelectSchema>