merge conflict fix

apps/edr-freight-api/src/modules/vehicles/dto/create-vehicle.dto.ts

@@ -1,4 +1,4 @@
-import { IsString, IsEnum, IsNumber, IsOptional } from 'class-validator';
+import { IsString, IsEnum, IsNumber, IsOptional, IsUUID } from 'class-validator';
 import { VehicleType, FuelType, VehicleStatus } from '../entities/vehicle.entity';
 
 export class CreateVehicleDto {
@@ -29,4 +29,12 @@ export class CreateVehicleDto {
   @IsOptional()
   @IsString()
   description?: string;
+
+  @IsOptional()
+  @IsUUID()
+  assignedDriverId?: string;
+
+  @IsOptional()
+  @IsString()
+  assignedDriverName?: string;
 }

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

@@ -1,4 +1,4 @@
-import { Entity, Column, Index } from 'typeorm';
+import { Entity, Column } from 'typeorm';
 import { BaseEntity } from '@edr/api-common';
 
 export enum VehicleType {
@@ -26,39 +26,40 @@ export enum VehicleStatus {
 }
 
 @Entity({ name: 'vehicles', schema: 'freight' })
-@Index(['plateNumber'])
-@Index(['registrationNumber'])
-@Index(['status'])
-@Index(['vehicleType'])
-@Index(['manufacturer'])
 export class Vehicle extends BaseEntity {
-  @Column({ name: 'plate_number', unique: true })
-  plateNumber!: string;
+  @Column({ name: 'plate_number', unique: true, nullable: true })
+  plateNumber?: string;
 
-  @Column({ name: 'registration_number', unique: true })
-  registrationNumber!: string;
+  @Column({ name: 'registration_number', unique: true, nullable: true })
+  registrationNumber?: string;
 
-  @Column({ name: 'vehicle_type', type: 'varchar' })
-  vehicleType!: VehicleType;
+  @Column({ name: 'vehicle_type', type: 'varchar', nullable: true })
+  vehicleType?: VehicleType;
 
-  @Column()
-  manufacturer!: string;
+  @Column({ nullable: true })
+  manufacturer?: string;
 
-  @Column()
-  model!: string;
+  @Column({ nullable: true })
+  model?: string;
 
-  @Column()
-  year!: number;
+  @Column({ nullable: true })
+  year?: number;
 
-  @Column({ name: 'fuel_type', type: 'varchar' })
-  fuelType!: FuelType;
+  @Column({ name: 'fuel_type', type: 'varchar', nullable: true })
+  fuelType?: FuelType;
 
-  @Column()
-  capacity!: number;
+  @Column({ nullable: true })
+  capacity?: number;
 
-  @Column({ name: 'status', type: 'varchar', default: VehicleStatus.ACTIVE })
-  status!: VehicleStatus;
+  @Column({ name: 'status', type: 'varchar', default: VehicleStatus.ACTIVE, nullable: true })
+  status?: VehicleStatus;
 
   @Column({ type: 'text', nullable: true })
-  description!: string | null;
+  description?: string | null;
+
+  @Column({ name: 'assigned_driver_id', type: 'uuid', nullable: true })
+  assignedDriverId?: string;
+
+  @Column({ name: 'assigned_driver_name', nullable: true })
+  assignedDriverName?: string;
 }

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

@@ -1,7 +1,7 @@
-import { BaseRepository } from '@edr/api-common';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
+import { BaseRepository } from '@edr/api-common';
 import { Vehicle } from './entities/vehicle.entity';
 
 @Injectable()