Merge branch 'freight/feature/first_mile_invoice' of github.com:Tria-plc/edr-platform into freight/feature/first_mile_invoice

apps/edr-freight-api/src/migrations/1890000000001-AddVehicleCodeAndPlates.ts

@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+/**
+ * Add code, power_plate_no and trailer_plate_no columns to vehicles.
+ * These fields existed in the DTO and UI form but had no entity columns,
+ * so submitted values were silently dropped.
+ */
+export class AddVehicleCodeAndPlates1890000000001 implements MigrationInterface {
+  name = "AddVehicleCodeAndPlates1890000000001";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.vehicles
+      ADD COLUMN IF NOT EXISTS code varchar,
+      ADD COLUMN IF NOT EXISTS power_plate_no varchar,
+      ADD COLUMN IF NOT EXISTS trailer_plate_no varchar
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+      ALTER TABLE freight.vehicles
+      DROP COLUMN IF EXISTS code,
+      DROP COLUMN IF EXISTS power_plate_no,
+      DROP COLUMN IF EXISTS trailer_plate_no
+    `);
+  }
+}

apps/edr-freight-api/src/modules/vehicles/entities/vehicle.entity.ts

@@ -32,9 +32,18 @@ export enum VehicleAvailability {
 
 @Entity({ name: 'vehicles', schema: 'freight' })
 export class Vehicle extends BaseEntity {
+  @Column({ nullable: true })
+  code?: string;
+
   @Column({ name: 'plate_number', unique: true, nullable: true })
   plateNumber?: string;
 
+  @Column({ name: 'power_plate_no', nullable: true })
+  powerPlateNo?: string;
+
+  @Column({ name: 'trailer_plate_no', nullable: true })
+  trailerPlateNo?: string;
+
   @Column({ name: 'registration_number', unique: true, nullable: true })
   registrationNumber?: string;
 

apps/edr-freight-api/src/modules/vehicles/vehicles.service.ts

@@ -50,7 +50,7 @@ export class VehiclesService {
 
     if (query.search) {
       qb = qb.where(
-        '(v.plateNumber ILIKE :search OR v.manufacturer ILIKE :search OR v.model ILIKE :search)',
+        '(v.plateNumber ILIKE :search OR v.manufacturer ILIKE :search OR v.model ILIKE :search OR v.code ILIKE :search OR v.trailerPlateNo ILIKE :search)',
         { search: `%${query.search}%` },
       );
     }