@b2y/ecommerce-common 1.0.0 → 1.0.2

package/.idea/ecommerce-common.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ecommerce-common.iml" filepath="$PROJECT_DIR$/.idea/ecommerce-common.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/dbconnection/Connect.js

@@ -9,6 +9,7 @@ const initializeModels = (sequelize) => {
   });
   const {
     Tenant,
+    TenantSettings,
     User,
     Customer,
     Address,

package/enum/EntityTypeEnum.js

@@ -4,7 +4,9 @@ const EntityTypeEnum = Object.freeze({
     CATEGORY: "Category",
     PRODUCT_VARIANT: "ProductVariant",
     BANNER: "Banner",
-    FEEDBACK:"Feedback"
+    FEEDBACK:"Feedback",
+    NOTIFICATION: 'Notification',
+    TENANT_SETTINGS: 'TenantSettings',
 });
 
 module.exports = EntityTypeEnum;

package/model/TenantSettings.js

@@ -0,0 +1,48 @@
+const { DataTypes } = require('sequelize');
+
+
+module.exports = (sequelize) => {
+    return sequelize.define('TenantSettings', {
+        TenantSettingID: {
+            type: DataTypes.UUID,
+            primaryKey: true,
+            allowNull: false,
+            defaultValue: DataTypes.UUIDV4
+        },
+        TenantID: {
+            type: DataTypes.UUID,
+            allowNull: false,
+            references: {
+                model: 'Tenant',
+                key: 'TenantID'
+            },
+            onDelete: 'CASCADE',
+            onUpdate: 'CASCADE'
+        },
+        ThemeColour:{
+            type:DataTypes.STRING,
+            allowNull: true
+        },
+        CreatedBy: {
+            type: DataTypes.UUID,
+            allowNull: false
+        },
+        CreatedAt: {
+            type: DataTypes.DATE,
+            allowNull: false,
+            defaultValue: DataTypes.NOW
+        },
+        UpdatedBy: {
+            type: DataTypes.UUID,
+            allowNull: false
+        },
+        UpdatedAt: {
+            type: DataTypes.DATE,
+            allowNull: false,
+            defaultValue: DataTypes.NOW
+        }
+    }, {
+        tableName: 'TenantSettings',
+        timestamps: false
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b2y/ecommerce-common",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "E-commerce common library",
   "main": "index.js",
   "scripts": {
@@ -10,8 +10,8 @@
     "type": "git",
     "url": "git+https://github.com/yuvakrishna29/ecommerce-common.git"
   },
-  "publishConfig": { 
-  "access": "public" 
+  "publishConfig": {
+    "access": "public"
   },
   "author": "Shikha",
   "license": "ISC",
@@ -19,9 +19,9 @@
     "url": "https://github.com/yuvakrishna29/ecommerce-common/issues"
   },
   "homepage": "https://github.com/yuvakrishna29/ecommerce-common#readme",
-  "dependencies": {
+  "peerDependencies": {
     "exceljs": "^4.4.0",
     "luxon": "^3.7.2",
-    "razorpay": "^2.9.6"
+    "sequelize": "^6.37.5"
   }
 }

package/utility/OrderTimeFilterUtil.js

@@ -83,4 +83,5 @@ class OrderTimeFilterUtil {
     }
    
 }
+module.exports = OrderTimeFilterUtil;
 

package/utility/QueryUtil.js

@@ -5,8 +5,20 @@ const DateUtil = require('../utility/DateUtil');
 const PaymentStatusEnum = require('../enum/PaymentStatusEnum');
 const PaymentTypeEnum = require('../enum/PaymentTypeEnum');
 const PaymentMethodEnum = require('../enum/PaymentMethodEnum');
+const {Sequelize} = require('sequelize');
 class QueryUtil {
-  static storeWhereClause(filters, tenantID, Sequelize, logger) {
+  static parseId(idParam) {
+      if (!idParam) return null;
+      if (Array.isArray(idParam))
+        return idParam.map((id) => id.toString().trim()).filter((id) => id);
+      return idParam
+        .toString()
+        .split(",")
+        .map((id) => id.trim())
+        .filter((id) => id);
+    };
+
+  static storeWhereClause(filters, tenantID, logger) {
     const { startDate, endDate, IsActive, searchText } = filters;
     let storeWhereClause = {};
     // Date range filter
@@ -48,10 +60,11 @@ class QueryUtil {
 
     return storeWhereClause;
   }
-  static orderWhereClause(filters, tenantID, Sequelize, logger) {
-    const { startDate, endDate, searchText, paymentStatus } = filters;
+  static orderWhereClause(filters, tenantID, logger) {
+    const { startDate, endDate, searchText, paymentStatus, storeId } = filters;
     let orderWhereClause = {};
     let paymentStatusWhere = {};
+    let storeWhereClause = {};
     if (tenantID) orderWhereClause.TenantID = tenantID;
     if (startDate && !DateUtil.isValidDate(startDate)) {
       logger.warn("invalid start date");
@@ -75,6 +88,10 @@ class QueryUtil {
       }
       paymentStatusWhere.PaymentStatusName = paymentStatus;
     }
+    if(storeId) {
+     const storeIDs = this.parseId(storeId);
+      storeWhereClause.StoreID = {[Sequelize.Op.in] : storeIDs}
+    }
     if (startDate && endDate) {
       orderWhereClause.OrderDate = {
         [Sequelize.Op.between]: [new Date(startDate), new Date(endDate)],
@@ -84,14 +101,15 @@ class QueryUtil {
     } else if (endDate) {
       orderWhereClause.OrderDate = { [Sequelize.Op.lte]: new Date(endDate) };
     }
-    return { orderWhereClause, includeWhere: { paymentStatusWhere } };
+    return { orderWhereClause, includeWhere: { paymentStatusWhere, storeWhereClause } };
   }
-  static paymentWhereClause(filters, tenantID, Sequelize, logger) {
+  static paymentWhereClause(filters, tenantID, logger) {
     const {
       paymentStatus,
       searchText,
       paymentType,
       paymentMethod,
+      storeId,
       startDate,
       endDate,
     } = filters;
@@ -99,6 +117,7 @@ class QueryUtil {
     let paymentStatusWhere = {};
     let paymentTypeWhere = {};
     let paymentMethodWhere = {};
+    let storeWhereClause = {};
     if (tenantID) paymentWhereClause.TenantID = tenantID;
     if (startDate && !DateUtil.isValidDate(startDate)) {
       logger.warn("invalid start date");
@@ -138,6 +157,10 @@ class QueryUtil {
       }
       paymentMethodWhere.PaymentMethodName = paymentMethod;
     }
+    if(storeId) {
+      const storeIDs = this.parseId(storeId);
+      storeWhereClause.StoreID = {[Sequelize.Op.in]: storeIDs}
+    }
     if (startDate && endDate) {
       paymentWhereClause.PaymentDate = {
         [Sequelize.Op.between]: [new Date(startDate), new Date(endDate)],
@@ -153,10 +176,11 @@ class QueryUtil {
         paymentStatusWhere,
         paymentMethodWhere,
         paymentTypeWhere,
+        storeWhereClause
       },
     };
   }
-  static customerWhereClause(filters, tenantID, Sequelize, logger) {
+  static customerWhereClause(filters, tenantID, logger) {
     const { searchText, startDate, endDate } = filters;
     let customerWhereClause = {};
     if (startDate && !DateUtil.isValidDate(startDate)) {
@@ -185,22 +209,13 @@ class QueryUtil {
     }
     return customerWhereClause;
   }
-  static productWhereClause(filters, tenantID, Sequelize, logger) {
-    const { brandId, categoryId, IsActive, searchText, startDate, endDate } =
+  static productWhereClause(filters, tenantID, logger) {
+    const { brandId, categoryId, storeId, IsActive, searchText, startDate, endDate } =
       filters;
     const brandWhere = {};
     const categoryWhere = {};
+    const storeWhere = {};
     const productWhereClause = {};
-    const parseIds = (idParam) => {
-      if (!idParam) return null;
-      if (Array.isArray(idParam))
-        return idParam.map((id) => id.toString().trim()).filter((id) => id);
-      return idParam
-        .toString()
-        .split(",")
-        .map((id) => id.trim())
-        .filter((id) => id);
-    };
     if (tenantID) {
       productWhereClause.TenantID = tenantID;
       brandWhere.TenantID = tenantID;
@@ -238,16 +253,20 @@ class QueryUtil {
       productWhereClause.IsActive = isActiveValue;
     }
     if (brandId) {
-      const brandIds = parseIds(brandId);
+      const brandIds = this.parseId(brandId);
       brandWhere.BrandID = { [Sequelize.Op.in]: brandIds };
     }
     if (categoryId) {
-      const categoryIds = parseIds(categoryId);
+      const categoryIds = this.parseId(categoryId);
       categoryWhere.CategoryID = { [Sequelize.Op.in]: categoryIds };
     }
+    if(storeId) {
+      const storeIds = this.parseId(storeId);
+      storeWhere.StoreID = { [Sequelize.Op.in]: storeIds };
+    }
     return {
       productWhereClause,
-      includeWhere: { brandWhere, categoryWhere },
+      includeWhere: { brandWhere, categoryWhere, storeWhere },
     };
   }
 

package/utility/Razorpay.js

@@ -1,8 +1,7 @@
-const Razorpay = require('razorpay');
 const crypto = require('crypto');
 const StatusMessage = require('../constants/StatusMessageConstants');
 class RazorpayUtil {
-    constructor(razorpayKeys, logger) {
+    constructor(razorpayKeys, logger, Razorpay) {
         this.logger = logger;
         this.instance = new Razorpay({
             key_id: razorpayKeys.keyId,