@b2y/ecommerce-common 1.0.3 → 1.0.4

package/constants/StatusMessageConstants.js

@@ -11,9 +11,6 @@ const StatusMessageConstants = {
     INVALID_END_DATE: "Invalid endDate",
     INVALID_START_DATE: "Invalid startDate",
     INVALID_ISACTIVE_STATUS:  "IsActive must be either true or false",
-    PAYMENT_STATUS_INVALID: "PaymentStatus is invalid",
-    PAYMENT_TYPE_INVALID: "PaymentType is invalid",
-    PAYMENT_METHOD_INVALID: "PaymentMethod is invalid",
     ORDER_CREATION_FAILED:"Order creation failed",
     PAYMENT_SIGNATURE_VERIFICATION_FAILED:"Payment signature verification failed",
     PAYMENT_VERIFICATION_FAILED:"Payment verification failed"

package/model/Address.js

@@ -40,7 +40,7 @@ module.exports = (sequelize) => {
       allowNull: false,
     },
     StateCode: {
-      type:DataTypes.CHAR(3),
+      type:DataTypes.STRING(3),
       allowNull:false
     },
     CountryCode:{

package/model/Store.js

@@ -45,7 +45,7 @@ module.exports = (sequelize) => {
       allowNull:false
     },
     StateCode: {
-      type:DataTypes.CHAR(3),
+      type:DataTypes.STRING(3),
       allowNull:false
     },
     CityName: {

package/model/Tenant.js

@@ -55,7 +55,7 @@ module.exports = (sequelize) => {
       allowNull: false
     },
     StateCode: {
-      type: DataTypes.CHAR(3),
+      type: DataTypes.STRING(3),
       allowNull: false
     },
     CountryCode: {

package/model/User.js

@@ -70,7 +70,7 @@ module.exports = (sequelize) => {
       allowNull: false,
     },
     StateCode: {
-      type:DataTypes.CHAR(3),
+      type:DataTypes.STRING(3),
       allowNull:false
     },
     CountryCode:{

package/package.json

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

package/utility/QueryUtil.js

@@ -2,9 +2,6 @@
 const AppUtil = require('../utility/AppUtil');
 const StatusMessage = require('../constants/StatusMessageConstants');
 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 parseId(idParam) {
@@ -61,7 +58,7 @@ class QueryUtil {
     return storeWhereClause;
   }
   static orderWhereClause(filters, tenantID, logger) {
-    const { startDate, endDate, searchText, paymentStatus, storeId } = filters;
+    const { startDate, endDate, searchText, paymentStatusId, storeId } = filters;
     let orderWhereClause = {};
     let paymentStatusWhere = {};
     let storeWhereClause = {};
@@ -80,13 +77,9 @@ class QueryUtil {
         { "$Customer.FirstName$": { [Sequelize.Op.iLike]: `%${searchText}%` } },
       ];
     }
-    if (paymentStatus) {
-      const validPaymentStatus = new Set(Object.values(PaymentStatusEnum));
-      if (!validPaymentStatus.has(paymentStatus)) {
-        logger.warn("invalid payment status")
-        throw new Error(StatusMessage.INVALID_PAYMENT_STATUS);
-      }
-      paymentStatusWhere.PaymentStatusName = paymentStatus;
+    if (paymentStatusId) {
+      const paymentStatusIDs = this.parseId(paymentStatusId);
+      paymentStatusWhere.PaymentStatusID = {[Sequelize.Op.in] : paymentStatusIDs};
     }
     if(storeId) {
      const storeIDs = this.parseId(storeId);
@@ -105,10 +98,10 @@ class QueryUtil {
   }
   static paymentWhereClause(filters, tenantID, logger) {
     const {
-      paymentStatus,
+      paymentStatusId,
       searchText,
-      paymentType,
-      paymentMethod,
+      paymentTypeId,
+      paymentMethodId,
       storeId,
       startDate,
       endDate,
@@ -133,29 +126,17 @@ class QueryUtil {
         { PaymentRefID: { [Sequelize.Op.iLike]: `%${searchText}%` } },
       ];
     }
-    if (paymentStatus) {
-      const validPaymentStatus = new Set(Object.values(PaymentStatusEnum));
-      if (!validPaymentStatus.has(paymentStatus)) {
-        logger.warn("invalid payment status");
-        throw new Error(StatusMessage.PAYMENT_STATUS_INVALID);
-      }
-      paymentStatusWhere.PaymentStatusName = paymentStatus;
+    if (paymentStatusId) {
+      const paymentStatusIDs = this.parseId(paymentStatusId)
+      paymentStatusWhere.PaymentStatusID = {[Sequelize.Op.in] : paymentStatusIDs};
     }
-    if (paymentType) {
-      const validPaymentType = new Set(Object.values(PaymentTypeEnum));
-      if (!validPaymentType.has(paymentType)) {
-        logger.warn("invalid payment type");
-        throw new Error(StatusMessage.PAYMENT_TYPE_INVALID);
-      }
-      paymentTypeWhere.PaymentTypeName = paymentType;
+    if (paymentTypeId) {
+      const paymentTypeIDs = this.parseId(paymentTypeId)
+      paymentTypeWhere.PaymentTypeID = {[Sequelize.Op.in] : paymentTypeIDs};
     }
-    if (paymentMethod) {
-      const validPaymentMethod = new Set(Object.values(PaymentMethodEnum));
-      if (!validPaymentMethod.has(paymentMethod)) {
-        logger.warn("invalid payment method")
-        throw new Error(StatusMessage.PAYMENT_METHOD_INVALID);
-      }
-      paymentMethodWhere.PaymentMethodName = paymentMethod;
+    if (paymentMethodId) {
+      const paymentMethodIDs = this.parseId(paymentMethodId);
+      paymentMethodWhere.PaymentMethodID = {[Sequelize.Op.in] : paymentMethodIDs};
     }
     if(storeId) {
       const storeIDs = this.parseId(storeId);

package/.idea/ecommerce-common.iml

@@ -1,12 +0,0 @@
-<?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

@@ -1,8 +0,0 @@
-<?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

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