@meith/plugin-dues 0.31.0 → 0.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/plugin-dues",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "description": "Membership dues for a Meith board: Stripe-backed subscriptions as a contained plugin.",
   "license": "MIT",
   "repository": {
@@ -20,8 +20,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@meith/plugin-kit": "^0.31.0",
-    "@meith/theme-kit": "^0.31.0"
+    "@meith/plugin-kit": "^0.33.0",
+    "@meith/theme-kit": "^0.33.0"
   },
   "peerDependencies": {
     "react": "^19.2.0"

package/src/definition.tsx

@@ -57,7 +57,7 @@ export function createDues(input: DuesConfigInput = {}): PluginDefinition {
   return definePlugin({
     key: 'dues',
     name: 'Dues',
-    version: '0.31.0',
+    version: '0.33.0',
     description: en['dues.definition.description'].replace(
       '{label}',
       staticConfig.label.toLowerCase(),

package/src/entitlement.ts

@@ -5,7 +5,7 @@ import { moneyMatches } from './money'
 import { addBillingInterval, addDays, addPeriod, parsePeriod } from './period'
 import { clampGrantUntil, isLifetime, LIFETIME_END } from './plans'
 import {
-  countCodeRedemption,
+  consumeCodeReservation,
   extendMembership,
   flagMembership,
   insertLedger,
@@ -18,6 +18,7 @@ import {
   orderBySessionId,
   type PlanRow,
   planRowByKey,
+  releaseCodeReservation,
   setMembershipStatus,
   settleOrder,
 } from './store'
@@ -157,7 +158,7 @@ export async function settlePaidOrder(
     stripePaymentIntentId: info.paymentIntentId,
   })
 
-  if (order.codeId !== null) await countCodeRedemption(deps.data, order.codeId)
+  if (order.codeId !== null) await consumeCodeReservation(deps.data, order.id, order.codeId)
 
   if (order.buyerUserId !== order.recipientUserId && outcome === 'granted') {
     await tryNotify(deps, {
@@ -221,6 +222,7 @@ export async function applyInternalEvent(
       if (order === null) return 'unmatched-session'
       if (order.status === 'paid') return 'already-settled'
       await settleOrder(deps.data, order.id, { status: 'failed' })
+      if (order.codeId !== null) await releaseCodeReservation(deps.data, order.id)
       return 'order-failed'
     }
 
@@ -229,6 +231,7 @@ export async function applyInternalEvent(
       if (order === null) return 'unmatched-session'
       if (order.status !== 'created' && order.status !== 'pending') return 'already-settled'
       await settleOrder(deps.data, order.id, { status: 'cancelled' })
+      if (order.codeId !== null) await releaseCodeReservation(deps.data, order.id)
       return 'order-expired'
     }
 

package/src/handlers.ts

@@ -15,9 +15,11 @@ import {
   markEventProcessed,
   membershipById,
   recordEvent,
+  reserveCodeRedemption,
   saveCodeCoupon,
   saveStripeCustomer,
   setMembershipStatus,
+  settleOrder,
 } from './store'
 import { createStripeClient, type StripeClient, StripeError } from './stripe/client'
 import { parseEventEnvelope, toInternalEvent } from './stripe/events'
@@ -197,6 +199,19 @@ export async function handleCheckout(
     return back({ error: 'try-again', plan: plan.key })
   }
 
+  if (code !== null) {
+    const reserved = await reserveCodeRedemption(services.context.data, code.id, order.id)
+    if (!reserved) {
+      await settleOrder(services.context.data, order.id, { status: 'cancelled' })
+      return back({
+        error: 'code-exhausted',
+        plan: plan.key,
+        code: codeInput,
+        recipient: recipientInput,
+      })
+    }
+  }
+
   if (charge === 0 && plan.mode !== 'auto') {
     await settlePaidOrder(entitlementDeps(services), order, {
       amountTotal: 0,

package/src/schema.ts

@@ -150,4 +150,22 @@ export const DUES_MIGRATIONS: readonly PluginMigration[] = [
          on plugin_dues_plan (plan_key)`,
     ],
   },
+  {
+    id: '0005_code_reservations',
+    statements: [
+      `create table if not exists plugin_dues_code_reservation (
+         id         bigint generated by default as identity primary key,
+         code_id    bigint      not null,
+         order_id   bigint      not null,
+         status     text        not null default 'held',
+         created_at timestamptz not null default now(),
+         updated_at timestamptz not null default now()
+       )`,
+      `create unique index if not exists plugin_dues_code_reservation_order_key
+         on plugin_dues_code_reservation (order_id)`,
+      `create index if not exists plugin_dues_code_reservation_active_idx
+         on plugin_dues_code_reservation (code_id)
+         where status in ('held', 'consumed')`,
+    ],
+  },
 ]

package/src/store.ts

@@ -768,10 +768,96 @@ export async function saveCodeCoupon(
   )
 }
 
-export async function countCodeRedemption(data: PluginData, id: number): Promise<void> {
+export async function reserveCodeRedemption(
+  data: PluginData,
+  codeId: number,
+  orderId: number,
+): Promise<boolean> {
+  return data.tx(async (tx) => {
+    const locked = await tx.one(
+      `select max_redemptions from plugin_dues_code where id = $1 for update`,
+      [codeId],
+    )
+    if (locked === null) return false
+
+    const existing = await tx.one(
+      `select status from plugin_dues_code_reservation where order_id = $1`,
+      [orderId],
+    )
+    if (existing !== null) return String(existing.status) !== 'released'
+
+    const max =
+      locked.max_redemptions === null || locked.max_redemptions === undefined
+        ? null
+        : Number(locked.max_redemptions)
+    if (max !== null) {
+      const active = await tx.one(
+        `select count(*)::int as taken from plugin_dues_code_reservation
+          where code_id = $1 and status in ('held', 'consumed')`,
+        [codeId],
+      )
+      if (active !== null && Number(active.taken) >= max) return false
+    }
+
+    await tx.query(
+      `insert into plugin_dues_code_reservation (code_id, order_id)
+       values ($1, $2)
+       on conflict (order_id) do nothing`,
+      [codeId, orderId],
+    )
+    return true
+  })
+}
+
+export async function consumeCodeReservation(
+  data: PluginData,
+  orderId: number,
+  codeId: number,
+): Promise<void> {
+  await data.tx(async (tx) => {
+    const consumed = await tx.one(
+      `update plugin_dues_code_reservation
+          set status = 'consumed', updated_at = now()
+        where order_id = $1 and status = 'held'
+        returning code_id`,
+      [orderId],
+    )
+    if (consumed !== null) {
+      await tx.query(
+        `update plugin_dues_code set redeemed_count = redeemed_count + 1 where id = $1`,
+        [Number(consumed.code_id)],
+      )
+      return
+    }
+
+    const present = await tx.one(
+      `select id from plugin_dues_code_reservation where order_id = $1`,
+      [orderId],
+    )
+    if (present !== null) return
+
+    const recorded = await tx.one(
+      `insert into plugin_dues_code_reservation (code_id, order_id, status)
+       values ($1, $2, 'consumed')
+       on conflict (order_id) do nothing
+       returning id`,
+      [codeId, orderId],
+    )
+    if (recorded !== null) {
+      await tx.query(
+        `update plugin_dues_code set redeemed_count = redeemed_count + 1 where id = $1`,
+        [codeId],
+      )
+    }
+  })
+}
+
+export async function releaseCodeReservation(data: PluginData, orderId: number): Promise<void> {
   await data.query(
-    `update plugin_dues_code set redeemed_count = redeemed_count + 1 where id = $1`,
-    [id],
+    `update plugin_dues_code_reservation
+        set status = 'released', updated_at = now()
+      where order_id = $1 and status = 'held'`,
+    [orderId],
   )
 }
 

package/src/tasks.ts

@@ -9,6 +9,7 @@ import {
   markEventProcessed,
   membershipsPastPeriod,
   pendingOrdersOlderThan,
+  releaseCodeReservation,
   setMembershipStatus,
   settleOrder,
   unprocessedEvents,
@@ -61,6 +62,7 @@ export async function runReconcile(
   for (const order of await pendingOrdersOlderThan(deps.data, PENDING_AFTER_MINUTES, BATCH)) {
     if (order.stripeSessionId === null) {
       await settleOrder(deps.data, order.id, { status: 'cancelled' })
+      if (order.codeId !== null) await releaseCodeReservation(deps.data, order.id)
       ordersClosed += 1
       continue
     }
@@ -76,6 +78,7 @@ export async function runReconcile(
       ordersSettled += 1
     } else if (session.status === 'expired') {
       await settleOrder(deps.data, order.id, { status: 'cancelled' })
+      if (order.codeId !== null) await releaseCodeReservation(deps.data, order.id)
       ordersClosed += 1
     }
   }