Merge branch 'dev' of github.com:Tria-plc/edr-platform into Interchange

apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts

@@ -225,6 +225,16 @@ export class FirstMileService {
     return updated;
   }
 
+  async updateStatus(id: string, status: FirstMileStatus): Promise<FirstMile> {
+    const updated = await this.firstMileRepository.update(id, { status });
+
+    if (!updated) {
+      throw new NotFoundException(`First-mile record ${id} not found`);
+    }
+
+    return updated;
+  }
+
   private async notifyDriverAssignment(vehicleId: string, record: FirstMile): Promise<void> {
     try {
       const vehicle = await this.vehiclesService.findById(vehicleId);

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

@@ -49,4 +49,12 @@ export class CreateVehicleDto {
   @IsOptional()
   @IsString()
   trailerPlateNo?: string;
+
+  @IsOptional()
+  @IsNumber()
+  estimatedDistanceKm?: number;
+
+  @IsOptional()
+  @IsNumber()
+  actualDistanceKm?: number;
 }

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

@@ -62,4 +62,10 @@ export class Vehicle extends BaseEntity {
 
   @Column({ name: 'assigned_driver_name', nullable: true })
   assignedDriverName?: string;
+
+  @Column({ name: 'estimated_distance_km', type: 'numeric', nullable: true })
+  estimatedDistanceKm?: number;
+
+  @Column({ name: 'actual_distance_km', type: 'numeric', nullable: true })
+  actualDistanceKm?: number;
 }