@b2y/ecommerce-common 1.0.2 → 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/dbconnection/Connect.js

@@ -13,9 +13,6 @@ const initializeModels = (sequelize) => {
     User,
     Customer,
     Address,
-    City,
-    State,
-    Country,
     Product,
     ProductVariant,
     Category,
@@ -60,31 +57,7 @@ const initializeModels = (sequelize) => {
     as: "parentCategory",
   });
 
-  User.belongsTo(City, {
-    foreignKey: "CityID",
-    as: "City", // Alias for the association
-  });
-
-  // User associations
-  User.belongsTo(State, {
-    foreignKey: "StateID",
-    as: "State", // Alias for the association
-  });
-
-  User.belongsTo(Country, {
-    foreignKey: "CountryID",
-    as: "Country", // Alias for the association
-  });
-
-  // In Store model
-  Store.belongsTo(City, { foreignKey: "CityID", as: "City" });
-
-  // In Store model
-  Store.belongsTo(State, { foreignKey: "StateID", as: "State" });
-
-  // Store.js
-  Store.belongsTo(Country, { foreignKey: "CountryID", as: "Country" });
-
+  
   Store.belongsToMany(User, {
     through: StoreUserMapping,
     foreignKey: "StoreID",
@@ -131,17 +104,6 @@ const initializeModels = (sequelize) => {
   Address.belongsTo(Customer, { foreignKey: "CustomerID", as: "Customer" });
   Customer.hasMany(Address, { foreignKey: "CustomerID", as: "Address" });
 
-  // Address belongs to City
-  Address.belongsTo(City, { foreignKey: "CityID", as: "City" });
-  City.hasMany(Address, { foreignKey: "CityID", as: "Address" });
-
-  // Address belongs to State
-  Address.belongsTo(State, { foreignKey: "StateID", as: "State" });
-  State.hasMany(Address, { foreignKey: "StateID", as: "Address" });
-
-  // Address belongs to Country
-  Address.belongsTo(Country, { foreignKey: "CountryID", as: "Country" });
-  Country.hasMany(Address, { foreignKey: "CountryID", as: "Address" });
 
   /*---- product related associations -----*/
   // Product and ProductVariant Associations

package/model/Address.js

@@ -35,38 +35,20 @@ module.exports = (sequelize) => {
     AddressLine2: {
       type: DataTypes.STRING(255)
     },
-    CityID: {
-      type: DataTypes.INTEGER,
+    CityName: {
+      type: DataTypes.STRING(100),
       allowNull: false,
-      references: {
-        model: 'City',
-        key: 'CityID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
     },
-    StateID: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: 'State',
-        key: 'StateID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
+    StateCode: {
+      type:DataTypes.STRING(3),
+      allowNull:false
     },
-    CountryID: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: 'Country',
-        key: 'CountryID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
+    CountryCode:{
+      type:DataTypes.CHAR(2),
+      allowNull:false
     },
     Zipcode: {
-      type: DataTypes.STRING(10),
+      type: DataTypes.STRING(20),
       allowNull: false
     },
     AddressType: {

package/model/Customer.js

@@ -34,7 +34,7 @@ module.exports = (sequelize) => {
     Password: {
       type: DataTypes.STRING(255)
     },
-    CountryCode: {
+    CountryCallingCode: {
       type: DataTypes.STRING(5),
       allowNull: false
     },
@@ -88,7 +88,7 @@ module.exports = (sequelize) => {
       {
         name: "UQ_Customer_Tenant_Phone",
         unique: true,
-        fields: ["TenantID", "CountryCode", "PhoneNumber"],
+        fields: ["TenantID", "CountryCallingCode", "PhoneNumber"],
       },
     ],
   });

package/model/Order.js

@@ -55,7 +55,7 @@ module.exports = (sequelize) => {
       type: DataTypes.STRING(255),
       allowNull: false
     },
-    CountryCode: {
+    CountryCallingCode: {
       type: DataTypes.STRING(5),
       allowNull: false
     },

package/model/Store.js

@@ -25,7 +25,7 @@ module.exports = (sequelize) => {
       type: DataTypes.STRING(100),
       allowNull: false,
     },
-    CountryCode: {
+    CountryCallingCode: {
       type: DataTypes.STRING(5),
       allowNull: false
     },
@@ -40,38 +40,20 @@ module.exports = (sequelize) => {
     AddressLine2: {
       type: DataTypes.STRING(255),
     },
-    CountryID: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: 'Country',
-        key: 'CountryID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
+    CountryCode:{
+      type:DataTypes.CHAR(2),
+      allowNull:false
     },
-    StateID: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: 'State',
-        key: 'StateID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
+    StateCode: {
+      type:DataTypes.STRING(3),
+      allowNull:false
     },
-    CityID: {
-      type: DataTypes.INTEGER,
+    CityName: {
+      type: DataTypes.STRING(100),
       allowNull: false,
-      references: {
-        model: 'City',
-        key: 'CityID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
     },
     Zipcode: {
-      type: DataTypes.STRING(10),
+      type: DataTypes.STRING(20),
       allowNull: false,
     },
     IsActive: {
@@ -106,7 +88,7 @@ module.exports = (sequelize) => {
       {
         name: "UQ_Store_Tenant_Phone",
         unique: true,
-        fields: ["TenantID", "CountryCode", "PhoneNumber"],
+        fields: ["TenantID", "CountryCallingCode", "PhoneNumber"],
       },
     ],
   });

package/model/Tenant.js

@@ -28,7 +28,7 @@ module.exports = (sequelize) => {
       allowNull: false,
       unique: true
     },
-    CountryCode: {
+    CountryCallingCode: {
       type: DataTypes.STRING(5),
       allowNull: false
     },
@@ -50,20 +50,20 @@ module.exports = (sequelize) => {
       type: DataTypes.STRING(500),
       allowNull: false
     },
-    City: {
+    CityName: {
       type: DataTypes.STRING(100),
       allowNull: false
     },
-    State: {
-      type: DataTypes.STRING(100),
+    StateCode: {
+      type: DataTypes.STRING(3),
       allowNull: false
     },
-    Country: {
-      type: DataTypes.STRING(100),
+    CountryCode: {
+      type: DataTypes.CHAR(2),
       allowNull: false
     },
     Zipcode: {
-      type: DataTypes.STRING(10),
+      type: DataTypes.STRING(20),
       allowNull: false
     },
     CreatedBy: {

package/model/User.js

@@ -39,7 +39,7 @@ module.exports = (sequelize) => {
       type: DataTypes.STRING(255),
       allowNull: false
     },
-    CountryCode: {
+    CountryCallingCode: {
       type: DataTypes.STRING(5),
       allowNull: false
     },
@@ -65,38 +65,20 @@ module.exports = (sequelize) => {
       type: DataTypes.STRING(500),
       allowNull: false
     },
-    CityID: {
-      type: DataTypes.INTEGER,
+    CityName: {
+      type: DataTypes.STRING(100),
       allowNull: false,
-      references: {
-        model: 'City',
-        key: 'CityID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
     },
-    StateID: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: 'State',
-        key: 'StateID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
+    StateCode: {
+      type:DataTypes.STRING(3),
+      allowNull:false
     },
-    CountryID: {
-      type: DataTypes.INTEGER,
-      allowNull: false,
-      references: {
-        model: 'Country',
-        key: 'CountryID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
+    CountryCode:{
+      type:DataTypes.CHAR(2),
+      allowNull:false
     },
     Zipcode: {
-      type: DataTypes.STRING(10),
+      type: DataTypes.STRING(20),
       allowNull: false
     },
     OTP: {
@@ -141,7 +123,7 @@ module.exports = (sequelize) => {
       {
         name: "UQ_User_Tenant_Phone",
         unique: true,
-        fields: ["TenantID", "CountryCode", "PhoneNumber"],
+        fields: ["TenantID", "CountryCallingCode", "PhoneNumber"],
       },
     ],
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b2y/ecommerce-common",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "E-commerce common library",
   "main": "index.js",
   "scripts": {
@@ -22,6 +22,7 @@
   "peerDependencies": {
     "exceljs": "^4.4.0",
     "luxon": "^3.7.2",
-    "sequelize": "^6.37.5"
+    "sequelize": "^6.37.5",
+    "@countrystatecity/countries": "^1.0.4"
   }
 }

package/utility/LocationUtility.js

@@ -0,0 +1,131 @@
+const { getCountries, getStatesOfCountry, getCitiesOfState } = require('@countrystatecity/countries');
+
+// Helper to resolve country and state names from codes
+async function resolveCountryAndState(countryCode, stateCode, logger) {
+  // eslint-disable-next-line no-useless-catch
+  try {
+    const trimmedCountry = countryCode ? String(countryCode).trim() : "";
+    const trimmedState = stateCode ? String(stateCode).trim() : "";
+
+    let countryName = trimmedCountry;
+    let stateName = trimmedState;
+
+    if (trimmedCountry) {
+      try {
+        const countries = await getCountries();
+        const country = countries.find(
+          (c) =>
+            c.iso2 === trimmedCountry || c.iso2 === trimmedCountry.toUpperCase()
+        );
+        if (country) countryName = country.name;
+      } catch (err) {
+        logger.error("Error resolving country name:", err);
+      }
+    }
+
+    if (trimmedState) {
+      try {
+        const states = await getStatesOfCountry(trimmedCountry);
+        const state = states.find(
+          (s) =>
+            s.iso2 === trimmedState ||
+            s.state_code === trimmedState ||
+            s.state_code === trimmedState.toUpperCase()
+        );
+        if (state) stateName = state.name;
+      } catch (err) {
+        logger.error("Error resolving state name:", err);
+      }
+    }
+
+    return { countryName, stateName };
+  } catch (err) {
+    throw err;
+  }
+}
+
+// Helper to validate country and state codes
+async function validateCountryAndState(countryCode, stateCode, cityName, countryCallingCode, logger) {
+  try {
+    const trimmedCountryCode = countryCode ? String(countryCode).trim() : "";
+    const trimmedStateCode = stateCode ? String(stateCode).trim() : "";
+    const trimmedCityName = cityName ? cityName.trim().toLowerCase() : "";
+    const trimmedCountryCallingCode = countryCallingCode ? countryCallingCode.replace('+', '').trim() : "";
+    // Validate country code exists
+    if (trimmedCountryCode) {
+      const countries = await getCountries();
+      const validCountry = countries.find(
+        (c) =>
+          c.iso2 === trimmedCountryCode ||
+          c.iso2 === trimmedCountryCode.toUpperCase()
+      );
+
+      if (!validCountry) {
+        return {
+          isValid: false,
+          error: `Invalid country code: ${countryCode}`,
+        };
+      }
+
+      // Validate state code if provided
+      if (trimmedStateCode) {
+        const states = await getStatesOfCountry(trimmedCountryCode);
+        const validState = states.find(
+          (s) =>
+            s.iso2 === trimmedStateCode ||
+            s.state_code === trimmedStateCode ||
+            s.state_code === trimmedStateCode.toUpperCase()
+        );
+
+        if (!validState) {
+          return {
+            isValid: false,
+            error: `Invalid state code: ${stateCode} for country: ${countryCode}`,
+          };
+        }
+      }
+      if (trimmedCityName) {
+        const cities = await getCitiesOfState(
+          trimmedCountryCode,
+          trimmedStateCode
+        );
+        const cityFound = cities.some(
+          (city) => city.name.trim().toLowerCase() === trimmedCityName
+        );
+        if (!cityFound) {
+          return {
+            isValid: false,
+            error: `Invalid city name for state code ${stateCode}  and country code ${countryCode}`,
+          };
+        }
+      }
+      if (trimmedCountryCallingCode) {
+        const countries = await getCountries();
+        const validCallingCode = countries.find(
+          (country) => 
+            country.iso2 === trimmedCountryCode &&
+            country.phonecode === trimmedCountryCallingCode
+        );
+        if (!validCallingCode) {
+          return {
+            isValid: false,
+            error: `Invalid country calling code for country code ${trimmedCountryCode}`,
+          };
+        }
+      }
+    }
+
+    return { isValid: true };
+  } catch (err) {
+    logger.error("Error during country/state/city validation:", err);
+    return {
+      isValid: false,
+      error: "Error validating country code, state code and city name",
+    };
+  }
+}
+
+module.exports = {
+  resolveCountryAndState,
+  validateCountryAndState
+};

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>

package/model/City.js

@@ -1,49 +0,0 @@
-const { DataTypes } = require('sequelize');
-
-module.exports = (sequelize) => {
-  return sequelize.define('City', {
-    CityID: {
-      type: DataTypes.INTEGER,
-      primaryKey: true,
-      autoIncrement: true,
-      allowNull: false
-    },
-    CityName: {
-      type: DataTypes.STRING(100),
-      allowNull: false
-    },
-    CityCode: {
-      type: DataTypes.STRING(100)
-    },
-    StateID: {
-      type: DataTypes.INTEGER,
-      references: {
-        model: 'State',
-        key: 'StateID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
-    },
-    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: 'City',
-    timestamps: false
-  });
-};

package/model/Country.js

@@ -1,47 +0,0 @@
-const { DataTypes } = require('sequelize');
-
-module.exports = (sequelize) => {
-  return sequelize.define('Country', {
-    CountryID: {
-      type: DataTypes.INTEGER,
-      primaryKey: true,
-      autoIncrement: true,
-      allowNull: false
-    },
-    CountryName: {
-      type: DataTypes.STRING(100),
-      allowNull: false
-    },
-    CountryCode: {
-      type: DataTypes.STRING(5),
-      allowNull: false
-    },
-    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: 'Country',
-    timestamps: false,
-     indexes: [
-      {
-        unique: true,
-        fields: ['CountryCode', 'CountryName']
-      }
-    ]
-  });
-};

package/model/State.js

@@ -1,56 +0,0 @@
-const { DataTypes } = require('sequelize');
-
-module.exports = (sequelize) => {
-  return sequelize.define('State', {
-    StateID: {
-      type: DataTypes.INTEGER,
-      primaryKey: true,
-      autoIncrement: true,
-      allowNull: false
-    },
-    StateName: {
-      type: DataTypes.STRING(100),
-      allowNull: false
-    },
-    StateCode: {
-      type: DataTypes.STRING(100),
-      allowNull: false
-    },
-    CountryID: {
-      type: DataTypes.INTEGER,
-      references: {
-        model: 'Country',
-        key: 'CountryID'
-      },
-      onDelete: 'RESTRICT',
-      onUpdate: 'CASCADE'
-    },
-    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: 'State',
-    timestamps: false,
-     indexes: [
-      {
-        unique: true,
-        fields: ['StateCode', 'StateName']
-      }
-    ]
-  });
-};