The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.
TypeScript b2b-marketplacecomposable-commerceecommerceenterpriseheadless-commercemarketplacemedusamedusajsmulti-vendortypescript
feat: use time-based filtering in jobs and add idempotency guards in subscribers
vholik21dc1d76e6e5
diff --git a/packages/core-plugin/src/jobs/capture-check.ts b/packages/core-plugin/src/jobs/capture-check.tsindex b0f92cd4e..bc036265a 100644--- a/packages/core-plugin/src/jobs/capture-check.ts+++ b/packages/core-plugin/src/jobs/capture-check.ts@@ -84,6 +84,8 @@ export default async function captureCheckJob(container: MedusaContainer) {let offset = 0let emittedCount = 0+ const createdAfter = new Date(Date.now() - authWindowMs)+const workflow = getOrdersListWorkflow(container)while (true) {@@ -94,9 +96,7 @@ export default async function captureCheckJob(container: MedusaContainer) {filters: {is_draft_order: false,canceled_at: null,- metadata: {- $ne: { capture_requested: true },- }+ created_at: { $gte: createdAfter },},take: batchSize,skip: offset,@@ -119,6 +119,11 @@ export default async function captureCheckJob(container: MedusaContainer) {const orderIdsToUpdate: string[] = []for (const order of orders) {+ if (order.metadata?.capture_requested) {+ logger.debug(`Order ${order.id} - skipped, capture already requested`)+ continue+ }+if (order.payouts?.length) {logger.debug(`Order ${order.id} - skipped, has payouts`)continuediff --git a/packages/core-plugin/src/jobs/daily-payouts.ts b/packages/core-plugin/src/jobs/daily-payouts.tsindex c72560132..d444c41e7 100644--- a/packages/core-plugin/src/jobs/daily-payouts.ts+++ b/packages/core-plugin/src/jobs/daily-payouts.ts@@ -39,6 +39,8 @@ export default async function dailyPayoutsJob(container: MedusaContainer) {let offset = 0let emitted = 0+ const createdAfter = new Date(Date.now() - options.authorizationWindowMs)+const listWorkflow = getOrdersListWorkflow(container)while (true) {@@ -49,11 +51,7 @@ export default async function dailyPayoutsJob(container: MedusaContainer) {filters: {is_draft_order: false,canceled_at: null,- $and: [- { metadata: { captured: true } },- { metadata: { $ne: { payout_transferred: true } } },- { metadata: { $ne: { payout_failed: true } } },- ],+ created_at: { $gte: createdAfter },},take: BATCH_SIZE,skip: offset,@@ -75,6 +73,21 @@ export default async function dailyPayoutsJob(container: MedusaContainer) {const events: { name: string; data: Record<string, unknown> }[] = []for (const order of orders) {+ if (!order.metadata?.captured) {+ logger.debug(`Order ${order.id} - skipped, not captured`)+ continue+ }++ if (order.metadata?.payout_transferred) {+ logger.debug(`Order ${order.id} - skipped, payout already transferred`)+ continue+ }++ if (order.metadata?.payout_failed) {+ logger.debug(`Order ${order.id} - skipped, payout previously failed`)+ continue+ }+if (order.payouts?.length) {logger.debug(`Order ${order.id} - skipped, already has payouts`)continuediff --git a/packages/core-plugin/src/subscribers/capture-order.ts b/packages/core-plugin/src/subscribers/capture-order.tsindex 1ebe090a4..e692d5465 100644--- a/packages/core-plugin/src/subscribers/capture-order.ts+++ b/packages/core-plugin/src/subscribers/capture-order.ts@@ -24,6 +24,7 @@ export default async function captureOrderHandler({entity: "order",fields: ["id",+ "metadata","payment_collections.payments.id","payment_collections.payments.captured_at",],@@ -39,6 +40,16 @@ export default async function captureOrderHandler({return}+ if (order.metadata?.captured) {+ logger.warn(`Order ${data.order_id} - skipped, already captured`)+ return+ }++ if (order.metadata?.capture_failed) {+ logger.warn(`Order ${data.order_id} - skipped, capture previously failed`)+ return+ }+const payments = order.payment_collections?.flatMap((pc: PaymentCollectionDTO) => pc.payments ?? [])diff --git a/packages/core-plugin/src/subscribers/order-payout.ts b/packages/core-plugin/src/subscribers/order-payout.tsindex ca10dd84c..ca44165c6 100644--- a/packages/core-plugin/src/subscribers/order-payout.ts+++ b/packages/core-plugin/src/subscribers/order-payout.ts@@ -21,7 +21,7 @@ export default async function orderPayoutHandler({const { data: orders } = await query.graph({entity: "order",- fields: ["id", "payouts.id"],+ fields: ["id", "metadata", "payouts.id"],filters: { id: data.order_id },})@@ -37,6 +37,21 @@ export default async function orderPayoutHandler({return}+ if (!order.metadata?.captured) {+ logger.warn(`Order ${data.order_id} - skipped, not captured`)+ return+ }++ if (order.metadata?.payout_transferred) {+ logger.warn(`Order ${data.order_id} - skipped, payout already transferred`)+ return+ }++ if (order.metadata?.payout_failed) {+ logger.warn(`Order ${data.order_id} - skipped, payout previously failed`)+ return+ }+try {await createPayoutWorkflow(container).run({input: {@@ -53,7 +68,7 @@ export default async function orderPayoutHandler({logger.info(`Payout successfully - order ${data.order_id}`)} catch (error) {logger.error(- `Failed to create payout - order ${data.order_id} - ${error}`+ `Failed to create payout - order ${data.order_id}`, error)await orderModule.updateOrders(data.order_id, {