@alba-cars/common-modules 1.3.4 → 1.3.5

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

@@ -33,25 +33,28 @@ const onTokenRefreshed = (token) => {
     refreshSubscribers = [];
 };
 const refreshTokens = async () => {
+    var _a, _b, _c, _d;
     try {
         const tokens = (0, exports.getTokens)();
         if (!(tokens === null || tokens === void 0 ? void 0 : tokens.refreshToken)) {
             throw new Error("No refresh token available");
         }
-        const response = await apiRequest("/auth/refresh", {
+        const response = await apiRequest("/auth/refresh-token", {
             method: enums_1.HttpMethods.POST,
             body: JSON.stringify({ refreshToken: tokens.refreshToken }),
             skipAuth: true, // Skip auth to avoid infinite loop
         });
+        if (!((_a = response.data) === null || _a === void 0 ? void 0 : _a.accessToken)) {
+            throw new Error("No access token available");
+        }
         (0, exports.setTokens)({
-            accessToken: response.accessToken,
-            refreshToken: response.refreshToken,
+            accessToken: (_b = response.data) === null || _b === void 0 ? void 0 : _b.accessToken,
+            refreshToken: (_c = response.data) === null || _c === void 0 ? void 0 : _c.refreshToken,
         });
-        return response.accessToken;
+        return (_d = response.data) === null || _d === void 0 ? void 0 : _d.accessToken;
     }
     catch (error) {
         (0, exports.removeTokens)();
-        window.location.href = "/login";
         throw error;
     }
 };
@@ -68,7 +71,7 @@ const buildUrl = (endpoint, query) => {
     return url;
 };
 async function apiRequest(endpoint, options = {}) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const tokens = (0, exports.getTokens)();
     const headers = {
         Accept: "application/json",
@@ -151,6 +154,12 @@ async function apiRequest(endpoint, options = {}) {
             }
             throw error;
         }
+        if ((_d = responseData === null || responseData === void 0 ? void 0 : responseData.data) === null || _d === void 0 ? void 0 : _d.token) {
+            (0, exports.setTokens)({
+                accessToken: responseData.data.token,
+                refreshToken: responseData.data.refreshToken,
+            });
+        }
         return responseData;
     }
     catch (error) {

package/dist/features/models/Vehicle.d.ts

@@ -41,6 +41,8 @@ export declare class Vehicle extends BaseModel {
     finance?: VehicleFinance;
     orders?: VehicleOrder[];
     draft?: VehicleDraft;
+    static fromPlain(plain: Record<string, unknown>): Vehicle;
+    toPlain(): Record<string, unknown>;
 }
 export declare class VehicleDraft {
     page: number;

package/dist/features/models/Vehicle.js

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VehicleDraft = exports.Vehicle = void 0;
+const class_transformer_1 = require("class-transformer");
 const Base_1 = require("./Base");
 class Vehicle extends Base_1.BaseModel {
+    static fromPlain(plain) {
+        return (0, class_transformer_1.plainToClass)(Vehicle, plain);
+    }
+    toPlain() {
+        return (0, class_transformer_1.instanceToPlain)(this);
+    }
 }
 exports.Vehicle = Vehicle;
 class VehicleDraft {

package/dist/features/sales-team/data/dto/SalesAgentDTO.js

@@ -51,6 +51,8 @@ class SalesAgentCreateDTO {
         return {
             status: this.status,
             designation: this.designation,
+            languages: this.languageIds,
+            agentIntro: this.agentIntro,
         };
     }
 }

package/dist/features/test-drive-request/data/dto/TestDriveRequestDTO.d.ts

@@ -1,5 +1,5 @@
 import { TestDriveRequestFilter, TestDriveRequestSelectFields } from "../utilities";
-import { BaseCreateDTO, BaseUpdateDTO } from "../../../vehicle/data/dto/BaseDTO";
+import { BaseUpdateDTO } from "../../../vehicle/data/dto/BaseDTO";
 import { DynamicVehicleDTO } from "../../../vehicle/data/dto/VehicleDTO";
 import { LeadThrough, TestDriveRequestStatus } from "../enums";
 import { VehicleSelectFields } from "../../../vehicle/data/utilities";
@@ -17,7 +17,7 @@ export declare class TestDriveRequestGetDTO {
     static fromPlain(plain: Record<string, unknown>): TestDriveRequestGetDTO;
     toPlain(): Record<string, any>;
 }
-export declare class TestDriveRequestCreateDTO extends BaseCreateDTO {
+export declare class TestDriveRequestCreateDTO {
     vehicle: DynamicVehicleDTO;
     testerName: string;
     testerMobile: string;
@@ -27,6 +27,7 @@ export declare class TestDriveRequestCreateDTO extends BaseCreateDTO {
     status?: TestDriveRequestStatus;
     leadThrough?: LeadThrough;
     comments?: string;
+    createdById?: string;
     validate(): string[];
     constructor(data?: Partial<TestDriveRequestCreateDTO>);
     static fromPlain(plain: Record<string, unknown>): TestDriveRequestCreateDTO;

package/dist/features/test-drive-request/data/dto/TestDriveRequestDTO.js

@@ -19,11 +19,10 @@ const enums_1 = require("../enums");
 class TestDriveRequestGetDTOOptions {
 }
 exports.TestDriveRequestGetDTOOptions = TestDriveRequestGetDTOOptions;
-;
 class TestDriveRequestGetDTO {
     validate() {
         const errors = (0, class_validator_1.validateSync)(this);
-        return errors.map(error => { var _a; return Object.values((_a = error.constraints) !== null && _a !== void 0 ? _a : {}); }).flat();
+        return errors.map((error) => { var _a; return Object.values((_a = error.constraints) !== null && _a !== void 0 ? _a : {}); }).flat();
     }
     static fromPlain(plain) {
         return (0, class_transformer_1.plainToClass)(TestDriveRequestGetDTO, plain);
@@ -33,13 +32,12 @@ class TestDriveRequestGetDTO {
     }
 }
 exports.TestDriveRequestGetDTO = TestDriveRequestGetDTO;
-class TestDriveRequestCreateDTO extends BaseDTO_1.BaseCreateDTO {
+class TestDriveRequestCreateDTO {
     validate() {
         const errors = (0, class_validator_1.validateSync)(this);
         return errors.map((error) => { var _a; return Object.values((_a = error.constraints) !== null && _a !== void 0 ? _a : {}); }).flat();
     }
     constructor(data) {
-        super();
         Object.assign(this, data);
         if (!this.status)
             this.status = enums_1.TestDriveRequestStatus.NOT_CONTACTED;
@@ -109,6 +107,11 @@ __decorate([
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String)
 ], TestDriveRequestCreateDTO.prototype, "comments", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsString)(),
+    __metadata("design:type", String)
+], TestDriveRequestCreateDTO.prototype, "createdById", void 0);
 exports.TestDriveRequestCreateDTO = TestDriveRequestCreateDTO;
 class TestDriveRequestUpdateDTO extends BaseDTO_1.BaseUpdateDTO {
     validate() {

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

@@ -199,7 +199,11 @@ export declare class VehicleFilter extends BaseFilter {
     emissions?: string | string[];
     year?: NumberRange;
     price?: NumberRange;
+    emi?: NumberRange;
     status?: string | string[];
+    includeReserved?: boolean;
+    includeSold?: boolean;
+    includeDraft?: boolean;
     features?: string | string[];
     search?: string;
     validate(): string[];

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

@@ -641,11 +641,32 @@ __decorate([
     (0, class_transformer_1.Type)(() => global_1.NumberRange),
     __metadata("design:type", global_1.NumberRange)
 ], VehicleFilter.prototype, "price", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => global_1.NumberRange),
+    __metadata("design:type", global_1.NumberRange)
+], VehicleFilter.prototype, "emi", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)({ each: true }),
     __metadata("design:type", Object)
 ], VehicleFilter.prototype, "status", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], VehicleFilter.prototype, "includeReserved", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], VehicleFilter.prototype, "includeSold", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], VehicleFilter.prototype, "includeDraft", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)({ each: true }),

package/dist/features/vehicle/data/enums/index.d.ts

@@ -2,3 +2,10 @@ export declare enum VehicleMediaType {
     IMAGE = "image",
     VIDEO = "video"
 }
+export declare enum VehicleStatusType {
+    RESERVED = "Reserved",
+    DRAFT = "Draft",
+    PUBLISHED = "Published",
+    SELF_RESERVED = "Self-Reserved",
+    SOLD = "Sold"
+}

package/dist/features/vehicle/data/enums/index.js

@@ -1,8 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VehicleMediaType = void 0;
+exports.VehicleStatusType = exports.VehicleMediaType = void 0;
 var VehicleMediaType;
 (function (VehicleMediaType) {
     VehicleMediaType["IMAGE"] = "image";
     VehicleMediaType["VIDEO"] = "video";
 })(VehicleMediaType = exports.VehicleMediaType || (exports.VehicleMediaType = {}));
+var VehicleStatusType;
+(function (VehicleStatusType) {
+    VehicleStatusType["RESERVED"] = "Reserved";
+    VehicleStatusType["DRAFT"] = "Draft";
+    VehicleStatusType["PUBLISHED"] = "Published";
+    VehicleStatusType["SELF_RESERVED"] = "Self-Reserved";
+    VehicleStatusType["SOLD"] = "Sold";
+})(VehicleStatusType = exports.VehicleStatusType || (exports.VehicleStatusType = {}));

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

@@ -179,6 +179,10 @@ export declare class VehicleFilter extends BaseFilter {
     emissions?: string | string[];
     year?: NumberRange;
     price?: NumberRange;
+    includeReserved?: boolean;
+    includeSelfReserved?: boolean;
+    includeSold?: boolean;
+    includeDraft?: boolean;
     status?: string | string[];
     features?: string | string[];
     search?: string;

package/dist/features/vehicle/data/utilities.js

@@ -575,6 +575,26 @@ __decorate([
     (0, class_transformer_1.Type)(() => utilities_1.NumberRange),
     __metadata("design:type", utilities_1.NumberRange)
 ], VehicleFilter.prototype, "price", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], VehicleFilter.prototype, "includeReserved", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], VehicleFilter.prototype, "includeSelfReserved", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], VehicleFilter.prototype, "includeSold", void 0);
+__decorate([
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsBoolean)(),
+    __metadata("design:type", Boolean)
+], VehicleFilter.prototype, "includeDraft", void 0);
 __decorate([
     (0, class_validator_1.IsOptional)(),
     (0, class_validator_1.IsString)({ each: true }),

package/dist/global/utilities.d.ts

@@ -50,3 +50,4 @@ export declare class TypedOptions<T extends Record<string, any>> extends Paginat
     static fromPlain(plain: Record<string, unknown>): TypedOptions<Record<string, any>>;
     static toPlain(entity: any): Record<string, unknown>;
 }
+export declare function formatImageUrl(src: string | null | undefined): string | null;

package/dist/global/utilities.js

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypedOptions = exports.TypedFilter = exports.BaseFilter = exports.NumberRange = exports.DateFilter = exports.PaginationOptions = exports.IsDateOrConvertible = exports.createFieldPath = void 0;
+exports.formatImageUrl = exports.TypedOptions = exports.TypedFilter = exports.BaseFilter = exports.NumberRange = exports.DateFilter = exports.PaginationOptions = exports.IsDateOrConvertible = exports.createFieldPath = void 0;
 const class_validator_1 = require("class-validator");
 const class_transformer_1 = require("class-transformer");
 const createFieldPath = (path) => path;
@@ -23,7 +23,9 @@ function IsDateOrConvertible(validationOptions) {
             options: validationOptions,
             validator: {
                 validate(value, _args) {
-                    return value instanceof Date || typeof value === "string" || typeof value === "number";
+                    return (value instanceof Date ||
+                        typeof value === "string" ||
+                        typeof value === "number");
                 },
                 defaultMessage(args) {
                     return `${args.property} must be a Date, string, or number`;
@@ -138,3 +140,34 @@ class TypedOptions extends PaginationOptions {
     }
 }
 exports.TypedOptions = TypedOptions;
+function isValidUrl(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function formatImageUrl(src) {
+    if (!src) {
+        return null;
+    }
+    // Return as-is if it's already an absolute URL
+    if (isValidUrl(src)) {
+        return src;
+    }
+    // Return as-is if it's a data URL
+    if (src.startsWith("data:")) {
+        return src;
+    }
+    if (src.startsWith("/assets")) {
+        return src;
+    }
+    const domain = process.env.NEXT_PUBLIC_S3_URL;
+    // Ensure src has a leading slash
+    const normalizedSrc = src.startsWith("/") ? src : `/${src}`;
+    // Combine domain with normalized path
+    return `${domain}${normalizedSrc}`;
+}
+exports.formatImageUrl = formatImageUrl;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "A package containing DTOs, validation classes and common modules and interfaces for Alba Cars",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",