@saasicat/adapter-prisma 1.0.0-rc.4 → 1.0.0-rc.6

package/dist/.build-stamp

@@ -1 +1 @@
-c870e387e5f23920d793f7e6cb321855019d14ba30e46ff17bdc06444867ce6a
+529e89589dea5797242ccc83833f15705b7fbf7c056430280539f88b62f3d037

package/dist/index.cjs

@@ -4073,9 +4073,14 @@ var PrismaSubscriptionContractRepository = class {
       where: {
         id: contractId
       },
+      // A null status leaves the column alone: the contract keeps whatever
+      // it had — `active`, usually — and its new `effectiveUntil` is what
+      // takes it out of the active lookup once that moment arrives.
       data: {
         effectiveUntil: data.effectiveUntil,
-        status: data.status
+        ...data.status === null ? {} : {
+          status: data.status
+        }
       },
       include: {
         lineItems: true
@@ -4242,10 +4247,36 @@ var PrismaSubscriptionRepository = class {
   async countActiveByPlanKey(projectKey) {
     const db = this.db();
     const subscriptions = await this.subscriptions(db).findMany({
+      // Status alone answers the wrong question. A cancellation that has
+      // taken effect leaves the column at ACTIVE — nothing transitions it
+      // — so a plan's tenant count in the SuperAdmin UI would carry every
+      // customer who ever left.
+      //
+      // Three branches, because the effective date lives in two places.
+      // On a row written before the fields separated it is `canceledAt`
+      // and the second column is null; reading only the second excludes
+      // that customer on the day they DECLARE, months before they leave,
+      // and the migration guide promises no backfill is needed.
       where: {
         status: {
           in: ACTIVE_STATUSES
-        }
+        },
+        OR: [
+          {
+            canceledAt: null
+          },
+          {
+            canceledEffectiveAt: {
+              gt: /* @__PURE__ */ new Date()
+            }
+          },
+          {
+            canceledEffectiveAt: null,
+            canceledAt: {
+              gt: /* @__PURE__ */ new Date()
+            }
+          }
+        ]
       },
       select: {
         planVersionId: true
@@ -4334,6 +4365,12 @@ var PrismaSubscriptionRepository = class {
       pendingPlan: row.pendingPlan,
       pendingEffectiveAt: row.pendingEffectiveAt,
       customLimits: row.customLimits ?? null,
+      // Entitlement resolution ends a subscription by reading these. An
+      // adapter that leaves them out grants a subscription that ended
+      // last January everything it had — which is why the port requires
+      // them rather than defaulting them to null here.
+      canceledAt: row.canceledAt ?? null,
+      canceledEffectiveAt: row.canceledEffectiveAt ?? null,
       planVersionId: row.planVersionId,
       planVersion: {
         planId: planKey,
@@ -4479,6 +4516,13 @@ var PrismaSubscriptionUsageAdapter = class {
       startedAt: subscription.startedAt,
       currentPeriodStart: subscription.currentPeriodStart ?? null,
       currentPeriodEnd: subscription.currentPeriodEnd ?? null,
+      // Without these three the cancellation rules read a term that is
+      // always null and the tenant page shows a cancelled subscription as
+      // running: the fields exist on the record, the shipped adapter did
+      // not map them, and every consumer using it got the defaults.
+      minimumTermUntil: subscription.minimumTermUntil ?? null,
+      canceledAt: subscription.canceledAt ?? null,
+      canceledEffectiveAt: subscription.canceledEffectiveAt ?? null,
       pendingPlan: subscription.pendingPlan,
       pendingBillingCycle: subscription.pendingBillingCycle ?? null,
       pendingEffectiveAt: subscription.pendingEffectiveAt,
@@ -4670,35 +4714,46 @@ var PrismaTenantSubscriptionWriteAdapter = class {
       } : {}
     };
     if (this.schema.tenantSubscription.synchronizePlanVersion) {
-      const current = await subscription.findUnique({
+      const current2 = await subscription.findUnique({
         where: {
           tenantId
         }
       });
-      if (!current) {
+      if (!current2) {
         throw new Error(`No subscription for tenant ${tenantId}.`);
       }
       const storagePlanId = await this.planBinding.toStoragePlanId(client, input.planId);
       data.planVersionId = await this.findTargetPlanVersionId(client, storagePlanId, input.periodStart ?? /* @__PURE__ */ new Date());
-      if (await this.pendingVersionBelongsToAnotherPlan(client, current.pendingPlanVersionId, storagePlanId)) {
+      if (await this.pendingVersionBelongsToAnotherPlan(client, current2.pendingPlanVersionId, storagePlanId)) {
         Object.assign(data, clearedPendingVersionData());
       }
     }
-    const updated = await subscription.update({
+    const claim = await subscription.updateMany({
       where: {
-        tenantId
+        tenantId,
+        canceledAt: input.expectedCanceledAt
       },
       data
     });
+    const current = await subscription.findUnique({
+      where: {
+        tenantId
+      }
+    });
+    if (!current) {
+      throw new Error(`No subscription for tenant ${tenantId}.`);
+    }
     return {
-      plan: updated.plan,
-      billingCycle: updated.billingCycle
+      plan: current.plan,
+      billingCycle: current.billingCycle,
+      claimed: claim.count > 0
     };
   }
   async schedulePlanChange(tenantId, input) {
-    await this.subscription(this.prisma).update({
+    const claim = await this.subscription(this.prisma).updateMany({
       where: {
-        tenantId
+        tenantId,
+        canceledAt: input.expectedCanceledAt
       },
       data: {
         pendingPlan: input.pendingPlan,
@@ -4706,6 +4761,9 @@ var PrismaTenantSubscriptionWriteAdapter = class {
         pendingEffectiveAt: input.pendingEffectiveAt
       }
     });
+    return {
+      claimed: claim.count > 0
+    };
   }
   async acceptPendingPlanVersion(tenantId, userId, now) {
     const subscription = this.subscription(this.prisma);
@@ -4772,12 +4830,30 @@ var PrismaTenantSubscriptionWriteAdapter = class {
         const storagePlanId = await this.planBinding.toStoragePlanId(tx, input.planId);
         data.planVersionId = await this.findTargetPlanVersionId(tx, storagePlanId, input.periodStart ?? /* @__PURE__ */ new Date());
       }
-      const updated = await this.subscription(tx).update({
+      const claim = await this.subscription(tx).updateMany({
         where: {
-          tenantId
+          tenantId,
+          canceledAt: input.expectedCanceledAt
         },
         data
       });
+      const updated = await this.subscription(tx).findUnique({
+        where: {
+          tenantId
+        }
+      });
+      if (!updated) {
+        throw new Error(`No subscription for tenant ${tenantId}.`);
+      }
+      if (claim.count === 0) {
+        return {
+          plan: updated.plan,
+          billingCycle: updated.billingCycle,
+          subscriptionId: updated.id,
+          promoRedemption: null,
+          claimed: false
+        };
+      }
       let promoRedemption = null;
       if (redeemPromo) {
         promoRedemption = await redeemPromo(tx, updated.id);
@@ -4786,11 +4862,12 @@ var PrismaTenantSubscriptionWriteAdapter = class {
         plan: updated.plan,
         billingCycle: updated.billingCycle,
         subscriptionId: updated.id,
-        promoRedemption
+        promoRedemption,
+        claimed: true
       };
     });
   }
-  async cancelSubscription(tenantId, immediate, now) {
+  async cancelSubscription(tenantId, input) {
     const subscription = this.subscription(this.prisma);
     const sub = await subscription.findUnique({
       where: {
@@ -4800,19 +4877,38 @@ var PrismaTenantSubscriptionWriteAdapter = class {
     if (!sub) {
       throw new Error(`No subscription for tenant ${tenantId}.`);
     }
-    const canceledAt = immediate ? now : sub.currentPeriodEnd ?? now;
-    const updated = await subscription.update({
+    const claimed = await subscription.updateMany({
       where: {
-        tenantId
+        tenantId,
+        canceledAt: null,
+        canceledEffectiveAt: null
       },
       data: {
-        canceledAt,
-        status: immediate ? "CANCELED" : sub.status
+        canceledAt: input.canceledAt,
+        canceledEffectiveAt: input.effectiveAt,
+        // Absent means unchanged rather than null: an ordinary
+        // cancellation does not touch the commitment it was measured
+        // against, and writing the field on every call would erase a
+        // term that is still running.
+        ...input.minimumTermUntil ? {
+          minimumTermUntil: input.minimumTermUntil
+        } : {},
+        status: input.terminateNow ? "CANCELED" : sub.status
       }
     });
+    const current = await subscription.findUnique({
+      where: {
+        tenantId
+      }
+    });
+    if (!current) {
+      throw new Error(`No subscription for tenant ${tenantId}.`);
+    }
     return {
-      canceledAt: updated.canceledAt,
-      status: updated.status
+      canceledAt: current.canceledAt ?? null,
+      canceledEffectiveAt: current.canceledEffectiveAt ?? null,
+      status: current.status,
+      alreadyCanceled: claimed.count === 0
     };
   }
   subscription(client) {

package/dist/index.d.cts

@@ -24,6 +24,11 @@ interface SubscriptionRowLike {
     pilotEndsAt?: Date | null;
     currentPeriodStart?: Date | null;
     currentPeriodEnd?: Date | null;
+    /** End of what was committed to. Null on a trial or a pre-existing row. */
+    minimumTermUntil?: Date | null;
+    /** When a cancellation was declared, and when it lands. */
+    canceledAt?: Date | null;
+    canceledEffectiveAt?: Date | null;
     pendingBillingCycle?: string | null;
     pendingPlanVersionEffectiveAt?: Date | null;
     pendingPlanVersionAccepted?: boolean;
@@ -1190,9 +1195,12 @@ declare class PrismaTenantSubscriptionWriteAdapter implements TenantSubscription
     changePlanImmediate(tenantId: string, input: ImmediatePlanChangeInput): Promise<{
         plan: string;
         billingCycle: string;
+        claimed: boolean;
     }>;
     private changePlanImmediateInClient;
-    schedulePlanChange(tenantId: string, input: ScheduledPlanChangeInput): Promise<void>;
+    schedulePlanChange(tenantId: string, input: ScheduledPlanChangeInput): Promise<{
+        claimed: boolean;
+    }>;
     acceptPendingPlanVersion(tenantId: string, userId: string, now: Date): Promise<{
         accepted: boolean;
         acceptedAt: Date | null;
@@ -1200,9 +1208,16 @@ declare class PrismaTenantSubscriptionWriteAdapter implements TenantSubscription
         alreadyAccepted: boolean;
     }>;
     private applyOnboardingSelectionAtomic;
-    cancelSubscription(tenantId: string, immediate: boolean, now: Date): Promise<{
+    cancelSubscription(tenantId: string, input: {
+        canceledAt: Date;
+        effectiveAt: Date;
+        terminateNow: boolean;
+        minimumTermUntil?: Date;
+    }): Promise<{
         canceledAt: Date | null;
+        canceledEffectiveAt: Date | null;
         status: string;
+        alreadyCanceled: boolean;
     }>;
     private subscription;
     private planVersions;

package/dist/index.d.ts

@@ -24,6 +24,11 @@ interface SubscriptionRowLike {
     pilotEndsAt?: Date | null;
     currentPeriodStart?: Date | null;
     currentPeriodEnd?: Date | null;
+    /** End of what was committed to. Null on a trial or a pre-existing row. */
+    minimumTermUntil?: Date | null;
+    /** When a cancellation was declared, and when it lands. */
+    canceledAt?: Date | null;
+    canceledEffectiveAt?: Date | null;
     pendingBillingCycle?: string | null;
     pendingPlanVersionEffectiveAt?: Date | null;
     pendingPlanVersionAccepted?: boolean;
@@ -1190,9 +1195,12 @@ declare class PrismaTenantSubscriptionWriteAdapter implements TenantSubscription
     changePlanImmediate(tenantId: string, input: ImmediatePlanChangeInput): Promise<{
         plan: string;
         billingCycle: string;
+        claimed: boolean;
     }>;
     private changePlanImmediateInClient;
-    schedulePlanChange(tenantId: string, input: ScheduledPlanChangeInput): Promise<void>;
+    schedulePlanChange(tenantId: string, input: ScheduledPlanChangeInput): Promise<{
+        claimed: boolean;
+    }>;
     acceptPendingPlanVersion(tenantId: string, userId: string, now: Date): Promise<{
         accepted: boolean;
         acceptedAt: Date | null;
@@ -1200,9 +1208,16 @@ declare class PrismaTenantSubscriptionWriteAdapter implements TenantSubscription
         alreadyAccepted: boolean;
     }>;
     private applyOnboardingSelectionAtomic;
-    cancelSubscription(tenantId: string, immediate: boolean, now: Date): Promise<{
+    cancelSubscription(tenantId: string, input: {
+        canceledAt: Date;
+        effectiveAt: Date;
+        terminateNow: boolean;
+        minimumTermUntil?: Date;
+    }): Promise<{
         canceledAt: Date | null;
+        canceledEffectiveAt: Date | null;
         status: string;
+        alreadyCanceled: boolean;
     }>;
     private subscription;
     private planVersions;

package/dist/index.js

@@ -4012,9 +4012,14 @@ var PrismaSubscriptionContractRepository = class {
       where: {
         id: contractId
       },
+      // A null status leaves the column alone: the contract keeps whatever
+      // it had — `active`, usually — and its new `effectiveUntil` is what
+      // takes it out of the active lookup once that moment arrives.
       data: {
         effectiveUntil: data.effectiveUntil,
-        status: data.status
+        ...data.status === null ? {} : {
+          status: data.status
+        }
       },
       include: {
         lineItems: true
@@ -4181,10 +4186,36 @@ var PrismaSubscriptionRepository = class {
   async countActiveByPlanKey(projectKey) {
     const db = this.db();
     const subscriptions = await this.subscriptions(db).findMany({
+      // Status alone answers the wrong question. A cancellation that has
+      // taken effect leaves the column at ACTIVE — nothing transitions it
+      // — so a plan's tenant count in the SuperAdmin UI would carry every
+      // customer who ever left.
+      //
+      // Three branches, because the effective date lives in two places.
+      // On a row written before the fields separated it is `canceledAt`
+      // and the second column is null; reading only the second excludes
+      // that customer on the day they DECLARE, months before they leave,
+      // and the migration guide promises no backfill is needed.
       where: {
         status: {
           in: ACTIVE_STATUSES
-        }
+        },
+        OR: [
+          {
+            canceledAt: null
+          },
+          {
+            canceledEffectiveAt: {
+              gt: /* @__PURE__ */ new Date()
+            }
+          },
+          {
+            canceledEffectiveAt: null,
+            canceledAt: {
+              gt: /* @__PURE__ */ new Date()
+            }
+          }
+        ]
       },
       select: {
         planVersionId: true
@@ -4273,6 +4304,12 @@ var PrismaSubscriptionRepository = class {
       pendingPlan: row.pendingPlan,
       pendingEffectiveAt: row.pendingEffectiveAt,
       customLimits: row.customLimits ?? null,
+      // Entitlement resolution ends a subscription by reading these. An
+      // adapter that leaves them out grants a subscription that ended
+      // last January everything it had — which is why the port requires
+      // them rather than defaulting them to null here.
+      canceledAt: row.canceledAt ?? null,
+      canceledEffectiveAt: row.canceledEffectiveAt ?? null,
       planVersionId: row.planVersionId,
       planVersion: {
         planId: planKey,
@@ -4418,6 +4455,13 @@ var PrismaSubscriptionUsageAdapter = class {
       startedAt: subscription.startedAt,
       currentPeriodStart: subscription.currentPeriodStart ?? null,
       currentPeriodEnd: subscription.currentPeriodEnd ?? null,
+      // Without these three the cancellation rules read a term that is
+      // always null and the tenant page shows a cancelled subscription as
+      // running: the fields exist on the record, the shipped adapter did
+      // not map them, and every consumer using it got the defaults.
+      minimumTermUntil: subscription.minimumTermUntil ?? null,
+      canceledAt: subscription.canceledAt ?? null,
+      canceledEffectiveAt: subscription.canceledEffectiveAt ?? null,
       pendingPlan: subscription.pendingPlan,
       pendingBillingCycle: subscription.pendingBillingCycle ?? null,
       pendingEffectiveAt: subscription.pendingEffectiveAt,
@@ -4609,35 +4653,46 @@ var PrismaTenantSubscriptionWriteAdapter = class {
       } : {}
     };
     if (this.schema.tenantSubscription.synchronizePlanVersion) {
-      const current = await subscription.findUnique({
+      const current2 = await subscription.findUnique({
         where: {
           tenantId
         }
       });
-      if (!current) {
+      if (!current2) {
         throw new Error(`No subscription for tenant ${tenantId}.`);
       }
       const storagePlanId = await this.planBinding.toStoragePlanId(client, input.planId);
       data.planVersionId = await this.findTargetPlanVersionId(client, storagePlanId, input.periodStart ?? /* @__PURE__ */ new Date());
-      if (await this.pendingVersionBelongsToAnotherPlan(client, current.pendingPlanVersionId, storagePlanId)) {
+      if (await this.pendingVersionBelongsToAnotherPlan(client, current2.pendingPlanVersionId, storagePlanId)) {
         Object.assign(data, clearedPendingVersionData());
       }
     }
-    const updated = await subscription.update({
+    const claim = await subscription.updateMany({
       where: {
-        tenantId
+        tenantId,
+        canceledAt: input.expectedCanceledAt
       },
       data
     });
+    const current = await subscription.findUnique({
+      where: {
+        tenantId
+      }
+    });
+    if (!current) {
+      throw new Error(`No subscription for tenant ${tenantId}.`);
+    }
     return {
-      plan: updated.plan,
-      billingCycle: updated.billingCycle
+      plan: current.plan,
+      billingCycle: current.billingCycle,
+      claimed: claim.count > 0
     };
   }
   async schedulePlanChange(tenantId, input) {
-    await this.subscription(this.prisma).update({
+    const claim = await this.subscription(this.prisma).updateMany({
       where: {
-        tenantId
+        tenantId,
+        canceledAt: input.expectedCanceledAt
       },
       data: {
         pendingPlan: input.pendingPlan,
@@ -4645,6 +4700,9 @@ var PrismaTenantSubscriptionWriteAdapter = class {
         pendingEffectiveAt: input.pendingEffectiveAt
       }
     });
+    return {
+      claimed: claim.count > 0
+    };
   }
   async acceptPendingPlanVersion(tenantId, userId, now) {
     const subscription = this.subscription(this.prisma);
@@ -4711,12 +4769,30 @@ var PrismaTenantSubscriptionWriteAdapter = class {
         const storagePlanId = await this.planBinding.toStoragePlanId(tx, input.planId);
         data.planVersionId = await this.findTargetPlanVersionId(tx, storagePlanId, input.periodStart ?? /* @__PURE__ */ new Date());
       }
-      const updated = await this.subscription(tx).update({
+      const claim = await this.subscription(tx).updateMany({
         where: {
-          tenantId
+          tenantId,
+          canceledAt: input.expectedCanceledAt
         },
         data
       });
+      const updated = await this.subscription(tx).findUnique({
+        where: {
+          tenantId
+        }
+      });
+      if (!updated) {
+        throw new Error(`No subscription for tenant ${tenantId}.`);
+      }
+      if (claim.count === 0) {
+        return {
+          plan: updated.plan,
+          billingCycle: updated.billingCycle,
+          subscriptionId: updated.id,
+          promoRedemption: null,
+          claimed: false
+        };
+      }
       let promoRedemption = null;
       if (redeemPromo) {
         promoRedemption = await redeemPromo(tx, updated.id);
@@ -4725,11 +4801,12 @@ var PrismaTenantSubscriptionWriteAdapter = class {
         plan: updated.plan,
         billingCycle: updated.billingCycle,
         subscriptionId: updated.id,
-        promoRedemption
+        promoRedemption,
+        claimed: true
       };
     });
   }
-  async cancelSubscription(tenantId, immediate, now) {
+  async cancelSubscription(tenantId, input) {
     const subscription = this.subscription(this.prisma);
     const sub = await subscription.findUnique({
       where: {
@@ -4739,19 +4816,38 @@ var PrismaTenantSubscriptionWriteAdapter = class {
     if (!sub) {
       throw new Error(`No subscription for tenant ${tenantId}.`);
     }
-    const canceledAt = immediate ? now : sub.currentPeriodEnd ?? now;
-    const updated = await subscription.update({
+    const claimed = await subscription.updateMany({
       where: {
-        tenantId
+        tenantId,
+        canceledAt: null,
+        canceledEffectiveAt: null
       },
       data: {
-        canceledAt,
-        status: immediate ? "CANCELED" : sub.status
+        canceledAt: input.canceledAt,
+        canceledEffectiveAt: input.effectiveAt,
+        // Absent means unchanged rather than null: an ordinary
+        // cancellation does not touch the commitment it was measured
+        // against, and writing the field on every call would erase a
+        // term that is still running.
+        ...input.minimumTermUntil ? {
+          minimumTermUntil: input.minimumTermUntil
+        } : {},
+        status: input.terminateNow ? "CANCELED" : sub.status
       }
     });
+    const current = await subscription.findUnique({
+      where: {
+        tenantId
+      }
+    });
+    if (!current) {
+      throw new Error(`No subscription for tenant ${tenantId}.`);
+    }
     return {
-      canceledAt: updated.canceledAt,
-      status: updated.status
+      canceledAt: current.canceledAt ?? null,
+      canceledEffectiveAt: current.canceledEffectiveAt ?? null,
+      status: current.status,
+      alreadyCanceled: claimed.count === 0
     };
   }
   subscription(client) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saasicat/adapter-prisma",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.6",
   "description": "Prisma + PostgreSQL persistence for SaaSiCat: one standard bundle for core, catalog, entitlement, tenant billing, Admin resources and promo, plus individual adapters for custom compositions.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -23,7 +23,7 @@
     "dist"
   ],
   "dependencies": {
-    "@saasicat/core": "^1.0.0-rc.4"
+    "@saasicat/core": "^1.0.0-rc.6"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0"
@@ -35,8 +35,8 @@
     "@prisma/client": "^6.19.0",
     "tsup": "^8.0.0",
     "typescript": "^6.0.0",
-    "@saasicat/persistence-testing": "^1.0.0-rc.4",
-    "@saasicat/spec": "^1.0.0-rc.4"
+    "@saasicat/persistence-testing": "^1.0.0-rc.6",
+    "@saasicat/spec": "^1.0.0-rc.6"
   },
   "license": "PolyForm-Shield-1.0.0",
   "author": "Taci Uelker",