Merge pull request #1207 from Tria-plc/freight/nati-2

Freight/nati 2

apps/edr-freight-api/src/modules/train-scheduling/booking-notifier.service.ts

@@ -11,7 +11,7 @@ import {
 import { Booking } from '../bookings/entities/booking.entity';
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
-import { resolveCompanyNotifyPhone } from '../notifications/resolve-company-phone.util';
+import { resolveCompanyNotifyContact } from '../notifications/resolve-company-phone.util';
 import { TrainSchedulesRepository } from '../train-schedules/train-schedules.repository';
 import { BATCH_TIMEZONE } from './booking-batch.constants';
 
@@ -65,10 +65,11 @@ export class BookingNotifierService {
     logLabel: string,
   ): Promise<void> {
     this.logger.log(`${logLabel} — ${this.ref(b)}`);
-    const phone = b.companyId
-      ? await resolveCompanyNotifyPhone(this.dataSource, b.companyId)
-      : null;
-    const email = b.company?.email ?? b.company?.generalManagerEmail ?? null;
+    // One resolver for both channels — the company row's own email column is
+    // only set for a Fayda-verified owner (see companyNotifyEmailExpr).
+    const { phone, email } = b.companyId
+      ? await resolveCompanyNotifyContact(this.dataSource, b.companyId)
+      : { phone: null, email: null };
 
     if (phone) {
       try {

apps/edr-freight-api/src/modules/train-scheduling/booking-window.service.ts

@@ -14,6 +14,7 @@ import { TrainSchedulesRepository } from '../train-schedules/train-schedules.rep
 import { NotificationsService } from '../notifications/notifications.service';
 import { NotificationInboxService } from '../notification-inbox/notification-inbox.service';
 import {
+  companyNotifyEmailExpr,
   companyNotifyPhoneExpr,
   primaryContactUserJoin,
 } from '../notifications/resolve-company-phone.util';
@@ -649,7 +650,7 @@ export class BookingWindowService implements OnModuleInit {
         `SELECT DISTINCT
                 c.company_id,
                 ${companyNotifyPhoneExpr('co')} AS phone,
-                COALESCE(co.email, co.general_manager_email) AS email
+                ${companyNotifyEmailExpr('co')} AS email
            FROM freight.contract_routes cr
            JOIN freight.contracts c
              ON c.id = cr.contract_id
@@ -761,7 +762,7 @@ export class BookingWindowService implements OnModuleInit {
                 b.id                                        AS "bookingId",
                 b.company_id                                AS "companyId",
                 ${companyNotifyPhoneExpr('co')}             AS phone,
-                COALESCE(co.email, co.general_manager_email) AS email,
+                ${companyNotifyEmailExpr('co')}             AS email,
                 COALESCE(oy.label, oy.code) || ' to ' ||
                 COALESCE(dy.label, dy.code)                 AS corridor
            FROM freight.bookings b