@b2y/ecommerce-common 1.0.5 → 1.0.6

package/utility/LocationUtility.js

@@ -1,131 +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
+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/OrderTimeFilterUtil.js

@@ -1,87 +1,87 @@
-class OrderTimeFilterUtil {
-    static getDateRange(filter) {
-        if (!filter) return null;
-
-        const today = new Date();
-        let startDate, endDate;
-
-        switch (filter.toLowerCase()) {
-            case AppConstants.LAST_30DAYS.toLowerCase():
-                startDate = new Date(today);
-                startDate.setDate(today.getDate() - 30);
-                startDate.setHours(0, 0, 0, 0);
-                endDate = new Date(today);
-                endDate.setHours(23, 59, 59, 999);
-                break;
-
-            case AppConstants.LAST_6MONTHS.toLowerCase():
-                startDate = new Date(today);
-                startDate.setMonth(today.getMonth() - 6);
-                startDate.setHours(0, 0, 0, 0);
-                endDate = new Date(today);
-                endDate.setHours(23, 59, 59, 999);
-                break;
-
-            case AppConstants.OLDER.toLowerCase():
-                startDate = new Date(1970, 0, 1);
-                endDate = new Date(today);
-                break;
-            
-            default:
-                const year = parseInt(filter);
-                if (!isNaN(year)) {
-                    return this.getYearRange(year);
-                }
-                return null;
-        }
-
-        return { startDate, endDate };
-    }
-
-    static getYearRange(year) {
-        const today = new Date();
-        const startDate = new Date(year, 0, 1);
-        
-        if (year === today.getFullYear()) {
-            const endDate = new Date(today);
-            endDate.setHours(23, 59, 59, 999);
-            return { startDate, endDate };
-        }
-        
-        return {
-            startDate,
-            endDate: new Date(year, 11, 31, 23, 59, 59, 999)
-        };
-    }
-
-    static isValidFilter(filter) {
-        if (!filter) return false;
-
-        const validFilters = [
-            AppConstants.LAST_30DAYS.toLowerCase(),
-            AppConstants.LAST_6MONTHS.toLowerCase(),
-            AppConstants.OLDER.toLowerCase()
-        ];
-        
-        if (validFilters.includes(filter.toLowerCase())) {
-            return true;
-        }
-        
-        const year = parseInt(filter);
-        const currentYear = new Date().getFullYear();
-        return !isNaN(year) && year <= currentYear && year;
-    }
-
-    static buildWhereCondition(filter, Sequelize) {
-        const dateRange = this.getDateRange(filter);
-        if (!dateRange) return null;
-
-        return {
-            [Sequelize.Op.gte]: dateRange.startDate,
-            [Sequelize.Op.lte]: dateRange.endDate
-        };
-    }
-   
-}
-module.exports = OrderTimeFilterUtil;
-
+class OrderTimeFilterUtil {
+    static getDateRange(filter) {
+        if (!filter) return null;
+
+        const today = new Date();
+        let startDate, endDate;
+
+        switch (filter.toLowerCase()) {
+            case AppConstants.LAST_30DAYS.toLowerCase():
+                startDate = new Date(today);
+                startDate.setDate(today.getDate() - 30);
+                startDate.setHours(0, 0, 0, 0);
+                endDate = new Date(today);
+                endDate.setHours(23, 59, 59, 999);
+                break;
+
+            case AppConstants.LAST_6MONTHS.toLowerCase():
+                startDate = new Date(today);
+                startDate.setMonth(today.getMonth() - 6);
+                startDate.setHours(0, 0, 0, 0);
+                endDate = new Date(today);
+                endDate.setHours(23, 59, 59, 999);
+                break;
+
+            case AppConstants.OLDER.toLowerCase():
+                startDate = new Date(1970, 0, 1);
+                endDate = new Date(today);
+                break;
+            
+            default:
+                const year = parseInt(filter);
+                if (!isNaN(year)) {
+                    return this.getYearRange(year);
+                }
+                return null;
+        }
+
+        return { startDate, endDate };
+    }
+
+    static getYearRange(year) {
+        const today = new Date();
+        const startDate = new Date(year, 0, 1);
+        
+        if (year === today.getFullYear()) {
+            const endDate = new Date(today);
+            endDate.setHours(23, 59, 59, 999);
+            return { startDate, endDate };
+        }
+        
+        return {
+            startDate,
+            endDate: new Date(year, 11, 31, 23, 59, 59, 999)
+        };
+    }
+
+    static isValidFilter(filter) {
+        if (!filter) return false;
+
+        const validFilters = [
+            AppConstants.LAST_30DAYS.toLowerCase(),
+            AppConstants.LAST_6MONTHS.toLowerCase(),
+            AppConstants.OLDER.toLowerCase()
+        ];
+        
+        if (validFilters.includes(filter.toLowerCase())) {
+            return true;
+        }
+        
+        const year = parseInt(filter);
+        const currentYear = new Date().getFullYear();
+        return !isNaN(year) && year <= currentYear && year;
+    }
+
+    static buildWhereCondition(filter, Sequelize) {
+        const dateRange = this.getDateRange(filter);
+        if (!dateRange) return null;
+
+        return {
+            [Sequelize.Op.gte]: dateRange.startDate,
+            [Sequelize.Op.lte]: dateRange.endDate
+        };
+    }
+   
+}
+module.exports = OrderTimeFilterUtil;
+