@goweekdays/core 2.11.13 → 2.11.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/core
 
+## 2.11.15
+
+### Patch Changes
+
+- dfa139d: Remove section comments from subscription.service.ts
+
+## 2.11.14
+
+### Patch Changes
+
+- 9fd2d52: Improve promo usage and subscription transaction handling
+
 ## 2.11.13
 
 ### Patch Changes

package/dist/index.d.ts

@@ -957,7 +957,7 @@ type TSubscriptionTransactionMetadata = {
     additionalSeats?: number;
     seats?: number;
     paidSeats?: number;
-    plan?: string;
+    plan?: string | ObjectId;
     promoCode?: string;
     nextPromoCode?: string;
     billingPeriodStart?: Date | string;

package/dist/index.js

@@ -6068,6 +6068,15 @@ function modelSubscriptionTransaction(data) {
       throw new import_utils29.BadRequestError("Invalid createdBy ID.");
     }
   }
+  if (data.metadata) {
+    if (data.metadata.plan && typeof data.metadata.plan === "string" && data.metadata.plan.length === 24) {
+      try {
+        data.metadata.plan = new import_mongodb17.ObjectId(data.metadata.plan);
+      } catch (error2) {
+        throw new import_utils29.BadRequestError("Invalid plan ID in metadata.");
+      }
+    }
+  }
   return {
     _id: data._id,
     subscription: data.subscription,
@@ -7878,7 +7887,7 @@ var schemaPromoUsage = import_joi34.default.object({
 function modelPromoUsage(value) {
   const { error } = schemaPromoUsage.validate(value);
   if (error) {
-    throw new Error(`Invalid Promo Usage model: ${error.message}`);
+    throw new import_utils40.BadRequestError(`Invalid Promo Usage model: ${error.message}`);
   }
   if (value._id && typeof value._id === "string") {
     try {
@@ -7961,6 +7970,9 @@ function usePromoUsageRepo() {
       delCachedData();
       return "Successfully added promo usage.";
     } catch (error) {
+      if (error instanceof import_utils41.AppError) {
+        throw error;
+      }
       throw new import_utils41.InternalServerError("Failed to add promo usage.");
     }
   }
@@ -8401,7 +8413,6 @@ function useSubscriptionService() {
   const { getById: getOrgById, updateStatusById: updateOrgStatusById } = useOrgRepo();
   const { getByCode: getPromoByCode } = usePromoRepo();
   const {
-    countByPromoId,
     add: addPromoUsage,
     updateStatusByOrgId: updatePromoUsageStatusByOrgId
   } = usePromoUsageRepo();
@@ -8516,7 +8527,7 @@ function useSubscriptionService() {
         "Cannot change promo code while increasing seats. Perform actions separately."
       );
     }
-    const effectivePromoCode = isPromoChange ? value.promoCode : existingSubscription?.promoCode;
+    const effectivePromoCode = isNew ? value.promoCode : isPromoChange ? value.promoCode : existingSubscription?.promoCode;
     const promo = effectivePromoCode ? await getPromoByCode(effectivePromoCode) : null;
     const monthlyAmount = computeMonthlyAmount(value.seats, plan.price, promo);
     let proratedAmount = 0;
@@ -8725,6 +8736,29 @@ function useSubscriptionService() {
           session
         );
       }
+      if (!seatIncreased) {
+        await addTransaction(
+          {
+            type: "remove-seat",
+            description: `Removed ${subscription.seats - value.seats} seats.`,
+            amount: 0,
+            currency,
+            subscription: subscription._id?.toString() ?? "",
+            createdBy: value.user,
+            createdByName: `${userData.firstName} ${userData.lastName}`,
+            metadata: {
+              seats: subscription.seats - value.seats,
+              paidSeats,
+              plan: value.plan ?? "",
+              promoCode: subscription.promoCode ?? "",
+              nextPromoCode: subscription.nextPromoCode ?? "",
+              billingPeriodStart: subscription.billingPeriodStart,
+              nextBillingDate: subscription.nextBillingDate
+            }
+          },
+          session
+        );
+      }
       await session.commitTransaction();
       return "Successfully updated subscription seats.";
     } catch (error2) {
@@ -8777,12 +8811,6 @@ 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
-      });
       await updateById(
         subscription._id?.toString() ?? "",
         { nextPromoCode: value.promoCode ?? "" },
@@ -8796,7 +8824,7 @@ function useSubscriptionService() {
           {
             promo: promo._id,
             org: value.org,
-            usedBy: value.user
+            usedBy: userData.email
           },
           session
         );
@@ -8901,9 +8929,11 @@ function useSubscriptionService() {
       }
       for (let index = 0; index < subscriptions.length; index++) {
         const subscription = subscriptions[index];
-        const today = /* @__PURE__ */ new Date();
-        const nextBillingDate = new Date(subscription.updatedAt ?? "");
-        if (nextBillingDate.getFullYear() === today.getFullYear() && nextBillingDate.getMonth() === today.getMonth() && nextBillingDate.getDate() === today.getDate() || subscription.retry && subscription.retry >= retry) {
+        const now = /* @__PURE__ */ new Date();
+        if (now < new Date(subscription.nextBillingDate)) {
+          continue;
+        }
+        if ((subscription.retry ?? 0) >= retry) {
           continue;
         }
         try {