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

apps/edr-freight-api/src/modules/last-mile/last-mile.module.ts

@@ -2,13 +2,22 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { BookingsModule } from '../bookings/bookings.module';
+import { DriversModule } from '../drivers/drivers.module';
+import { NotificationsModule } from '../notifications/notifications.module';
+import { VehiclesModule } from '../vehicles/vehicles.module';
 import { LastMile } from './entities/last-mile.entity';
 import { LastMileController } from './last-mile.controller';
 import { LastMileRepository } from './last-mile.repository';
 import { LastMileService } from './last-mile.service';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([LastMile]), BookingsModule],
+  imports: [
+    TypeOrmModule.forFeature([LastMile]),
+    BookingsModule,
+    VehiclesModule,
+    DriversModule,
+    NotificationsModule,
+  ],
   controllers: [LastMileController],
   providers: [LastMileRepository, LastMileService],
   exports: [LastMileRepository, LastMileService],

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

@@ -1,7 +1,10 @@
-import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, Injectable, Logger, NotFoundException } from '@nestjs/common';
 import { FindOptionsWhere } from 'typeorm';
 
 import { BookingsRepository } from '../bookings/bookings.repository';
+import { DriversService } from '../drivers/drivers.service';
+import { NotificationsService } from '../notifications/notifications.service';
+import { VehiclesService } from '../vehicles/vehicles.service';
 import { CreateLastMileDto } from './dto/create-last-mile.dto';
 import { UpdateLastMileDto } from './dto/update-last-mile.dto';
 import { LastMile, LastMileStatus } from './entities/last-mile.entity';
@@ -26,9 +29,14 @@ const SORTABLE_FIELDS: (keyof LastMile)[] = [
 
 @Injectable()
 export class LastMileService {
+  private readonly logger = new Logger(LastMileService.name);
+
   constructor(
     private readonly lastMileRepository: LastMileRepository,
     private readonly bookingsRepository: BookingsRepository,
+    private readonly vehiclesService: VehiclesService,
+    private readonly driversService: DriversService,
+    private readonly notificationsService: NotificationsService,
   ) {}
 
   async acceptBooking(bookingReference: string): Promise<LastMile> {
@@ -116,7 +124,7 @@ export class LastMileService {
   }
 
   async update(id: string, dto: UpdateLastMileDto): Promise<LastMile> {
-    await this.findById(id);
+    const existing = await this.findById(id);
 
     const updated = await this.lastMileRepository.update(id, {
       ...(dto.bookingId !== undefined ? { bookingId: dto.bookingId } : {}),
@@ -132,9 +140,50 @@ export class LastMileService {
       throw new NotFoundException(`Last-mile record ${id} not found`);
     }
 
+    // Notify assigned driver on every explicit vehicle assignment or reassignment
+    if (dto.vehicleId) {
+      void this.notifyDriverAssignment(dto.vehicleId, existing);
+    }
+
     return updated;
   }
 
+  private async notifyDriverAssignment(vehicleId: string, record: LastMile): Promise<void> {
+    try {
+      const vehicle = await this.vehiclesService.findById(vehicleId);
+      if (!vehicle.assignedDriverId) {
+        this.logger.warn(`Vehicle ${vehicleId} has no assigned driver — skipping SMS`);
+        return;
+      }
+
+      const driver = await this.driversService.findById(vehicle.assignedDriverId);
+      if (!driver.phoneNumber) {
+        this.logger.warn(`Driver ${vehicle.assignedDriverId} has no phone number — skipping SMS`);
+        return;
+      }
+
+      type BookingWithYards = {
+        reference?: string;
+        lastMileDeliveryAddress?: string | null;
+        destinationYard?: { label?: string } | null;
+      };
+      const booking = (record as LastMile & { booking?: BookingWithYards }).booking;
+
+      await this.notificationsService.notifyDriverVehicleAssignment({
+        driverPhone: driver.phoneNumber,
+        driverName: `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim(),
+        vehiclePlateNumber: vehicle.plateNumber ?? vehicleId,
+        bookingReference: booking?.reference ?? record.bookingId,
+        pickupAddress: booking?.destinationYard?.label,
+        destinationYard: booking?.lastMileDeliveryAddress,
+      });
+
+      this.logger.log(`SMS sent to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
+    } catch (err) {
+      this.logger.error(`Failed to notify driver for vehicle ${vehicleId}: ${String(err)}`);
+    }
+  }
+
   async remove(id: string): Promise<void> {
     await this.findById(id);
     await this.lastMileRepository.softDelete(id);