From 5c36c09daeef81919df457cf0deca2ac1daeaec6 Mon Sep 17 00:00:00 2001
From: natib21 <yaschalew10@gmail.com>
Date: Mon, 29 Jun 2026 12:01:19 +0000
Subject: [PATCH] fix

---
 .../modules/first-mile/first-mile.service.ts  | 21 +++++++++++-------
 .../modules/last-mile/last-mile.service.ts    | 22 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts b/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
index a06f9eb87..48aa23084 100644
--- a/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
+++ b/apps/edr-freight-api/src/modules/first-mile/first-mile.service.ts
@@ -4,6 +4,7 @@ import { FindOptionsWhere } from 'typeorm';
 import { BookingsRepository } from '../bookings/bookings.repository';
 import { DriversService } from '../drivers/drivers.service';
 import { NotificationsService } from '../notifications/notifications.service';
+import { SmsClientService } from '../notifications/sms-client.service';
 import { VehiclesService } from '../vehicles/vehicles.service';
 import { CreateFirstMileDto } from './dto/create-first-mile.dto';
 import { UpdateFirstMileDto } from './dto/update-first-mile.dto';
@@ -37,6 +38,7 @@ export class FirstMileService {
     private readonly vehiclesService: VehiclesService,
     private readonly driversService: DriversService,
     private readonly notificationsService: NotificationsService,
+    private readonly smsClient: SmsClientService,
   ) {}
 
   /**
@@ -251,16 +253,19 @@ export class FirstMileService {
 
       const booking = (record as FirstMile & { booking?: { reference?: string; firstMilePickupAddress?: string | null; originYard?: { label?: string } | null } }).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?.firstMilePickupAddress,
-        destinationYard: booking?.originYard?.label,
+      const driverName = `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim();
+      const message =
+        `Dear ${driverName}, you have been assigned to a first-mile pickup. ` +
+        `Booking: ${booking?.reference ?? record.bookingId}. Vehicle: ${vehicle.plateNumber ?? vehicleId}. ` +
+        (booking?.firstMilePickupAddress ? `Pickup: ${booking.firstMilePickupAddress}. ` : '') +
+        (booking?.originYard?.label ? `Destination: ${booking.originYard.label}.` : '');
+
+      void this.smsClient.sendSms({
+        to: driver.phoneNumber,
+        message,
       });
 
-      this.logger.log(`SMS sent to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
+      this.logger.log(`SMS queued to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
     } catch (err) {
       this.logger.error(`Failed to notify driver for vehicle ${vehicleId}: ${String(err)}`);
     }
diff --git a/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts b/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
index 2e8fb2463..998d28c68 100644
--- a/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/last-mile.service.ts
@@ -4,6 +4,7 @@ import { FindOptionsWhere } from 'typeorm';
 import { BookingsRepository } from '../bookings/bookings.repository';
 import { DriversService } from '../drivers/drivers.service';
 import { NotificationsService } from '../notifications/notifications.service';
+import { SmsClientService } from '../notifications/sms-client.service';
 import { VehiclesService } from '../vehicles/vehicles.service';
 import { CreateLastMileDto } from './dto/create-last-mile.dto';
 import { UpdateLastMileDto } from './dto/update-last-mile.dto';
@@ -32,12 +33,12 @@ 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,
+    private readonly smsClient: SmsClientService,
   ) {}
 
   async acceptBooking(bookingReference: string): Promise<LastMile | null> {
@@ -185,16 +186,19 @@ export class LastMileService {
       };
       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,
+      const driverName = `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim();
+      const message =
+        `Dear ${driverName}, you have been assigned to a last-mile delivery. ` +
+        `Booking: ${booking?.reference ?? record.bookingId}. Vehicle: ${vehicle.plateNumber ?? vehicleId}. ` +
+        (booking?.destinationYard?.label ? `Pickup: ${booking.destinationYard.label}. ` : '') +
+        (booking?.lastMileDeliveryAddress ? `Destination: ${booking.lastMileDeliveryAddress}.` : '');
+
+      void this.smsClient.sendSms({
+        to: driver.phoneNumber,
+        message,
       });
 
-      this.logger.log(`SMS sent to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
+      this.logger.log(`SMS queued to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
     } catch (err) {
       this.logger.error(`Failed to notify driver for vehicle ${vehicleId}: ${String(err)}`);
     }