Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-30 07:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yaschalew
2026-06-24 14:47:33 +03:00
parent 5eaab8164a f1b9989730
commit 66e45d2cd5
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import { Injectable, NotFoundException } from '@nestjs/common'; import { Injectable, Logger, NotFoundException } from '@nestjs/common';
import { FindOptionsWhere } from 'typeorm'; import { FindOptionsWhere } from 'typeorm';
import { BookingsRepository } from '../bookings/bookings.repository'; import { BookingsRepository } from '../bookings/bookings.repository';
@@ -29,6 +29,8 @@ const SORTABLE_FIELDS: (keyof FirstMile)[] = [
@Injectable() @Injectable()
export class FirstMileService { export class FirstMileService {
private readonly logger = new Logger(FirstMileService.name);
constructor( constructor(
private readonly firstMileRepository: FirstMileRepository, private readonly firstMileRepository: FirstMileRepository,
private readonly bookingsRepository: BookingsRepository, private readonly bookingsRepository: BookingsRepository,
@@ -141,8 +143,8 @@ export class FirstMileService {
throw new NotFoundException(`First-mile record ${id} not found`); throw new NotFoundException(`First-mile record ${id} not found`);
} }
// Notify assigned driver when a vehicle is newly assigned // Notify assigned driver on every explicit vehicle assignment or reassignment
if (dto.vehicleId && dto.vehicleId !== existing.vehicleId) { if (dto.vehicleId) {
void this.notifyDriverAssignment(dto.vehicleId, existing); void this.notifyDriverAssignment(dto.vehicleId, existing);
} }
@@ -152,23 +154,31 @@ export class FirstMileService {
private async notifyDriverAssignment(vehicleId: string, record: FirstMile): Promise<void> { private async notifyDriverAssignment(vehicleId: string, record: FirstMile): Promise<void> {
try { try {
const vehicle = await this.vehiclesService.findById(vehicleId); const vehicle = await this.vehiclesService.findById(vehicleId);
if (!vehicle.assignedDriverId) return; if (!vehicle.assignedDriverId) {
this.logger.warn(`Vehicle ${vehicleId} has no assigned driver — skipping SMS`);
return;
}
const driver = await this.driversService.findById(vehicle.assignedDriverId); const driver = await this.driversService.findById(vehicle.assignedDriverId);
if (!driver.phoneNumber) return; if (!driver.phoneNumber) {
this.logger.warn(`Driver ${vehicle.assignedDriverId} has no phone number — skipping SMS`);
return;
}
const booking = (record as FirstMile & { booking?: { reference?: string; firstMilePickupAddress?: string | null; originYard?: { label?: string } | null } }).booking; const booking = (record as FirstMile & { booking?: { reference?: string; firstMilePickupAddress?: string | null; originYard?: { label?: string } | null } }).booking;
await this.notificationsService.notifyDriverVehicleAssignment({ await this.notificationsService.notifyDriverVehicleAssignment({
driverPhone: driver.phoneNumber, driverPhone: driver.phoneNumber,
driverName: `${driver.firstName} ${driver.lastName}`, driverName: `${driver.firstName ?? ''} ${driver.lastName ?? ''}`.trim(),
vehiclePlateNumber: vehicle.plateNumber ?? vehicleId, vehiclePlateNumber: vehicle.plateNumber ?? vehicleId,
bookingReference: booking?.reference ?? record.bookingId, bookingReference: booking?.reference ?? record.bookingId,
pickupAddress: booking?.firstMilePickupAddress, pickupAddress: booking?.firstMilePickupAddress,
destinationYard: booking?.originYard?.label, destinationYard: booking?.originYard?.label,
}); });
this.logger.log(`SMS sent to driver ${driver.phoneNumber} for vehicle ${vehicleId} assignment`);
} catch (err) { } catch (err) {
// Notification failure must never break the assignment flow this.logger.error(`Failed to notify driver for vehicle ${vehicleId}: ${String(err)}`);
} }
} }