Migration fix

apps/edr-passenger-api/prisma/migrations/20260101000000_add_configurable_fare_system/migration.sql

@@ -107,7 +107,7 @@ CREATE TABLE "system_features" (
     "is_enabled" BOOLEAN NOT NULL DEFAULT false,
     "config" JSONB,
     "created_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updated_at" TIMESTAMP(3) NOT NULL,
+    "updated_at" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
 
     CONSTRAINT "system_features_pkey" PRIMARY KEY ("id")
 );

apps/edr-passenger-api/src/modules/passengers/passengers.service.ts

@@ -115,25 +115,35 @@ export class PassengersService {
         const guestBooking = (passenger as any)?.bookings?.[0] ?? null;
         const guestSeat = guestBooking?.seats?.[0] ?? null;
         
+        // Parse notes JSON to extract phone and other data
+        let notesData: any = null;
+        if (profile.notes) {
+          try {
+            notesData = typeof profile.notes === 'string' ? JSON.parse(profile.notes) : profile.notes;
+          } catch {
+            notesData = null;
+          }
+        }
+        
         return {
           id: profile.id,
           fullName: profile.fullName,
-          email: localUser?.email ?? iam?.email ?? guestBooking?.contactEmail ?? null,
+          email: localUser?.email ?? iam?.email ?? notesData?.email ?? guestBooking?.contactEmail ?? null,
-          phone: localUser?.phone ?? iam?.phone_number ?? guestBooking?.contactPhone ?? null,
+          phone: localUser?.phone ?? iam?.phone_number ?? notesData?.phone ?? guestBooking?.contactPhone ?? null,
           gender: profile.gender ?? localUser?.gender ?? iam?.metadata?.gender ?? null,
           dateOfBirth: profile.dateOfBirth
             ? new Date(profile.dateOfBirth).toISOString().split('T')[0]
             : (localUser?.dateOfBirth
                 ? (localUser.dateOfBirth instanceof Date ? localUser.dateOfBirth.toISOString().split('T')[0] : localUser.dateOfBirth)
                 : iam?.metadata?.dateOfBirth ?? null),
-          nationality: localUser?.nationality ?? iam?.metadata?.nationality ?? (guestSeat?.passportCountry ? (guestSeat.passportCountry === 'Ethiopia' ? 'Ethiopian' : guestSeat.passportCountry) : null),
+          nationality: localUser?.nationality ?? iam?.metadata?.nationality ?? notesData?.nationality ?? (guestSeat?.passportCountry ? (guestSeat.passportCountry === 'Ethiopia' ? 'Ethiopian' : guestSeat.passportCountry) : null),
           nationalityCode: localUser?.nationalityCode ?? iam?.metadata?.nationalityCode ?? null,
           faydaVerified,
           faydaVerifiedAt: localUser?.faydaVerifiedAt ?? iam?.metadata?.faydaVerifiedAt ?? null,
-          passportNumber: localUser?.passportNumber ?? iam?.metadata?.passportNumber ?? guestSeat?.passportNumber ?? null,
+          passportNumber: localUser?.passportNumber ?? iam?.metadata?.passportNumber ?? notesData?.passportNumber ?? guestSeat?.passportNumber ?? null,
-          passportCountry: localUser?.passportCountry ?? iam?.metadata?.passportCountry ?? guestSeat?.passportCountry ?? null,
+          passportCountry: localUser?.passportCountry ?? iam?.metadata?.passportCountry ?? notesData?.passportCountry ?? guestSeat?.passportCountry ?? null,
           passportExpiryDate: localUser?.passportExpiryDate ?? iam?.metadata?.passportExpiryDate ?? null,
-          idDocumentType: profile.nationalId ? 'NATIONAL_ID' : null,
+          idDocumentType: profile.nationalId ? 'NATIONAL_ID' : (notesData?.idDocumentType ?? null),
           verified: faydaVerified,
           lastLoginAt: localUser?.lastLoginAt ?? null,
           role: localUser?.role ?? null,

apps/edr-passenger-api/src/modules/tickets/tickets.service.ts

@@ -54,11 +54,11 @@ export class TicketsService {
         ...(filters.dateTo ? { lte: new Date(new Date(filters.dateTo).setHours(23, 59, 59, 999)) } : {}),
       };
     }
-    // if (filters.coachId) {
+    if (filters.coachId) {
-    //   where.seat = {
+      where.seat = {
-    //     coachId: filters.coachId
+        coachId: filters.coachId
-    //   };
+      };
-    // }
+    }
     
     const [tickets, total] = await Promise.all([
       this.prisma.ticket.findMany({
@@ -67,8 +67,8 @@ export class TicketsService {
           booking: {
             include: {
               schedule: { include: { originStation: true, destinationStation: true, train: true } },
-              returnSchedule: { select: { departureAt: true, arrivalAt: true, originStation: true, destinationStation: true } },
+              returnSchedule: { include: { originStation: true, destinationStation: true } },
-              passenger: { select: { id: true, iamUserId: true } },
+              passenger: { include: { travelerProfiles: true } },
               seats: { include: { seat: { include: { coach: true } } } },
             },
           },
@@ -93,9 +93,41 @@ export class TicketsService {
     return {
       items: tickets.map((t: any) => {
         const iam = t.booking?.passenger?.iamUserId ? iamMap.get(t.booking.passenger.iamUserId) : undefined;
+        
+        // Extract phone from TravelerProfile notes JSON
+        let guestPhone = null;
+        let guestEmail = null;
+        const matchingProfile = t.booking?.passenger?.travelerProfiles?.find((tp: any) => tp.fullName === t.passengerName);
+        
+        // DEBUG: Log to see what we're getting
+        this.logger.debug(`Ticket ${t.id}: passengerName=${t.passengerName}, profiles count=${t.booking?.passenger?.travelerProfiles?.length || 0}, matchingProfile=${!!matchingProfile}`);
+        if (matchingProfile) {
+          this.logger.debug(`Matching profile notes: ${matchingProfile.notes}`);
+        }
+        
+        if (matchingProfile?.notes) {
+          try {
+            const notesData = JSON.parse(matchingProfile.notes);
+            guestPhone = notesData.phone || null;
+            guestEmail = notesData.email || null;
+            this.logger.debug(`Extracted from notes: phone=${guestPhone}, email=${guestEmail}`);
+          } catch (err) {
+            this.logger.error(`Failed to parse notes JSON: ${err}`);
+          }
+        }
+        
+        // Fallback to booking contact info if no match in TravelerProfile
+        if (!guestPhone) guestPhone = t.booking?.contactPhone;
+        if (!guestEmail) guestEmail = t.booking?.contactEmail;
+        
+        this.logger.debug(`Final values: phone=${guestPhone}, email=${guestEmail}`);
+        
         const passengerInfo = iam
           ? { fullName: iam.name?.en ?? iam.name?.am ?? null, email: iam.email, phone: iam.phone_number }
-          : { fullName: 'Guest', email: t.booking?.contactEmail, phone: null };
+          : { fullName: 'Guest', email: guestEmail, phone: guestPhone };
+        
+        this.logger.debug(`Final passenger info: ${JSON.stringify(passengerInfo)}`);
+        
         return {
           id: t.id,
           ticketNumber: t.barcodePayload,

apps/edr-passenger-web/backoffice/src/app/bookings/page.tsx

@@ -185,7 +185,7 @@ function BookingsPageContent() {
       },
     },
     {
-      key: 'contact', label: 'Contact',
+      key: 'contact', label: 'Primary contact',
       render: (booking: any) => (
         <div>
           <div className="font-medium">{booking.contactPhone || booking.passenger?.phone}</div>

apps/edr-passenger-web/backoffice/src/app/tickets/page.tsx

@@ -348,14 +348,8 @@ export default function TicketsPage() {
       key: 'contact',
       label: 'Contact',
       render: (ticket: any) => {
-        // Find the booking seat that matches this ticket's passenger
+        const phone = ticket.booking?.passenger?.phone || 'N/A';
-        const matchingSeat = ticket.booking?.seats?.find((s: any) => 
+        const email = ticket.booking?.passenger?.email || 'N/A';
-          s.passengerName === ticket.passengerName && s.leg === ticket.leg
-        );
-        
-        // Try to get phone from BookingSeat first, then fall back to booking contact
-        const phone = matchingSeat?.phone || ticket.booking?.contactPhone || ticket.booking?.passenger?.phone || 'N/A';
-        const email = matchingSeat?.email || ticket.booking?.contactEmail || ticket.booking?.passenger?.email || 'N/A';
         
         return (
           <div>
@@ -372,16 +366,21 @@ export default function TicketsPage() {
       label: 'Trip',
       render: (ticket: any) => {
         const isRoundTrip = ticket.booking?.bookingType === 'ROUND_TRIP' || ticket.booking?.bookingType === 'ROUND_TRIP_TRANSIT';
-        const returnArrivalAt = ticket.booking?.returnSchedule?.arrivalAt;
+        const returnDeparture = ticket.booking?.returnSchedule?.departureAt;
+        
         return (
           <div>
             <div className="font-medium">
               {ticket.schedule?.originStation?.name || 'N/A'} → {ticket.schedule?.destinationStation?.name || 'N/A'}
             </div>
             <div className="text-xs text-muted-foreground">
-              {ticket.schedule?.departureAt ? formatDateTimeShort(ticket.schedule.departureAt) : 'N/A'}
+              {!isRoundTrip ? (
-              {isRoundTrip && (
+                <span>{ticket.schedule?.departureAt ? formatDateTimeShort(ticket.schedule.departureAt) : 'N/A'}</span>
-                <span> → {returnArrivalAt ? formatDateTimeShort(returnArrivalAt) : 'N/A'}</span>
+              ) : (
+                <span>
+                  {ticket.schedule?.departureAt ? formatDateTimeShort(ticket.schedule.departureAt) : 'N/A'} · 
+                  {returnDeparture ? formatDateTimeShort(returnDeparture) : 'N/A'}
+                </span>
               )}
             </div>
           </div>
@@ -425,9 +424,26 @@ export default function TicketsPage() {
     {
       key: 'arrivalDate',
       label: 'Arrival Date',
-      render: (ticket: any) => (
+      render: (ticket: any) => {
-        <span className="text-sm">{ticket.schedule?.arrivalAt ? new Date(ticket.schedule.arrivalAt).toLocaleDateString() : '—'}</span>
+        const isRoundTrip = ticket.booking?.bookingType === 'ROUND_TRIP' || ticket.booking?.bookingType === 'ROUND_TRIP_TRANSIT';
-      ),
+        const outboundArrival = ticket.schedule?.arrivalAt;
+        const returnArrival = ticket.booking?.returnSchedule?.arrivalAt;
+        
+        if (!isRoundTrip) {
+          return (
+            <span className="text-sm">
+              {outboundArrival ? new Date(outboundArrival).toLocaleDateString() : '—'}
+            </span>
+          );
+        }
+        
+        return (
+          <div className="flex flex-col gap-0.5 text-sm">
+            <span>➡ {outboundArrival ? new Date(outboundArrival).toLocaleDateString() : '—'}</span>
+            <span>⬅ {returnArrival ? new Date(returnArrival).toLocaleDateString() : '—'}</span>
+          </div>
+        );
+      },
     },
     {
       key: 'boardingTimes',