Skip to content

fix: resolve race condition causing cross-workspace invoice sync #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
makeitraina merged 1 commit into from
Jan 6, 2026
Merged

fix: resolve race condition causing cross-workspace invoice sync #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 27 additions & 31 deletions src/app/api/quickbooks/invoice/invoice.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ type InvoiceItemRefAndDescriptionType = {
export class InvoiceService extends BaseService {
private copilot: CopilotAPI
private syncLogService: SyncLogService
private static intuitApiService: IntuitAPI
private static oneOffItem: OneOffItemType
private static incomeAccountRef: string
private intuitApiService!: IntuitAPI
Copy link
Member Author

@makeitraina makeitraina Jan 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i dont like this !, i need this to pass ci to merge.

private oneOffItem!: OneOffItemType
private incomeAccountRef!: string

constructor(user: User) {
super(user)
Expand Down Expand Up @@ -196,7 +196,7 @@ export class InvoiceService extends BaseService {
if (mapping.isExcluded) {
// if excluded, do not include in invoice and send as one-off item
console.info('InvoiceService#getInvoiceItemRef | Product is excluded')
return { ref: InvoiceService.oneOffItem }
return { ref: this.oneOffItem }
}
if (mapping.qbItemId) {
console.info('InvoiceService#getInvoiceItemRef | Product map found')
Expand All @@ -213,7 +213,7 @@ export class InvoiceService extends BaseService {
undefined,
mapping.qbItemId,
)
if (!intuitItem) return { ref: InvoiceService.oneOffItem } // if item is not present in Intuit, return one-off item
if (!intuitItem) return { ref: this.oneOffItem } // if item is not present in Intuit, return one-off item

return {
ref: { value: mapping.qbItemId },
Expand All @@ -235,7 +235,7 @@ export class InvoiceService extends BaseService {
console.info(
'InvoiceService#getInvoiceItemRef | Create new product flag is false',
)
return { ref: InvoiceService.oneOffItem }
return { ref: this.oneOffItem }
}

// 2. create a new product in QB company
Expand All @@ -252,7 +252,7 @@ export class InvoiceService extends BaseService {
}

const productDescription = convert(productInfo.description)
const incomeAccRefVal = InvoiceService.incomeAccountRef
const incomeAccRefVal = this.incomeAccountRef

// total products with the same product id
const itemsCount = await productService.getProductCount(
Expand Down Expand Up @@ -337,7 +337,7 @@ export class InvoiceService extends BaseService {
const actualAmount = lineItem.amount / 100 // Convert to dollar. amount received in cents.

let itemRef: InvoiceItemRefAndDescriptionType = {
ref: InvoiceService.oneOffItem,
ref: this.oneOffItem,
productDescription: lineItem.description,
}

Expand Down Expand Up @@ -372,7 +372,7 @@ export class InvoiceService extends BaseService {
}

async manageClientFeeRef(): Promise<string> {
const intuitService = InvoiceService.intuitApiService
const intuitService = this.intuitApiService
const productName = 'Assembly Fees paid by Client'
const tokenService = new TokenService(this.user)

Expand All @@ -389,7 +389,7 @@ export class InvoiceService extends BaseService {
{
productName,
unitPrice: 0,
incomeAccRefVal: InvoiceService.incomeAccountRef,
incomeAccRefVal: this.incomeAccountRef,
},
intuitService,
false, // flag that this item is non-taxable
Expand All @@ -413,7 +413,7 @@ export class InvoiceService extends BaseService {
}

async manageServiceItemRef(): Promise<string> {
const intuitService = InvoiceService.intuitApiService
const intuitService = this.intuitApiService
const productName = 'Services'
const tokenService = new TokenService(this.user)

Expand All @@ -430,7 +430,7 @@ export class InvoiceService extends BaseService {
{
productName,
unitPrice: 0,
incomeAccRefVal: InvoiceService.incomeAccountRef,
incomeAccRefVal: this.incomeAccountRef,
},
intuitService,
)
Expand Down Expand Up @@ -514,7 +514,7 @@ export class InvoiceService extends BaseService {
if (!serviceItemRef || !serviceItem?.id) {
serviceItemRef = await this.manageServiceItemRef()
}
InvoiceService.oneOffItem = { value: serviceItemRef }
this.oneOffItem = { value: serviceItemRef }
}

/**
Expand All @@ -541,7 +541,7 @@ export class InvoiceService extends BaseService {
return
}

InvoiceService.intuitApiService = new IntuitAPI(qbTokenInfo)
this.intuitApiService = new IntuitAPI(qbTokenInfo)
await this.handleIncomeAccountRef(qbTokenInfo)

const customerService = new CustomerService(this.user)
Expand All @@ -556,14 +556,14 @@ export class InvoiceService extends BaseService {
const existingCustomer =
await customerService.ensureCustomerExistsAndSyncToken(
recipientInfo.clientCompanyId,
InvoiceService.intuitApiService,
this.intuitApiService,
)

let customer,
existingCustomerMapId = existingCustomer?.id
if (!existingCustomer) {
// 2.1. search client in qb using client's given name and family name
customer = await InvoiceService.intuitApiService.getACustomer(
customer = await this.intuitApiService.getACustomer(
replaceSpecialCharsForQB(recipientInfo.displayName),
undefined,
true,
Expand Down Expand Up @@ -593,7 +593,7 @@ export class InvoiceService extends BaseService {
}

const customerRes =
await InvoiceService.intuitApiService.createCustomer(customerPayload)
await this.intuitApiService.createCustomer(customerPayload)
customer = customerRes.Customer

console.info(
Expand Down Expand Up @@ -662,10 +662,9 @@ export class InvoiceService extends BaseService {
sparse: true as const,
}

const customerRes =
await InvoiceService.intuitApiService.customerSparseUpdate(
customerSparsePayload,
)
const customerRes = await this.intuitApiService.customerSparseUpdate(
customerSparsePayload,
)
customer = customerRes.Customer

// update the customer map in our table
Expand All @@ -688,17 +687,14 @@ export class InvoiceService extends BaseService {

// Check if service item ref ID is present in our DB. If not create new
// in QB and store the id in our DB
await this.handleServiceItem(InvoiceService.intuitApiService)
await this.handleServiceItem(this.intuitApiService)

// bottleneck implementation (rate limiting)
const lineItemPromises = []
for (const lineItem of invoiceResource.lineItems) {
lineItemPromises.push(
bottleneck.schedule(() => {
return this.prepareLineItemPayload(
lineItem,
InvoiceService.intuitApiService,
)
return this.prepareLineItemPayload(lineItem, this.intuitApiService)
}),
)
}
Expand All @@ -719,7 +715,7 @@ export class InvoiceService extends BaseService {
if (invoiceResource.status === InvoiceStatus.PAID) {
const clientFeeLineItem = await this.handleFeePaidByClient(
payload,
InvoiceService.intuitApiService,
this.intuitApiService,
)
if (clientFeeLineItem) {
lineItems.push(clientFeeLineItem)
Expand Down Expand Up @@ -753,7 +749,7 @@ export class InvoiceService extends BaseService {

// 6. create invoice in QB
const invoiceRes =
await InvoiceService.intuitApiService.createInvoice(qbInvoicePayload)
await this.intuitApiService.createInvoice(qbInvoicePayload)

const invoicePayload = {
portalId: this.user.workspaceId,
Expand Down Expand Up @@ -807,7 +803,7 @@ export class InvoiceService extends BaseService {
],
}
await paymentService.createPaymentAndSync(
InvoiceService.intuitApiService,
this.intuitApiService,
qbPaymentPayload,
{
invoiceNumber: invoiceResource.number,
Expand Down Expand Up @@ -1142,9 +1138,9 @@ export class InvoiceService extends BaseService {
const incomeAccountRef = await tokenService.checkAndUpdateAccountStatus(
AccountTypeObj.Income,
qbTokenInfo.intuitRealmId,
InvoiceService.intuitApiService,
this.intuitApiService,
qbTokenInfo.incomeAccountRef,
)
InvoiceService.incomeAccountRef = z.string().parse(incomeAccountRef)
this.incomeAccountRef = z.string().parse(incomeAccountRef)
}
}
12 changes: 4 additions & 8 deletions src/utils/intuitAPI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,11 @@ export const IntuitAPIErrorMessage = '#IntuitAPIErrorMessage#'

export default class IntuitAPI {
tokens: IntuitAPITokensType
private static headers: Record<string, string>
private headers: Record<string, string>

constructor(tokens: IntuitAPITokensType) {
this.tokens = tokens
this.setHeaders()
}

private setHeaders() {
IntuitAPI.headers = {
this.headers = {
Authorization: `Bearer ${this.tokens.accessToken}`,
Accept: 'application/json',
'content-type': 'application/json',
Expand All @@ -81,7 +77,7 @@ export default class IntuitAPI {
customHeaders?: Record<string, string>,
) {
const headers = {
...IntuitAPI.headers,
...this.headers,
...customHeaders,
}
const response = await postFetcher(url, headers, body)
Expand All @@ -96,7 +92,7 @@ export default class IntuitAPI {
customHeaders?: Record<string, string>,
) {
const headers = {
...IntuitAPI.headers,
...this.headers,
...customHeaders,
}
const response = await getFetcher(url, headers)
Expand Down
Loading