dev #2283
There are no files selected for viewing
Submodule ai
updated
from bca809 to bce748
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| import { CusProductStatus, type SyncParamsV1 } from "@autumn/shared"; | ||
| import type { AutumnContext } from "@/honoUtils/HonoEnv"; | ||
| import { persistCreateSchedule } from "@/internal/billing/v2/actions/createSchedule/utils/persistCreateSchedule"; | ||
| import { executeAutumnBillingPlan } from "@/internal/billing/v2/execute/executeAutumnBillingPlan"; | ||
| import { sendBillingUpdatedWebhook } from "@/internal/billing/v2/workflows/sendBillingUpdatedWebhook/sendBillingUpdatedWebhook"; | ||
| import { reconcileLicenseStateForCustomer } from "@/internal/licenses/actions/reconcile/reconcileLicenseState"; | ||
| import { computeSyncPlan } from "./compute/computeSyncPlan"; | ||
| import { handleSyncErrors } from "./errors/handleSyncErrors"; | ||
| import { logSyncContext } from "./logs/logSyncContext"; | ||
|
|
@@ -27,28 +28,15 @@ export type SyncV2Result = { | |
|
|
||
| /** | ||
| * Sync a Stripe subscription/schedule into Autumn state. | ||
| */ | ||
| export const syncV2 = async ({ | ||
| ctx, | ||
| params, | ||
| tags, | ||
| }: { | ||
| ctx: AutumnContext; | ||
| params: SyncParamsV1; | ||
| tags?: string[]; | ||
| }): Promise<SyncV2Result> => { | ||
| // 1. Setup | ||
| const syncContext = await setupSyncContext({ ctx, params }); | ||
|
|
@@ -63,6 +51,13 @@ export const syncV2 = async ({ | |
|
|
||
| // 4. Execute | ||
| await executeAutumnBillingPlan({ ctx, autumnBillingPlan }); | ||
| if ((autumnBillingPlan.customerLicenseUpdates?.length ?? 0) > 0) { | ||
|
Contributor
There was a problem hiding this comment. P1: Licensed syncs that replace the current product do not reconcile license state: those plans have inserted/expired customer products but no Prompt for AI agents |
||
| await reconcileLicenseStateForCustomer({ | ||
| ctx, | ||
| idOrInternalId: syncContext.customer_id, | ||
| deleteCache: true, | ||
| }); | ||
| } | ||
|
|
||
| // 5. Persist scheduled phases (only when sync produced more than one phase) | ||
| let scheduleId: string | null = null; | ||
|
|
@@ -79,14 +74,20 @@ export const syncV2 = async ({ | |
| scheduledPhases = persisted.insertedPhases; | ||
| } | ||
|
|
||
| void sendBillingUpdatedWebhook({ | ||
| ctx, | ||
| autumnBillingPlan, | ||
| originalFullCustomer: syncContext.fullCustomer, | ||
| tags, | ||
| }); | ||
|
|
||
| const customerProductUpdates = ( | ||
|
Comment on lines
+77
to
+84
Contributor
There was a problem hiding this comment.
Prompt To Fix With AIThis is a comment left during a code review.
Path: server/src/internal/billing/v2/actions/sync/syncV2.ts
Line: 77-84
Comment:
**Unconditional webhook now doubles events in `handleStripeSubscriptionUpdated`**
`syncV2` previously guarded `sendBillingUpdatedWebhook` behind an opt-in `webhook` param. The old code comment said explicitly: _"Webhook emission is opt-in via `webhook` so Stripe auto-sync callers (which already emit billing.updated from the originating action) don't double-send."_ That guard is now gone.
`handleStripeSubscriptionUpdated` calls `autoSyncUpdatedSubscription` (which runs `syncV2` → emits webhook #1 with `tags: ["sync:customer.subscription.updated"]`), then calls `emitBillingChangeWebhook` unconditionally at line 94. Whenever `expireRemovedCustomerProducts`, `syncCustomerProductStatus`, `handleStripeSubscriptionCanceled`, or `handleStripeSubscriptionRenewed` track any change into the event context, the second emission fires and customers receive two `billing.updated` events for one Stripe event. The same issue affects `autoSyncFromSubscription` (subscription.created path) which now also fires a webhook where it previously fired none.
How can I resolve this? If you propose a fix, please make it concise. |
||
| autumnBillingPlan.updateCustomerProducts ?? [] | ||
| ).concat( | ||
| autumnBillingPlan.updateCustomerProduct | ||
| ? [autumnBillingPlan.updateCustomerProduct] | ||
| : [], | ||
| ); | ||
|
|
||
| return { | ||
| customer_id: syncContext.customer_id, | ||
|
|
@@ -95,12 +96,8 @@ export const syncV2 = async ({ | |
| inserted_cus_product_ids: autumnBillingPlan.insertCustomerProducts.map( | ||
| (cp) => cp.id, | ||
| ), | ||
| expired_cus_product_ids: customerProductUpdates | ||
| .filter(({ updates }) => updates.status === CusProductStatus.Expired) | ||
| .map((u) => u.customerProduct.id), | ||
| schedule_id: scheduleId, | ||
| scheduled_phases: scheduledPhases, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
continueskips all product-level sync work when seat counts driftWhen
licenseQuantityChanges.length > 0for a product context, the loopcontinues before reaching theinitImmediateSyncCustomerProductpath.buildIncrementalSyncParamsguarantees these paths are mutually exclusive for DIFFERENT plans (product-id changed → early-return before seat check). However, both a seat drift AND a full-product re-sync can be needed for the same Autumn plan id in the version-upgrade case, since the gate inbuildIncrementalSyncParamscomparesproduct.id(public ID, stable across versions) notinternal_id. If a new product version with changed items is also accompanied by a Stripe seat-quantity change, the version upgrade would be silently skipped here.Prompt To Fix With AI