@b2y/ecommerce-common 1.3.2 → 1.3.4

package/controller/SubscriptionAbstractController.js

@@ -5,12 +5,21 @@ const AppUtil = require('../utility/AppUtil');
 const getAllSubscriptionPlans = (
   SubscriptionPlan,
   SubscriptionFeature,
+  TenantSubscription,
   logger,
 ) => {
   return async (req, res) => {
     const { pageNumber, pageSize } = req.query;
     const { limit, offset } = AppUtil.getPagination(pageNumber, pageSize);
+    const tenantId = req.user?.TenantID;
     try {
+      let tenantPlan = null;
+      if (tenantId !== null || tenantId !== undefined) {
+        tenantPlan = await TenantSubscription.findOne({
+          where: tenantId ? { TenantID: tenantId } : undefined,
+          attributes: ["SubscriptionPlanID", "Status"],
+        });
+      }
       const { rows, count } = await SubscriptionPlan.findAndCountAll({
         attributes: [
           "SubscriptionPlanID",
@@ -35,12 +44,35 @@ const getAllSubscriptionPlans = (
         offset,
         distinct: true,
       });
+      const formattedPlanFeatures = rows.map((plan) => {
+        let isCurrentPlan = null;
+        let currentPlanStatus = null;
+        if (tenantId) {
+          isCurrentPlan =
+            tenantPlan.SubscriptionPlanID === plan.SubscriptionPlanID;
+          currentPlanStatus = isCurrentPlan ? tenantPlan.Status : null;
+        }
+        return {
+          SubscriptionPlanID: plan.SubscriptionPlanID,
+          PlanName: plan.PlanName,
+          PlanCode: plan.PlanCode,
+          Price: AppUtil.trimDecimal(plan.Price),
+          BillingCycle: plan.BillingCycle,
+          Currency: plan.Currency,
+          TrialPeriodDays: plan.TrialPeriodDays,
+          IsActive: plan.IsActive,
+          SortOrder: plan.SortOrder,
+          isCurrentPlan,
+          currentPlanStatus,
+          Features: plan.Features,
+        };
+      });
       logger.debug("subscription plans fetched successfully");
       return AppUtil.generateResponse(
         200,
         StatusMessage.SUCCESS,
         null,
-        { rows, count, pageNumber, limit },
+        { rows: formattedPlanFeatures, count, pageNumber, limit },
         res,
       );
     } catch (error) {

package/dbconnection/Connect.js

@@ -177,10 +177,10 @@ const initializeModels = (sequelize) => {
     as: "AttributeValue",
   });
 
-  ProductVariant.hasOne(PackagingBox, {
+  ProductVariant.belongsTo(PackagingBox, {
     foreignKey: "PackagingBoxID",
     as: "PackagingBox"
-  })
+  });
 
   // Product and ProductGroup Association
   // Many-to-One

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b2y/ecommerce-common",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "E-commerce common library",
   "main": "index.js",
   "scripts": {