@goweekdays/core 2.11.2 → 2.11.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/core
 
+## 2.11.4
+
+### Patch Changes
+
+- 2697ef3: Refactor subscription amount calculation logic
+
+## 2.11.3
+
+### Patch Changes
+
+- 2bb4eb2: Add orgName to subscription and refactor service logic
+
 ## 2.11.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -831,6 +831,7 @@ declare function usePlanController(): {
 type TSubscription = {
     _id?: ObjectId;
     org: string | ObjectId;
+    orgName?: string;
     seats: number;
     paidSeats: number;
     amount: number;

package/dist/index.js

@@ -5453,6 +5453,7 @@ var schema2 = {
 var schemaSubscription = import_joi20.default.object({
   ...schema2,
   org: import_joi20.default.string().hex().length(24).required(),
+  orgName: import_joi20.default.string().optional().allow("", null),
   currency: import_joi20.default.string().length(3).required(),
   billingCycle: import_joi20.default.string().valid("monthly", "yearly").required()
 });
@@ -5491,6 +5492,7 @@ function modelSubscription(data) {
   return {
     _id: data._id,
     org: data.org,
+    orgName: data.orgName ?? "",
     seats: data.seats,
     paidSeats: data.paidSeats,
     amount: data.amount,
@@ -8286,7 +8288,6 @@ function usePromoController() {
 // src/resources/subscription/subscription.service.ts
 function useSubscriptionService() {
   const {
-    getById,
     updateById,
     getByStatus,
     updateStatusById,
@@ -8420,16 +8421,25 @@ function useSubscriptionService() {
       }
     }
     const isDecrease = existingSubscription && value.seats < existingSubscription.paidSeats;
+    const isNoChange = existingSubscription && value.seats === existingSubscription.paidSeats;
+    const isIncrease = existingSubscription && value.seats > existingSubscription.paidSeats;
+    let subscriptionAmount;
+    if (!existingSubscription) {
+      subscriptionAmount = Math.round(monthlyAmount * 100) / 100;
+    } else if (proratedAmount > 0) {
+      subscriptionAmount = Math.round((existingSubscription.amount + proratedAmount) * 100) / 100;
+    } else if (isIncrease) {
+      subscriptionAmount = Math.round(monthlyAmount * 100) / 100;
+    } else {
+      subscriptionAmount = Math.round(existingSubscription.amount * 100) / 100;
+    }
     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
-      // - 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,
+      subscriptionAmount,
       currency: plan.currency
     };
   }
@@ -8438,34 +8448,38 @@ function useSubscriptionService() {
     if (error) {
       throw new import_utils44.BadRequestError(`Invalid subscription data: ${error.message}`);
     }
-    const existingSubscription = await getByOrg(value.org);
-    if (existingSubscription) {
-      throw new import_utils44.BadRequestError("Organization already has a subscription.");
-    }
-    const plan = await getPlanById(value.plan);
-    if (!plan) {
-      throw new import_utils44.BadRequestError("Plan not found.");
-    }
-    const userData = await getUserById(value.user);
-    if (!userData) {
-      throw new import_utils44.BadRequestError("User not found.");
-    }
-    const membership = await getMembershipByApp({
-      user: value.user,
-      org: value.org,
-      app: "org"
-    });
-    if (!membership) {
-      throw new import_utils44.BadRequestError("User is not a member of the organization.");
-    }
-    const nextBillingDate = /* @__PURE__ */ new Date();
-    nextBillingDate.setMonth(nextBillingDate.getMonth() + 1);
     const session = import_utils44.useAtlas.getClient()?.startSession();
     if (!session) {
       throw new import_utils44.InternalServerError("Unable to start database session.");
     }
     try {
       session.startTransaction();
+      const org = await getOrgById(value.org);
+      if (!org) {
+        throw new import_utils44.BadRequestError("Organization not found.");
+      }
+      const existingSubscription = await getByOrg(value.org);
+      if (existingSubscription) {
+        throw new import_utils44.BadRequestError("Organization already has a subscription.");
+      }
+      const plan = await getPlanById(value.plan);
+      if (!plan) {
+        throw new import_utils44.BadRequestError("Plan not found.");
+      }
+      const userData = await getUserById(value.user);
+      if (!userData) {
+        throw new import_utils44.BadRequestError("User not found.");
+      }
+      const membership = await getMembershipByApp({
+        user: value.user,
+        org: value.org,
+        app: "org"
+      });
+      if (!membership) {
+        throw new import_utils44.BadRequestError("User is not a member of the organization.");
+      }
+      const nextBillingDate = /* @__PURE__ */ new Date();
+      nextBillingDate.setMonth(nextBillingDate.getMonth() + 1);
       const { subscriptionAmount, currency } = await computeFee({
         seats: value.seats,
         promoCode: value.promoCode,
@@ -8475,6 +8489,7 @@ function useSubscriptionService() {
       const subId = await _add(
         {
           org: value.org,
+          orgName: org.name,
           seats: value.seats,
           paidSeats: value.seats,
           // Initial seats are considered "paid" for proration purposes
@@ -8519,42 +8534,44 @@ function useSubscriptionService() {
     if (error) {
       throw new import_utils44.BadRequestError(error.message);
     }
-    const subscription = await getByOrg(value.org);
-    if (!subscription) {
-      throw new import_utils44.BadRequestError("Subscription not found");
-    }
-    if (subscription.seats === value.seats) {
-      throw new import_utils44.BadRequestError(
-        "Failed to update subscription, no changes detected."
-      );
-    }
-    const userData = await getUserById(value.user);
-    if (!userData) {
-      throw new import_utils44.BadRequestError("User not found.");
-    }
-    const membership = await getMembershipByApp({
-      user: value.user,
-      org: value.org,
-      app: "org"
-    });
-    if (!membership) {
-      throw new import_utils44.BadRequestError("User is not a member of the organization.");
-    }
-    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.");
     }
-    const seatIncreased = value.seats > subscription.paidSeats;
-    const additionalSeats = value.seats - subscription.paidSeats;
-    const paidSeats = seatIncreased ? value.seats : subscription.paidSeats;
     try {
       session.startTransaction();
+      const subscription = await getByOrg(value.org);
+      if (!subscription) {
+        throw new import_utils44.BadRequestError("Subscription not found");
+      }
+      if (subscription.seats === value.seats) {
+        throw new import_utils44.BadRequestError(
+          "Failed to update subscription, no changes detected."
+        );
+      }
+      const userData = await getUserById(value.user);
+      if (!userData) {
+        throw new import_utils44.BadRequestError("User not found.");
+      }
+      const membership = await getMembershipByApp({
+        user: value.user,
+        org: value.org,
+        app: "org"
+      });
+      if (!membership) {
+        throw new import_utils44.BadRequestError("User is not a member of the organization.");
+      }
+      const { subscriptionAmount, proratedAmount, currency } = await computeFee(
+        {
+          seats: value.seats,
+          promoCode: value.promoCode ?? "",
+          plan: value.plan ?? "",
+          org: value.org
+        }
+      );
+      const seatIncreased = value.seats > subscription.paidSeats;
+      const additionalSeats = value.seats - subscription.paidSeats;
+      const paidSeats = seatIncreased ? value.seats : subscription.paidSeats;
       await updateById(
         subscription._id?.toString() ?? "",
         { seats: value.seats, amount: subscriptionAmount, paidSeats },
@@ -8588,53 +8605,53 @@ function useSubscriptionService() {
     if (error) {
       throw new import_utils44.BadRequestError(error.message);
     }
-    const subscription = await getByOrg(value.org);
-    if (!subscription) {
-      throw new import_utils44.BadRequestError("Subscription not found");
-    }
-    if (subscription.promoCode === value.promoCode) {
-      throw new import_utils44.BadRequestError(
-        "Failed to update subscription, no changes detected."
-      );
-    }
-    let promo = null;
-    if (value.promoCode) {
-      promo = await getPromoByCode(value.promoCode);
-      if (!promo) {
-        throw new import_utils44.BadRequestError("Promo code not found.");
-      }
-    }
-    const userData = await getUserById(value.user);
-    if (!userData) {
-      throw new import_utils44.BadRequestError("User not found.");
-    }
-    const membership = await getMembershipByApp({
-      user: value.user,
-      org: value.org,
-      app: "org"
-    });
-    if (!membership) {
-      throw new import_utils44.BadRequestError("User is not a member of the organization.");
-    }
-    const plan = await getDefaultPlan();
-    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
-      },
-      true
-    );
     const session = import_utils44.useAtlas.getClient()?.startSession();
     if (!session) {
       throw new import_utils44.InternalServerError("Unable to start database session.");
     }
     try {
       session.startTransaction();
+      const subscription = await getByOrg(value.org);
+      if (!subscription) {
+        throw new import_utils44.BadRequestError("Subscription not found");
+      }
+      if (subscription.promoCode === value.promoCode) {
+        throw new import_utils44.BadRequestError(
+          "Failed to update subscription, no changes detected."
+        );
+      }
+      let promo = null;
+      if (value.promoCode) {
+        promo = await getPromoByCode(value.promoCode);
+        if (!promo) {
+          throw new import_utils44.BadRequestError("Promo code not found.");
+        }
+      }
+      const userData = await getUserById(value.user);
+      if (!userData) {
+        throw new import_utils44.BadRequestError("User not found.");
+      }
+      const membership = await getMembershipByApp({
+        user: value.user,
+        org: value.org,
+        app: "org"
+      });
+      if (!membership) {
+        throw new import_utils44.BadRequestError("User is not a member of the organization.");
+      }
+      const plan = await getDefaultPlan();
+      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
+        },
+        true
+      );
       await updateById(
         subscription._id?.toString() ?? "",
         { promoCode: value.promoCode ?? "", amount: subscriptionAmount },