@alba-cars/common-modules 1.2.4 → 1.2.6

package/dist/core/network/endpoint-config.js

@@ -33,9 +33,9 @@ exports.API_ENDPOINTS = {
     vehicleModel: {
         getAll: `/vehicle/models`,
         create: `/vehicle/models`,
-        getOne: (id) => `/vehiclemodel/${id}`,
-        deleteOne: (id) => `/vehiclemodel/${id}`,
-        updateOne: (id) => `/vehiclemodel/${id}`,
+        getOne: (id) => `/vehicle/models/${id}`,
+        deleteOne: (id) => `/vehicle/models/${id}`,
+        updateOne: (id) => `/vehicle/models/${id}`,
     },
     TestDrive: {
         getAll: `/test-drive-requests`,
@@ -52,11 +52,11 @@ exports.API_ENDPOINTS = {
         updateOne: (id) => `/vehicleorder/${id}`,
     },
     vehicleType: {
-        getAll: `/body-types`,
-        create: `/body-types`,
-        getOne: (id) => `/body-types/${id}`,
-        deleteOne: (id) => `/body-types/${id}`,
-        updateOne: (id) => `/body-types/${id}`,
+        getAll: `/vehicle/body-types`,
+        create: `/vehicle/body-types`,
+        getOne: (id) => `/vehicle/body-types/${id}`,
+        deleteOne: (id) => `/vehicle/body-types/${id}`,
+        updateOne: (id) => `/vehicle/body-types/${id}`,
     },
     carOptions: {
         getAll: `/caroptions`,

package/dist/core/network/fetch-api.d.ts

@@ -1,6 +1,6 @@
 interface ApiRequestOptions extends RequestInit {
     headers?: Record<string, string>;
-    query?: Record<string, string>;
+    query?: Record<string, any>;
 }
 export declare function apiRequest<T>(endpoint: string, options?: ApiRequestOptions): Promise<T>;
 export {};

package/dist/core/network/fetch-api.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apiRequest = void 0;
-const querystring_1 = __importDefault(require("querystring"));
+const qs_1 = __importDefault(require("qs"));
 const utils_1 = require("../utils");
 const enums_1 = require("../enums");
 const BASE_URL = process.env.NEXT_PUBLIC_API_URL;
@@ -27,7 +27,9 @@ async function apiRequest(endpoint, options = {}) {
         options.method && options.method !== enums_1.HttpMethods.GET && console.log(`${BASE_URL}${endpoint}`);
         let url = `${BASE_URL}${endpoint}`;
         if (options.query && Object.keys(options.query).length > 0) {
-            url += `?${querystring_1.default.stringify(options.query)}`;
+            console.log("Raw params ", options.query);
+            console.log("Stringified params = ", qs_1.default.stringify(options.query));
+            url += `?${qs_1.default.stringify(options.query, { allowDots: true, arrayFormat: 'brackets', allowEmptyArrays: false, skipNulls: true })}`;
         }
         const response = await fetch(url, config);
         // Parse the response once and store it

package/dist/core/utils/global-utils.d.ts

@@ -1,10 +1,4 @@
-/**
- * Converts a value to an array.
- *
- * @param value - The value to convert.
- * @returns An array containing the value, or the value itself if it is already an array.
- */
-export declare const makeArray: <T>(value: T) => T[];
+import { Booleanish } from "../../global";
 /**
  * Deeply compares two objects for equality.
  *
@@ -39,4 +33,76 @@ type ComparatorFunction = (_a: any, _b: any) => number;
 export declare const sortBy: (array: any[], key: string | ComparatorFunction) => any[];
 export declare function generateRandomBase64(length: number): string;
 export declare const formatValue: (n: number | string) => string;
+interface TimeInput {
+    minutes?: number;
+    hours?: number;
+    seconds?: number;
+}
+/**
+ * Converts a time input to milliseconds
+ */
+export declare const timeAsMilliseconds: ({ minutes, hours, seconds }: TimeInput) => number;
+/**
+ * Converts a time input to seconds
+ */
+export declare const timeAsSeconds: ({ minutes, hours, seconds }: TimeInput) => number;
+/**
+ * Removes a key from an object or an array of objects (deeply)
+ */
+export declare function removeKeyFromObject(obj: any, keyToRemove: string): unknown;
+/**
+ * Formats a number as a currency string (AED)
+ */
+export declare const currencyFormatter: ({ isDecimal, decimalPlaces }: {
+    isDecimal: boolean;
+    decimalPlaces: number;
+}) => Intl.NumberFormat;
+/**
+ * Safely parses a string or number into a number
+ */
+export declare const safeParseNumber: (value: string | number) => number;
+/**
+ * Formats a number with commas
+ */
+export declare const formatNumberWithCommas: (value: string) => string;
+/**
+ * Converts a single value or an array of values into an array
+ */
+export declare const makeArray: <T>(value: T | T[]) => T[];
+/**
+ * Check if a value is empty (nullable or empty string)
+ */
+export declare const isEmpty: (value: any) => boolean;
+/**
+ * Check if an object is an empty object
+ */
+export declare const isEmptyObject: (value: Record<string, any>) => boolean;
+/**
+ * Check if a value is an empty array
+ */
+export declare const isEmptyArray: (value: any) => boolean;
+/**
+ * Checks if a value is not empty (null, undefined, or empty string), not an empty object, and not an empty array
+ */
+export declare const hasValue: (value: any) => boolean;
+/**
+ * Returns a pluralized string based on the value
+ * @example getPlural(1, 'item') => '1 item'
+ * @example getPlural(4, 'item') => '4 items'
+ * @example getPlural(2, 'person', 'people') => '2 people'
+ * @example getPlural(0, 'item') => '0 items'
+ */
+export declare const getPlural: (value: number, singular: string, plural?: string | null) => string;
+/**
+ * Escapes special characters in a search term to prevent them from being interpreted as regex operators
+ */
+export declare const sanitizeRegexString: (input: string) => string;
+/**
+ * Converts a value to a plain object by serializing to and from JSON
+ */
+export declare const toPlainObject: (value: unknown) => Record<string, any>;
+/**
+ * Converts a Booleanish value (boolean | 'true' | '1' | 'false' | '0') to a boolean
+ */
+export declare const booleanize: (value: Booleanish) => boolean;
 export {};

package/dist/core/utils/global-utils.js

@@ -1,14 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatValue = exports.generateRandomBase64 = exports.sortBy = exports.isFunction = exports.isPlainObject = exports.deepEqual = exports.makeArray = void 0;
-/**
- * Converts a value to an array.
- *
- * @param value - The value to convert.
- * @returns An array containing the value, or the value itself if it is already an array.
- */
-const makeArray = (value) => (Array.isArray(value) ? value : [value]);
-exports.makeArray = makeArray;
+exports.booleanize = exports.toPlainObject = exports.sanitizeRegexString = exports.getPlural = exports.hasValue = exports.isEmptyArray = exports.isEmptyObject = exports.isEmpty = exports.makeArray = exports.formatNumberWithCommas = exports.safeParseNumber = exports.currencyFormatter = exports.removeKeyFromObject = exports.timeAsSeconds = exports.timeAsMilliseconds = exports.formatValue = exports.generateRandomBase64 = exports.sortBy = exports.isFunction = exports.isPlainObject = exports.deepEqual = void 0;
 /**
  * Deeply compares two objects for equality.
  *
@@ -85,3 +77,114 @@ const formatValue = (n) => {
         .replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 };
 exports.formatValue = formatValue;
+/**
+ * Converts a time input to milliseconds
+ */
+const timeAsMilliseconds = ({ minutes = 0, hours = 0, seconds = 0 }) => {
+    return minutes * 60 * 1000 + hours * 60 * 60 * 1000 + seconds * 1000;
+};
+exports.timeAsMilliseconds = timeAsMilliseconds;
+/**
+ * Converts a time input to seconds
+ */
+const timeAsSeconds = ({ minutes = 0, hours = 0, seconds = 0 }) => {
+    return minutes * 60 + hours * 60 * 60 + seconds;
+};
+exports.timeAsSeconds = timeAsSeconds;
+/**
+ * Removes a key from an object or an array of objects (deeply)
+ */
+function removeKeyFromObject(obj, keyToRemove) {
+    if (Array.isArray(obj)) {
+        return obj.map((item) => removeKeyFromObject(item, keyToRemove));
+    }
+    else if (typeof obj === "object" && obj !== null) {
+        return Object.keys(obj).reduce((acc, key) => {
+            if (key !== keyToRemove) {
+                acc[key] = removeKeyFromObject(obj[key], keyToRemove);
+            }
+            return acc;
+        }, {});
+    }
+    return obj;
+}
+exports.removeKeyFromObject = removeKeyFromObject;
+/**
+ * Formats a number as a currency string (AED)
+ */
+const currencyFormatter = ({ isDecimal, decimalPlaces = 2 }) => new Intl.NumberFormat('en-US', {
+    style: "currency",
+    currency: "AED",
+    maximumFractionDigits: isDecimal ? decimalPlaces : 0,
+});
+exports.currencyFormatter = currencyFormatter;
+/**
+ * Safely parses a string or number into a number
+ */
+const safeParseNumber = (value) => {
+    if (typeof value === 'number')
+        return value;
+    if (typeof value !== 'string')
+        return 0;
+    return Number(value.trim().replace(/,/g, '')) || 0;
+};
+exports.safeParseNumber = safeParseNumber;
+/**
+ * Formats a number with commas
+ */
+const formatNumberWithCommas = (value) => {
+    const number = value.replace(/[^\d]/g, '');
+    return number.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+};
+exports.formatNumberWithCommas = formatNumberWithCommas;
+/**
+ * Converts a single value or an array of values into an array
+ */
+const makeArray = (value) => {
+    return Array.isArray(value) ? value : [value];
+};
+exports.makeArray = makeArray;
+/**
+ * Check if a value is empty (nullable or empty string)
+ */
+const isEmpty = (value) => (value === null || value === undefined || value === '');
+exports.isEmpty = isEmpty;
+/**
+ * Check if an object is an empty object
+ */
+const isEmptyObject = (value) => Object.keys(value).length === 0 && value.constructor === Object;
+exports.isEmptyObject = isEmptyObject;
+/**
+ * Check if a value is an empty array
+ */
+const isEmptyArray = (value) => Array.isArray(value) && value.length === 0;
+exports.isEmptyArray = isEmptyArray;
+/**
+ * Checks if a value is not empty (null, undefined, or empty string), not an empty object, and not an empty array
+ */
+const hasValue = (value) => !(0, exports.isEmpty)(value) && !(0, exports.isEmptyObject)(value) && !(0, exports.isEmptyArray)(value);
+exports.hasValue = hasValue;
+/**
+ * Returns a pluralized string based on the value
+ * @example getPlural(1, 'item') => '1 item'
+ * @example getPlural(4, 'item') => '4 items'
+ * @example getPlural(2, 'person', 'people') => '2 people'
+ * @example getPlural(0, 'item') => '0 items'
+ */
+const getPlural = (value, singular, plural = null) => value === 1 ? `${value} ${singular}` : plural ? `${value} ${plural}` : `${value} ${singular}s`;
+exports.getPlural = getPlural;
+/**
+ * Escapes special characters in a search term to prevent them from being interpreted as regex operators
+ */
+const sanitizeRegexString = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+exports.sanitizeRegexString = sanitizeRegexString;
+/**
+ * Converts a value to a plain object by serializing to and from JSON
+ */
+const toPlainObject = (value) => JSON.parse(JSON.stringify(value));
+exports.toPlainObject = toPlainObject;
+/**
+ * Converts a Booleanish value (boolean | 'true' | '1' | 'false' | '0') to a boolean
+ */
+const booleanize = (value) => ([true, 'true', '1'].includes(value) ? true : false);
+exports.booleanize = booleanize;

package/dist/core/utils/query_flatten.d.ts

@@ -0,0 +1 @@
+declare function flattenQuery(query: Record<string, any>): Record<string, any>;

package/dist/core/utils/query_flatten.js

@@ -0,0 +1,15 @@
+"use strict";
+function flattenQuery(query) {
+    const flattened = {};
+    for (const key in query) {
+        if (typeof query[key] === "object" && query[key] !== null) {
+            for (const subKey in query[key]) {
+                flattened[subKey] = query[key][subKey];
+            }
+        }
+        else {
+            flattened[key] = query[key];
+        }
+    }
+    return flattened;
+}

package/dist/features/vehicle/api/body_types/CreateBodyType.d.ts

@@ -0,0 +1,2 @@
+import { VehicleBodyType, VehicleBodyTypeCreateDTO } from "../../data";
+export declare const createVehicleBodyType: (vehicleBodyTypeDTO: VehicleBodyTypeCreateDTO) => Promise<VehicleBodyType>;

package/dist/features/vehicle/api/body_types/CreateBodyType.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createVehicleBodyType = void 0;
+const core_1 = require("../../../../core");
+const createVehicleBodyType = async (vehicleBodyTypeDTO) => {
+    var _a, _b;
+    try {
+        const response = await (0, core_1.apiRequest)(core_1.API_ENDPOINTS.vehicleType.create.toString(), {
+            method: core_1.HttpMethods.POST,
+            body: JSON.stringify(vehicleBodyTypeDTO)
+        });
+        if (!response.success) {
+            throw Error((_a = response.message) !== null && _a !== void 0 ? _a : (_b = response.error) === null || _b === void 0 ? void 0 : _b.message);
+        }
+        return response.data;
+    }
+    catch (error) {
+        console.error('Failed to create vehicle make:', error);
+        return Promise.reject(error);
+    }
+};
+exports.createVehicleBodyType = createVehicleBodyType;

package/dist/features/vehicle/api/body_types/DeleteBodyType.d.ts

@@ -0,0 +1,2 @@
+import { VehicleBodyType } from "../../data";
+export declare const deleteVehicleBodyType: (bodyTypeId: string) => Promise<VehicleBodyType>;

package/dist/features/vehicle/api/body_types/DeleteBodyType.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteVehicleBodyType = void 0;
+const core_1 = require("../../../../core");
+const deleteVehicleBodyType = async (bodyTypeId) => {
+    try {
+        const response = await (0, core_1.apiRequest)(core_1.API_ENDPOINTS.vehicleType.deleteOne(bodyTypeId).toString(), {
+            method: core_1.HttpMethods.DELETE,
+        });
+        return response;
+    }
+    catch (error) {
+        console.error('Failed to delete vehicle body type:', error);
+        return Promise.reject(error);
+    }
+};
+exports.deleteVehicleBodyType = deleteVehicleBodyType;

package/dist/features/vehicle/api/body_types/GetAllBodyTypes.d.ts

@@ -0,0 +1,3 @@
+import { PaginatedData } from "../../../../core";
+import { VehicleBodyType } from "../../data";
+export declare const getAllVehicleBodyTypes: (page: number | null, searchQuery: string | null) => Promise<PaginatedData<VehicleBodyType[]>>;

package/dist/features/vehicle/api/body_types/GetAllBodyTypes.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllVehicleBodyTypes = void 0;
+const qs_1 = __importDefault(require("qs"));
+const core_1 = require("../../../../core");
+const data_1 = require("../../data");
+const getAllVehicleBodyTypes = async (page, searchQuery) => {
+    var _a, _b, _c;
+    try {
+        let getDTO = new data_1.VehicleBodyTypeGetDTO();
+        let options = new data_1.VehicleBodyTypeOptions();
+        if ((searchQuery !== null && searchQuery !== void 0 ? searchQuery : "").trim().length > 1) {
+            let filter = new data_1.VehicleBodyTypeFilter();
+            filter.search = searchQuery;
+            getDTO.filter = filter;
+        }
+        // options.withVehicles = true;
+        options.page = (page !== null && page !== void 0 ? page : 0) + 1;
+        getDTO.options = options;
+        const endpoint = `${core_1.API_ENDPOINTS.vehicleType.getAll.toString()}?${qs_1.default.stringify(getDTO.toPlain(), { arrayFormat: 'brackets', allowEmptyArrays: false, skipNulls: true })}`;
+        const response = await (0, core_1.apiRequest)(endpoint, {
+            method: core_1.HttpMethods.GET,
+        });
+        if (!response.success) {
+            throw Error((_a = response.message) !== null && _a !== void 0 ? _a : (_b = response.error) === null || _b === void 0 ? void 0 : _b.message);
+        }
+        return (_c = response.data) !== null && _c !== void 0 ? _c : [];
+    }
+    catch (error) {
+        console.error('Failed to fetch vehicle types:', error);
+        return Promise.reject(error);
+    }
+};
+exports.getAllVehicleBodyTypes = getAllVehicleBodyTypes;

package/dist/features/vehicle/api/body_types/UpdateBodyType.d.ts

@@ -0,0 +1,2 @@
+import { VehicleBodyType, VehicleBodyTypeUpdateDTO } from "../../data";
+export declare const updateVehicleBodyType: (bodyTypeId: string | number, params: VehicleBodyTypeUpdateDTO) => Promise<VehicleBodyType>;

package/dist/features/vehicle/api/body_types/UpdateBodyType.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateVehicleBodyType = void 0;
+const core_1 = require("../../../../core");
+const updateVehicleBodyType = async (bodyTypeId, params) => {
+    var _a, _b;
+    try {
+        const res = await (0, core_1.apiRequest)(core_1.API_ENDPOINTS.vehicleType.updateOne(bodyTypeId), {
+            method: core_1.HttpMethods.PUT,
+            body: JSON.stringify(params),
+        });
+        if (!res.success) {
+            throw Error((_a = res.message) !== null && _a !== void 0 ? _a : (_b = res.error) === null || _b === void 0 ? void 0 : _b.message);
+        }
+        return res.data;
+    }
+    catch (error) {
+        console.log('Failed to update make with id:', bodyTypeId, 'Error:', error);
+        return await Promise.reject(error);
+    }
+};
+exports.updateVehicleBodyType = updateVehicleBodyType;

package/dist/features/vehicle/api/body_types/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./CreateBodyType";
+export * from "./DeleteBodyType";
+export * from "./GetAllBodyTypes";
+export * from "./UpdateBodyType";

package/dist/features/vehicle/api/body_types/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./CreateBodyType"), exports);
+__exportStar(require("./DeleteBodyType"), exports);
+__exportStar(require("./GetAllBodyTypes"), exports);
+__exportStar(require("./UpdateBodyType"), exports);

package/dist/features/vehicle/api/index.d.ts

@@ -1 +1,3 @@
 export * from "./make";
+export * from "./models";
+export * from "./body_types";

package/dist/features/vehicle/api/index.js

@@ -15,3 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./make"), exports);
+__exportStar(require("./models"), exports);
+__exportStar(require("./body_types"), exports);

package/dist/features/vehicle/api/make/GetAllMakes.d.ts

@@ -1,3 +1,3 @@
 import { PaginatedData } from "../../../../core";
 import { VehicleMake } from "../../data";
-export declare const getAllVehicleMakes: (page: Number | null, searchQuery: string | null) => Promise<PaginatedData<VehicleMake[]>>;
+export declare const getAllVehicleMakes: (page: number | null, searchQuery: string | null) => Promise<PaginatedData<VehicleMake[]>>;

package/dist/features/vehicle/api/make/GetAllMakes.js

@@ -19,7 +19,7 @@ const getAllVehicleMakes = async (page, searchQuery) => {
         return (_c = response.data) !== null && _c !== void 0 ? _c : [];
     }
     catch (error) {
-        console.error('Failed to create vehicle make:', error);
+        console.error('Failed to fetch vehicle make:', error);
         return Promise.reject(error);
     }
 };

package/dist/features/vehicle/api/models/CreateModel.d.ts

@@ -0,0 +1,2 @@
+import { VehicleModel, VehicleModelCreateDTO } from "../../data";
+export declare const createVehicleModel: (vehicleModelDTO: VehicleModelCreateDTO) => Promise<VehicleModel>;

package/dist/features/vehicle/api/models/CreateModel.js

@@ -1 +1,22 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createVehicleModel = void 0;
+const core_1 = require("../../../../core");
+const createVehicleModel = async (vehicleModelDTO) => {
+    var _a, _b;
+    try {
+        const response = await (0, core_1.apiRequest)(core_1.API_ENDPOINTS.vehicleModel.create.toString(), {
+            method: core_1.HttpMethods.POST,
+            body: JSON.stringify(vehicleModelDTO)
+        });
+        if (!response.success) {
+            throw Error((_a = response.message) !== null && _a !== void 0 ? _a : (_b = response.error) === null || _b === void 0 ? void 0 : _b.message);
+        }
+        return response.data;
+    }
+    catch (error) {
+        console.error('Failed to create vehicle model:', error);
+        return Promise.reject(error);
+    }
+};
+exports.createVehicleModel = createVehicleModel;

package/dist/features/vehicle/api/models/DeleteModel.d.ts

@@ -0,0 +1,2 @@
+import { VehicleModel } from "../../data";
+export declare const deleteVehicleModel: (modelId: string) => Promise<VehicleModel>;

package/dist/features/vehicle/api/models/DeleteModel.js

@@ -1 +1,17 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteVehicleModel = void 0;
+const core_1 = require("../../../../core");
+const deleteVehicleModel = async (modelId) => {
+    try {
+        const response = await (0, core_1.apiRequest)(core_1.API_ENDPOINTS.vehicleModel.deleteOne(modelId).toString(), {
+            method: core_1.HttpMethods.DELETE,
+        });
+        return response;
+    }
+    catch (error) {
+        console.error('Failed to delete vehicle model:', error);
+        return Promise.reject(error);
+    }
+};
+exports.deleteVehicleModel = deleteVehicleModel;

package/dist/features/vehicle/api/models/GetAllModels.d.ts

@@ -0,0 +1,3 @@
+import { PaginatedData } from "../../../../core";
+import { VehicleModel } from "../../data";
+export declare const getAllVehicleModels: (page: number | null, searchQuery: string | null) => Promise<PaginatedData<VehicleModel[]>>;

package/dist/features/vehicle/api/models/GetAllModels.js

@@ -1 +1,37 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllVehicleModels = void 0;
+const qs_1 = __importDefault(require("qs"));
+const core_1 = require("../../../../core");
+const data_1 = require("../../data");
+const getAllVehicleModels = async (page, searchQuery) => {
+    var _a, _b, _c;
+    try {
+        let getDTO = new data_1.VehicleModelGetDTO();
+        let options = new data_1.VehicleModelOptions();
+        if ((searchQuery !== null && searchQuery !== void 0 ? searchQuery : "").trim().length > 1) {
+            let filter = new data_1.VehicleModelFilter();
+            filter.search = searchQuery;
+            getDTO.filter = filter;
+        }
+        options.withMake = true;
+        options.page = (page !== null && page !== void 0 ? page : 0) + 1;
+        getDTO.options = options;
+        const endpoint = `${core_1.API_ENDPOINTS.vehicleModel.getAll.toString()}?${qs_1.default.stringify(getDTO.toPlain(), { arrayFormat: 'brackets', allowEmptyArrays: false, skipNulls: true })}`;
+        const response = await (0, core_1.apiRequest)(endpoint, {
+            method: core_1.HttpMethods.GET,
+        });
+        if (!response.success) {
+            throw Error((_a = response.message) !== null && _a !== void 0 ? _a : (_b = response.error) === null || _b === void 0 ? void 0 : _b.message);
+        }
+        return (_c = response.data) !== null && _c !== void 0 ? _c : [];
+    }
+    catch (error) {
+        console.error('Failed to fetch vehicle models:', error);
+        return Promise.reject(error);
+    }
+};
+exports.getAllVehicleModels = getAllVehicleModels;

package/dist/features/vehicle/api/models/UpdateModel.d.ts

@@ -0,0 +1,2 @@
+import { VehicleModel, VehicleModelUpdateDTO } from "../../data";
+export declare const updateVehicleModel: (makeID: string | number, params: VehicleModelUpdateDTO) => Promise<VehicleModel>;

package/dist/features/vehicle/api/models/UpdateModel.js

@@ -1 +1,22 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateVehicleModel = void 0;
+const core_1 = require("../../../../core");
+const updateVehicleModel = async (makeID, params) => {
+    var _a, _b;
+    try {
+        const res = await (0, core_1.apiRequest)(core_1.API_ENDPOINTS.vehicleModel.updateOne(makeID), {
+            method: core_1.HttpMethods.PUT,
+            body: JSON.stringify(params),
+        });
+        if (!res.success) {
+            throw Error((_a = res.message) !== null && _a !== void 0 ? _a : (_b = res.error) === null || _b === void 0 ? void 0 : _b.message);
+        }
+        return res.data;
+    }
+    catch (error) {
+        console.error('Failed to update model with id:', makeID, 'Error:', error);
+        return await Promise.reject(error);
+    }
+};
+exports.updateVehicleModel = updateVehicleModel;

package/dist/features/vehicle/api/models/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./CreateModel";
+export * from "./GetAllModels";
+export * from "./DeleteModel";
+export * from "./UpdateModel";

package/dist/features/vehicle/api/models/index.js

@@ -1 +1,20 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./CreateModel"), exports);
+__exportStar(require("./GetAllModels"), exports);
+__exportStar(require("./DeleteModel"), exports);
+__exportStar(require("./UpdateModel"), exports);

package/dist/features/vehicle/data/dto/VehicleModelDTO.d.ts

@@ -1,6 +1,5 @@
 import { VehicleModelFilter, VehicleModelOptions, VehicleModelUniqueFilter } from '../utilities';
 import { BaseCreateDTO, BaseUpdateDTO } from './BaseDTO';
-import { VehicleBodyType } from '../models/VehicleBodyType';
 import { Vehicle } from '../models/Vehicle';
 import { VehicleMake } from '../models/VehicleMake';
 export declare class VehicleModelGetDTO {
@@ -8,7 +7,7 @@ export declare class VehicleModelGetDTO {
     options?: VehicleModelOptions;
     validate(): string[];
     static fromPlain(plain: Record<string, unknown>): VehicleModelGetDTO;
-    toPlain(): Record<string, unknown>;
+    toPlain(): Record<string, any>;
 }
 export declare class VehicleModelGetUniqueDTO {
     filter?: VehicleModelUniqueFilter;
@@ -26,7 +25,6 @@ export declare class VehicleModelCreateDTO extends BaseCreateDTO {
     metaKeywords?: string;
     make: VehicleMake;
     vehicles?: Vehicle[];
-    bodyType: VehicleBodyType;
     validate(): string[];
     static fromPlain(plain: Record<string, unknown>): VehicleModelCreateDTO;
     static toPlain(entity: any): Record<string, unknown>;

package/dist/features/vehicle/data/dto/VehicleModelDTO.js

@@ -14,7 +14,6 @@ exports.DynamicModelDTO = exports.VehicleModelUpdateDTO = exports.VehicleModelCr
 const class_validator_1 = require("class-validator");
 const class_transformer_1 = require("class-transformer");
 const BaseDTO_1 = require("./BaseDTO");
-const VehicleBodyType_1 = require("../models/VehicleBodyType");
 const Vehicle_1 = require("../models/Vehicle");
 const VehicleMake_1 = require("../models/VehicleMake");
 class VehicleModelGetDTO {
@@ -104,12 +103,6 @@ __decorate([
     ,
     __metadata("design:type", Array)
 ], VehicleModelCreateDTO.prototype, "vehicles", void 0);
-__decorate([
-    (0, class_validator_1.ValidateNested)(),
-    (0, class_transformer_1.Type)(() => VehicleBodyType_1.VehicleBodyType) // This transforms each object in the array to the OtherDetailsDTO class
-    ,
-    __metadata("design:type", VehicleBodyType_1.VehicleBodyType)
-], VehicleModelCreateDTO.prototype, "bodyType", void 0);
 exports.VehicleModelCreateDTO = VehicleModelCreateDTO;
 class VehicleModelUpdateDTO extends BaseDTO_1.BaseUpdateDTO {
     validate() {

package/dist/features/vehicle/data/dto/VehicleTypeDTO.d.ts

@@ -5,7 +5,7 @@ export declare class VehicleBodyTypeGetDTO {
     options?: VehicleBodyTypeOptions;
     validate(): string[];
     static fromPlain(plain: Record<string, unknown>): VehicleBodyTypeGetDTO;
-    static toPlain(entity: any): Record<string, unknown>;
+    toPlain(): Record<string, any>;
 }
 export declare class VehicleBodyTypeGetUniqueDTO {
     filter?: VehicleBodyTypeUniqueFilter;

package/dist/features/vehicle/data/dto/VehicleTypeDTO.js

@@ -22,8 +22,8 @@ class VehicleBodyTypeGetDTO {
     static fromPlain(plain) {
         return (0, class_transformer_1.plainToClass)(VehicleBodyTypeGetDTO, plain);
     }
-    static toPlain(entity) {
-        return (0, class_transformer_1.instanceToPlain)(entity);
+    toPlain() {
+        return (0, class_transformer_1.instanceToPlain)(this);
     }
 }
 exports.VehicleBodyTypeGetDTO = VehicleBodyTypeGetDTO;

package/dist/features/vehicle/data/utilities.d.ts

@@ -33,7 +33,7 @@ export declare class VehicleMakeUniqueFilter extends BaseFilter {
     static fromPlain(plain: Record<string, unknown>): VehicleMakeFilter;
     static toPlain(entity: any): Record<string, unknown>;
 }
-export type VehicleMakeSort = Record<keyof Pick<VehicleMake, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>;
+export type VehicleMakeSort = Partial<Record<keyof Pick<VehicleMake, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>>;
 export declare class VehicleMakeOptions extends PaginationOptions {
     sort?: VehicleMakeSort;
     withModels?: boolean;
@@ -63,7 +63,7 @@ export declare class VehicleModelUniqueFilter extends BaseFilter {
     static fromPlain(plain: Record<string, unknown>): VehicleModelUniqueFilter;
     static toPlain(entity: any): Record<string, unknown>;
 }
-export type VehicleModelSort = Record<keyof Pick<VehicleModel, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>;
+export type VehicleModelSort = Partial<Record<keyof Pick<VehicleModel, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>>;
 export declare class VehicleModelOptions extends PaginationOptions {
     sort?: VehicleModelSort;
     withVehicles?: boolean;
@@ -92,7 +92,7 @@ export declare class VehicleBodyTypeUniqueFilter {
     static fromPlain(plain: Record<string, unknown>): VehicleModelFilter;
     static toPlain(entity: any): Record<string, unknown>;
 }
-export type VehicleBodyTypeSort = Record<keyof Pick<VehicleBodyType, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>;
+export type VehicleBodyTypeSort = Partial<Record<keyof Pick<VehicleBodyType, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>>;
 export declare class VehicleBodyTypeOptions extends PaginationOptions {
     sort?: VehicleBodyTypeSort;
     withVehicles?: boolean;
@@ -119,7 +119,7 @@ export declare class VehicleFeatureUniqueFilter {
     static fromPlain(plain: Record<string, unknown>): VehicleModelFilter;
     static toPlain(entity: any): Record<string, unknown>;
 }
-export type VehicleFeatureSort = Record<keyof Pick<VehicleFeature, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>;
+export type VehicleFeatureSort = Partial<Record<keyof Pick<VehicleFeature, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>>;
 export declare class VehicleFeatureOptions extends PaginationOptions {
     sort?: VehicleFeatureSort;
     withCategories?: boolean;
@@ -146,7 +146,7 @@ export declare class VehicleFeatureCategoryUniqueFilter {
     static fromPlain(plain: Record<string, unknown>): VehicleModelFilter;
     static toPlain(entity: any): Record<string, unknown>;
 }
-export type VehicleFeatureCategorySort = Record<keyof Pick<VehicleCategory, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>;
+export type VehicleFeatureCategorySort = Partial<Record<keyof Pick<VehicleCategory, 'name' | 'isActive' | 'createdAt' | 'updatedAt'>, 'asc' | 'desc'>>;
 export declare class VehicleFeatureCategoryOptions extends PaginationOptions {
     sort?: VehicleFeatureCategorySort;
     withFeatures?: boolean;
@@ -195,7 +195,7 @@ export declare class VehicleUniqueFilter {
     static fromPlain(plain: Record<string, unknown>): VehicleUniqueFilter;
     static toPlain(entity: any): Record<string, unknown>;
 }
-export type VehicleSort = Record<keyof Pick<Vehicle, 'referenceNumber' | 'mileage' | 'year' | 'createdAt' | 'updatedAt' | 'engineCapacity' | 'doors' | 'seats' | 'keys' | 'transmission' | 'driveType' | 'price' | 'status'>, 'asc' | 'desc'>;
+export type VehicleSort = Partial<Record<keyof Pick<Vehicle, 'referenceNumber' | 'mileage' | 'year' | 'createdAt' | 'updatedAt' | 'engineCapacity' | 'doors' | 'seats' | 'keys' | 'transmission' | 'driveType' | 'price' | 'status'>, 'asc' | 'desc'>>;
 export declare class VehicleOptions extends PaginationOptions {
     sort?: VehicleSort;
     select?: (VehicleSelectFields | `make.${VehicleMakeSelectFields}` | `model.${VehicleModelSelectFields}` | `bodyType.${VehicleBodyTypeSelectFields}` | `features.${VehicleFeatureSelectFields}` | `metaData.${VehicleMetaDataSelectFields}`)[];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "A package containing DTOs, validation classes and common modules and interfaces for Alba Cars",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,7 +37,8 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "dist": "^0.1.2",
-    "express": "^4.21.1"
+    "express": "^4.21.1",
+    "qs": "^6.13.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",