@goweekdays/core 2.11.0 → 2.11.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @goweekdays/core
 
+## 2.11.2
+
+### Patch Changes
+
+- d27a91f: Fix seat decrease billing logic in subscription service
+- 69837e4: Allow zero amount in subscription schema and fix promo calc
+
+## 2.11.1
+
+### Patch Changes
+
+- 86a2d45: Add skipProration option to computeFee function
+
 ## 2.11.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -901,7 +901,7 @@ declare function useSubscriptionService(): {
         promoCode?: string;
         org: string;
         plan: string;
-    }) => Promise<{
+    }, skipProration?: boolean) => Promise<{
         monthlyAmount: number;
         proratedAmount: number;
         subscriptionAmount: number;

package/dist/index.js

@@ -5446,7 +5446,7 @@ var schemaSubscribe = import_joi20.default.object({
 var schema2 = {
   seats: import_joi20.default.number().integer().min(1).required(),
   paidSeats: import_joi20.default.number().integer().min(0).required(),
-  amount: import_joi20.default.number().positive().required(),
+  amount: import_joi20.default.number().positive().required().allow(0),
   promoCode: import_joi20.default.string().optional().allow("", null),
   nextBillingDate: import_joi20.default.date().optional().allow("", null)
 };
@@ -8328,7 +8328,7 @@ function useSubscriptionService() {
     }
     return total;
   }
-  async function computeFee(value) {
+  async function computeFee(value, skipProration) {
     const { error } = schemaSubscriptionCompute.validate(value);
     if (error) {
       throw new import_utils44.BadRequestError(`Invalid subscription data: ${error.message}`);
@@ -8354,10 +8354,10 @@ function useSubscriptionService() {
     if (promo) {
       switch (promo.type) {
         case "fixed":
-          monthlyAmount = Math.max(plan.price - (promo.fixedRate ?? 0), 0) * value.seats;
+          monthlyAmount = Math.max(promo.fixedRate ?? 0, 0) * value.seats;
           break;
         case "flat":
-          monthlyAmount = Math.max(plan.price - (promo.flatRate ?? 0) / value.seats, 0) * value.seats;
+          monthlyAmount = Math.max((promo.flatRate ?? 0) / value.seats, 0) * value.seats;
           break;
         case "volume": {
           if (promo.tiers && promo.tiers.length > 0) {
@@ -8391,7 +8391,7 @@ function useSubscriptionService() {
         0,
         value.seats - existingSubscription.paidSeats
       );
-      if (additionalSeats > 0 && daysRemaining > 0 && daysElapsed > 0) {
+      if (additionalSeats > 0 && daysRemaining > 0 && daysElapsed > 0 && !skipProration) {
         let additionalSeatsAmount = 0;
         if (promo?.type === "volume" && promo.tiers && promo.tiers.length > 0) {
           additionalSeatsAmount = calculateVolumeTierAmount(
@@ -8419,14 +8419,17 @@ function useSubscriptionService() {
         proratedAmount = dailyRate * daysRemaining;
       }
     }
+    const isDecrease = existingSubscription && value.seats < existingSubscription.paidSeats;
     return {
       // The monthly fee for the next billing cycle
       monthlyAmount: Math.round(monthlyAmount * 100) / 100,
       // The prorated amount to charge now for mid-cycle seat additions
       proratedAmount: Math.round(proratedAmount * 100) / 100,
       // The new subscription.amount for updates
-      // If no proration (same day change), use monthlyAmount; otherwise add prorated to existing
-      subscriptionAmount: existingSubscription ? proratedAmount > 0 ? Math.round((existingSubscription.amount + proratedAmount) * 100) / 100 : Math.round(monthlyAmount * 100) / 100 : Math.round(monthlyAmount * 100) / 100,
+      // - Seat increase with proration: existing amount + prorated
+      // - Seat decrease: keep existing amount (decrease takes effect next cycle)
+      // - Same day change or no proration: use monthlyAmount
+      subscriptionAmount: existingSubscription ? proratedAmount > 0 ? Math.round((existingSubscription.amount + proratedAmount) * 100) / 100 : isDecrease ? Math.round(existingSubscription.amount * 100) / 100 : Math.round(monthlyAmount * 100) / 100 : Math.round(monthlyAmount * 100) / 100,
       currency: plan.currency
     };
   }
@@ -8537,9 +8540,12 @@ function useSubscriptionService() {
     if (!membership) {
       throw new import_utils44.BadRequestError("User is not a member of the organization.");
     }
-    const { subscriptionAmount, proratedAmount, currency } = await computeFee(
-      value
-    );
+    const { subscriptionAmount, proratedAmount, currency } = await computeFee({
+      seats: value.seats,
+      promoCode: value.promoCode ?? "",
+      plan: value.plan ?? "",
+      org: value.org
+    });
     const session = import_utils44.useAtlas.getClient()?.startSession();
     if (!session) {
       throw new import_utils44.InternalServerError("Unable to start database session.");
@@ -8614,12 +8620,15 @@ function useSubscriptionService() {
     if (!plan) {
       throw new import_utils44.BadRequestError("Plan not found.");
     }
-    const { subscriptionAmount, currency } = await computeFee({
-      seats: subscription.seats,
-      promoCode: value.promoCode ?? "",
-      plan: plan._id?.toString() ?? "",
-      org: value.org
-    });
+    const { subscriptionAmount, currency } = await computeFee(
+      {
+        seats: subscription.seats,
+        promoCode: value.promoCode ?? "",
+        plan: plan._id?.toString() ?? "",
+        org: value.org
+      },
+      true
+    );
     const session = import_utils44.useAtlas.getClient()?.startSession();
     if (!session) {
       throw new import_utils44.InternalServerError("Unable to start database session.");