From ff7e20d2ee3a1cf25c038ae60d5d829104fbae69 Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Thu, 2 Jul 2026 11:22:35 +0000
Subject: [PATCH] fix

---
 .../1870000000000-AddLocationToVehicles.ts    | 22 +++++++++++++++++++
 .../vehicles/entities/vehicle.entity.ts       |  3 +++
 .../src/pages/fleet/config/vehicles.ts        |  2 ++
 .../src/services/vehicles.service.ts          |  3 ++-
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 apps/edr-freight-api/src/migrations/1870000000000-AddLocationToVehicles.ts

diff --git a/apps/edr-freight-api/src/migrations/1870000000000-AddLocationToVehicles.ts b/apps/edr-freight-api/src/migrations/1870000000000-AddLocationToVehicles.ts
new file mode 100644
index 000000000..3434631a2
--- /dev/null
+++ b/apps/edr-freight-api/src/migrations/1870000000000-AddLocationToVehicles.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Add location_id column to vehicles table to track vehicle base location.
+ */
+export class AddLocationToVehicles1870000000000 implements MigrationInterface {
+  name = "AddLocationToVehicles1870000000000";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.vehicles
+        ADD COLUMN IF NOT EXISTS location_id uuid;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.vehicles
+        DROP COLUMN IF EXISTS location_id;
+    `);
+  }
+}
diff --git a/apps/edr-freight-api/src/modules/vehicles/entities/vehicle.entity.ts b/apps/edr-freight-api/src/modules/vehicles/entities/vehicle.entity.ts
index fef078ef8..1e4121802 100644
--- a/apps/edr-freight-api/src/modules/vehicles/entities/vehicle.entity.ts
+++ b/apps/edr-freight-api/src/modules/vehicles/entities/vehicle.entity.ts
@@ -68,4 +68,7 @@ export class Vehicle extends BaseEntity {
 
   @Column({ name: 'actual_distance_km', type: 'numeric', nullable: true })
   actualDistanceKm?: number;
+
+  @Column({ name: 'location_id', type: 'uuid', nullable: true })
+  locationId?: string;
 }
diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/config/vehicles.ts b/apps/edr-freight-web/backoffice/src/pages/fleet/config/vehicles.ts
index 92da9b9dc..648c0579d 100644
--- a/apps/edr-freight-web/backoffice/src/pages/fleet/config/vehicles.ts
+++ b/apps/edr-freight-web/backoffice/src/pages/fleet/config/vehicles.ts
@@ -74,6 +74,7 @@ export const vehiclesConfig: FleetResourceConfig = {
     { name: "year", label: "Year", type: "number", required: true },
     { name: "fuelType", label: "Fuel Type", type: "select", required: true, options: FUEL_TYPE_OPTIONS },
     { name: "capacity", label: "Capacity", type: "number", required: true },
+    { name: "locationId", label: "Location", type: "select", dataSource: "yards" },
     { name: "estimatedDistanceKm", label: "Estimated Distance (KM)", type: "number" },
     { name: "actualDistanceKm", label: "Actual Distance (KM)", type: "number" },
     { name: "status", label: "Status", type: "select", required: true, options: VEHICLE_STATUS_OPTIONS },
@@ -90,6 +91,7 @@ export const vehiclesConfig: FleetResourceConfig = {
     year: new Date().getFullYear(),
     fuelType: "DIESEL",
     capacity: 0,
+    locationId: null,
     estimatedDistanceKm: "",
     actualDistanceKm: "",
     status: "ACTIVE",
diff --git a/apps/edr-freight-web/backoffice/src/services/vehicles.service.ts b/apps/edr-freight-web/backoffice/src/services/vehicles.service.ts
index b9d5129e3..3cb2ad358 100644
--- a/apps/edr-freight-web/backoffice/src/services/vehicles.service.ts
+++ b/apps/edr-freight-web/backoffice/src/services/vehicles.service.ts
@@ -29,6 +29,7 @@ export interface Vehicle {
   code?: string | null;
   powerPlateNo?: string | null;
   trailerPlateNo?: string | null;
+  locationId?: string | null;
   createdAt: string;
   updatedAt: string;
 }
@@ -55,7 +56,7 @@ export const vehiclesService = {
   getById: (id: string) => apiClient.get<Vehicle>(URL_CONSTANTS.VEHICLES.BY_ID(id)),
   create: (data: Partial<SaveVehiclePayload>) =>
     apiClient.post(URL_CONSTANTS.VEHICLES.BASE, data),
-  update: (id: string, data: Partial<SaveVehiclePayload>) =>
+  update: (id: string, data: Partial<SaveVehiclePayload & { locationId?: string | null }>) =>
     apiClient.patch(URL_CONSTANTS.VEHICLES.BY_ID(id), data),
   delete: (id: string) => apiClient.delete(URL_CONSTANTS.VEHICLES.BY_ID(id)),
 };