@b2y/ecommerce-common 1.0.9 → 1.1.0

package/enum/AccessModeEnum.js

@@ -1,7 +1,8 @@
 const AccessModeEnum = Object.freeze({
   FULL: "Full",
   READ_ONLY: "Read Only",
-  BLOCKED: "Blocked"
+  BLOCKED: "Blocked",
+  PAYMENT_REQUIRED: "Payment Required"
 });
 
 module.exports = AccessModeEnum;

package/enum/BillingCycleEnum.js

@@ -0,0 +1,6 @@
+const BillingCycleEnum = Object.freeze({
+  MONTHLY: "Monthly",
+  YEARLY: "Yearly"
+});
+
+module.exports = BillingCycleEnum;

package/enum/FeatureTypeEnum.js

@@ -0,0 +1,7 @@
+const FeatureTypeEnum = Object.freeze({
+  BOOLEAN: "Boolean",
+  LIMIT: "Limit",
+  METERED: "Metered"
+});
+
+module.exports = FeatureTypeEnum;

package/model/SubscriptionFeature.js

@@ -1,5 +1,5 @@
 const { DataTypes } = require('sequelize');
-
+const FeatureTypeEnum = require('../enum/FeatureTypeEnum');
 module.exports = (sequelize) => {
   return sequelize.define(
     "SubscriptionFeature",
@@ -20,7 +20,7 @@ module.exports = (sequelize) => {
         unique: true,
       },
       FeatureType: {
-        type: DataTypes.STRING(20),
+        type: DataTypes.ENUM(...Object.values(FeatureTypeEnum)),
         allowNull: false,
       },
       CreatedBy: {

package/model/SubscriptionPlan.js

@@ -1,5 +1,5 @@
 const { DataTypes } = require('sequelize');
-
+const BillingCycleEnum = require('../enum/BillingCycleEnum');
 module.exports = (sequelize) => {
   return sequelize.define(
     "SubscriptionPlan",
@@ -24,13 +24,18 @@ module.exports = (sequelize) => {
         allowNull: false,
       },
       BillingCycle: {
-        type: DataTypes.STRING(20),
+        type: DataTypes.ENUM(...Object.values(BillingCycleEnum)),
         allowNull: false,
       },
       Currency: {
         type: DataTypes.STRING(10),
         allowNull: false,
       },
+      TrialPeriodDays: {
+       type: DataTypes.INTEGER,
+       allowNull: false,
+       defaultValue: 0
+      },
       IsActive: {
         type: DataTypes.BOOLEAN,
         defaultValue: true,

package/model/TenantSubscription.js

@@ -1,5 +1,5 @@
 const { DataTypes } = require('sequelize');
-
+const SubscriptionStatusEnum = require('../enum/SubscriptionStatusEnum');
 module.exports = (sequelize) => {
   return sequelize.define(
     "TenantSubscription",
@@ -19,27 +19,33 @@ module.exports = (sequelize) => {
         allowNull: false,
       },
       Status: {
-        type: DataTypes.STRING(20),
+        type: DataTypes.ENUM(...Object.values(SubscriptionStatusEnum)),
         allowNull: false,
       },
       StartDate: {
         type: DataTypes.DATE,
-        allowNull: false,
-        defaultValue: DataTypes.NOW,
+        allowNull: false
       },
       EndDate: {
         type: DataTypes.DATE,
         allowNull: false,
-        defaultValue: DataTypes.NOW,
       },
       GraceEndDate: {
         type: DataTypes.DATE,
+        allowNull: true,
+      },
+      TrialEndDate: {
+        type: DataTypes.DATE,
+        allowNull: true
+      },
+      IsTrial: {
+        type: DataTypes.BOOLEAN,
         allowNull: false,
-        defaultValue: DataTypes.NOW,
+        defaultValue: false
       },
       AutoRenew: {
         type: DataTypes.BOOLEAN,
-        defaultValue: true,
+        defaultValue: false,
       },
       CreatedBy: {
         type: DataTypes.UUID,

package/package.json

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

package/utility/QueryUtil.js

@@ -51,7 +51,7 @@ class QueryUtil {
         { StoreName: { [Sequelize.Op.iLike]: `%${searchText}%` } },
         { AddressLine1: { [Sequelize.Op.iLike]: `%${searchText}%` } },
         { AddressLine2: { [Sequelize.Op.iLike]: `%${searchText}%` } },
-        { "$City.CityName$": { [Sequelize.Op.iLike]: `%${searchText}%` } },
+        { CityName: { [Sequelize.Op.iLike]: `%${searchText}%` } },
       ];
     }
 

package/utility/ResolveAccessMode.js

@@ -5,21 +5,35 @@ function ResolveAccessMode(subscription) {
  
   if (!subscription) return AccessModeEnum.BLOCKED; 
  
-  if (Object.values(SubscriptionStatusEnum).includes(subscription.Status)) { 
+  if ([SubscriptionStatusEnum.CANCELLED, SubscriptionStatusEnum.EXPIRED, SubscriptionStatusEnum.SUSPENDED].includes(subscription.Status)) { 
     return AccessModeEnum.BLOCKED; 
   } 
- 
-  if (now <= new Date(subscription.EndDate)) { 
-    return AccessModeEnum.FULL; 
-  } 
- 
-  if ( 
-    subscription.GraceEndDate && 
-    now <= new Date(subscription.GraceEndDate) 
-  ) { 
-    return AccessModeEnum.READ_ONLY; 
-  } 
- 
+
+  if (subscription.Status === SubscriptionStatusEnum.ACTIVE) {
+    if (subscription.IsTrial === true) {
+      const trialEndDate = subscription.TrialEndDate
+        ? new Date(subscription.TrialEndDate)
+        : null;
+      if (trialEndDate && now < trialEndDate) {
+        return AccessModeEnum.FULL;
+      }
+      return AccessModeEnum.PAYMENT_REQUIRED;
+    }
+    const endDate = new Date(subscription.EndDate);
+    const graceEndDate = subscription.GraceEndDate
+      ? new Date(subscription.GraceEndDate)
+      : null;
+    // Still in the paid period
+    if (now < endDate) {
+      return AccessModeEnum.FULL;
+    }
+    // Past EndDate, but within Grace Period
+    if (graceEndDate && now <= graceEndDate) {
+      return AccessModeEnum.READ_ONLY;
+    }
+    // Past both EndDate and Grace Period
+    return AccessModeEnum.BLOCKED;
+  }
   return AccessModeEnum.BLOCKED; 
 }; 
 module.exports = ResolveAccessMode;