fix: Subscription active detarminer

bigcapitalhq · Aug 30, 2024 · 410c4ea · 410c4ea
1 parent ee2d8d3
commit 410c4ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/packages/server/src/api/middleware/SubscriptionMiddleware.ts b/packages/server/src/api/middleware/SubscriptionMiddleware.ts
@@ -2,7 +2,6 @@ import { Container } from 'typedi';
 import { Request, Response, NextFunction } from 'express';
 
 const SupportedMethods = ['POST', 'PUT'];
-const Excluded = [];
 
 export default (subscriptionSlug = 'main') =>
   async (req: Request, res: Response, next: NextFunction) => {
@@ -22,7 +21,10 @@ export default (subscriptionSlug = 'main') =>
         errors: [{ type: 'TENANT.HAS.NO.SUBSCRIPTION' }],
       });
     }
-    if (SupportedMethods.includes(req.method) && subscription.inactive()) {
+    const isMethodSupported = SupportedMethods.includes(req.method);
+    const isSubscriptionInactive = subscription.inactive();
+
+    if (isMethodSupported && isSubscriptionInactive) {
       return res.boom.badRequest(null, {
         errors: [{ type: 'ORGANIZATION.SUBSCRIPTION.INACTIVE' }],
       });

diff --git a/packages/server/src/system/models/Subscriptions/PlanSubscription.ts b/packages/server/src/system/models/Subscriptions/PlanSubscription.ts
@@ -84,15 +84,15 @@ export default class PlanSubscription extends mixin(SystemModel) {
 
       /**
        * Filter the failed payment.
-       * @param builder 
+       * @param builder
        */
       failedPayment(builder) {
         builder.where('payment_status', SubscriptionPaymentStatus.Failed);
       },
 
       /**
        * Filter the succeed payment.
-       * @param builder 
+       * @param builder
        */
       succeedPayment(builder) {
         builder.where('payment_status', SubscriptionPaymentStatus.Succeed);
@@ -136,14 +136,13 @@ export default class PlanSubscription extends mixin(SystemModel) {
 
   /**
    * Check if the subscription is active.
-   * Crtiria should be:
-   *  - During the trial period and NOT canceled.
-   *  - Not ended.
-   * 
+   * Crtiria should be active:
+   *  - During the trial period should NOT be canceled.
+   *  - Out of trial period should NOT be ended.
    * @return {Boolean}
    */
   public active() {
-    return this.onTrial() || !this.ended();
+    return this.onTrial() ? !this.canceled() : !this.ended();
   }
 
   /**