@sabstravtech/obtservices 0.2.2606301620 → 0.2.2607131200

package/angular/lib/vendor/services/chatbot-taxi-search.service.d.ts

@@ -2,18 +2,22 @@ import { ChatSearchParameters, ChatbotTravelHandler } from '@sabstravtech/obtser
 import { ChatbotService } from './chatbot.service';
 import { EnterpriseSearchService } from './search.service';
 import { ResultAwareService } from './result-aware.service';
+import { UserService } from './user.service';
 import * as i0 from "@angular/core";
 export declare class ChatbotTaxiSearchService implements ChatbotTravelHandler {
     private chatbotService;
     private searchService;
     private resultAwareService;
+    private userService;
     readonly travelType: "taxi";
-    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, resultAwareService: ResultAwareService);
+    constructor(chatbotService: ChatbotService, searchService: EnterpriseSearchService, resultAwareService: ResultAwareService, userService: UserService);
     handle(parameters: ChatSearchParameters, autoSearch: boolean): Promise<void>;
     private runSearch;
     private buildTaxiCards;
     private injectNoResultsMessage;
     private populateTaxiParams;
+    private searchAndResolveGeoLocation;
+    private locationDataToResolved;
     private resolveGeoLocation;
     private matchTerminal;
     static ɵfac: i0.ɵɵFactoryDeclaration<ChatbotTaxiSearchService, never>;

package/base/lib/vendor/classes/cabhire-enterprise-search.d.ts

@@ -91,6 +91,15 @@ export declare class CabHireEnterpriseSearch<CH_Q extends CabhireQuoteFetcherTyp
         key: string;
         value: string;
     }[]);
+    private _viaTerminals;
+    get viaTerminals(): {
+        key: string;
+        value: string;
+    }[];
+    set viaTerminals(value: {
+        key: string;
+        value: string;
+    }[]);
     private _time;
     get time(): string;
     set time(value: string);

package/base/lib/vendor/interfaces/Icabhire-enterprise-search.d.ts

@@ -109,6 +109,10 @@ export interface CabHireEnterpriseSearchInterface extends BaseEnterpriseSearch<C
         key: string;
         value: string;
     }[];
+    viaTerminals: {
+        key: string;
+        value: string;
+    }[];
     time: string;
     departs: moment.Moment;
     adults: number;

package/base/lib/vendor/interfaces/chatbot.types.d.ts

@@ -153,11 +153,24 @@ export interface ChatSearchParameters {
     timeFlexibility?: number;
     refundableOnly?: boolean;
     via?: string;
+    viaLocationData?: string;
+    viaFlightNumber?: string;
+    viaFlightTime?: string;
+    viaCarrier?: string;
     vehicleType?: string;
     pickupTerminal?: string;
     pickupFlightNumber?: string;
+    pickupFlightTime?: string;
+    pickupCarrier?: string;
+    pickupLocationData?: string;
     dropoffTerminal?: string;
     dropoffFlightNumber?: string;
+    dropoffFlightTime?: string;
+    dropoffCarrier?: string;
+    dropoffLocationData?: string;
+    limoType?: string;
+    transportType?: string;
+    limoAsDirectedDuration?: number;
     locationCode?: string;
     flight?: string;
     terminal?: string;
@@ -265,6 +278,9 @@ export interface ChatFlightFareTicket {
     /** True when this fare belongs to a separately-priced inbound (dual-single)
      *  leg, so the Fare Rules lookup reads the inbound raw journeys array. */
     isReturnLeg?: boolean;
+    /** True when this fare belongs to a multi-city itinerary, so the Fare Rules
+     *  modal shows every leg's segment cards (matching the results page). */
+    isMultiCity?: boolean;
 }
 /** Flight fare breakdown for the expandable panel on a chat flight card. */
 export interface ChatFlightFareBreakdown {

package/fesm2022/sabstravtech-obtservices-angular.mjs

@@ -17680,8 +17680,9 @@ class ResultAwareService {
         const searchParams = this.searchService.searches[ServiceType.Flight];
         if (typeof searchParams?.openFlightFareRules !== 'function')
             return;
-        const { rules, flights } = makeFareRules(journey, FlightDirectionEnum.Outbound);
-        const isReturn = (journey.inboundFlights?.length ?? 0) > 0;
+        const isMultiCity = !!ticket.isMultiCity;
+        const { rules, flights } = makeFareRules(journey, FlightDirectionEnum.Outbound, isMultiCity);
+        const isReturn = !isMultiCity && (journey.inboundFlights?.length ?? 0) > 0;
         let inboundRules = null;
         let inboundFlights = null;
         if (isReturn) {
@@ -17689,7 +17690,9 @@ class ResultAwareService {
             inboundRules = inbound.rules;
             inboundFlights = inbound.flights;
         }
-        const flightDetail = isReturn ? journey : null;
+        // Pass the whole itinerary as flightDetail so the modal renders every leg's
+        // segment cards — matching the results page for both returns and multi-city.
+        const flightDetail = isMultiCity || isReturn ? journey : null;
         searchParams.openFlightFareRules(rules, flights, journey.sourceId, { centered: true, size: 'xl' }, null, flightDetail, inboundRules, inboundFlights);
     }
     collectFareTickets(journey, sections, journeyIndex, isReturnLeg) {
@@ -19477,7 +19480,7 @@ class ChatbotFlightSearchService {
      * For combined-return journeys the key includes both outbound + inbound
      * flight numbers; for dual-single legs it's just that leg's numbers.
      */
-    indexFaresByFlights(raw, includeInbound, isReturnLeg = false) {
+    indexFaresByFlights(raw, includeInbound, isReturnLeg = false, isMultiCity = false) {
         const map = new Map();
         if (!raw?.length)
             return map;
@@ -19485,7 +19488,7 @@ class ChatbotFlightSearchService {
             const key = this.flightSignature(it, includeInbound);
             if (!key)
                 return;
-            const fare = this.toFareTicket(it, idx, isReturnLeg);
+            const fare = this.toFareTicket(it, idx, isReturnLeg, isMultiCity);
             if (!fare)
                 return;
             const arr = map.get(key) ?? [];
@@ -19518,7 +19521,7 @@ class ChatbotFlightSearchService {
             .join('/');
         return `${out}|${inn}`;
     }
-    toFareTicket(it, idx, isReturnLeg = false) {
+    toFareTicket(it, idx, isReturnLeg = false, isMultiCity = false) {
         const price = it?.total?.price;
         if (!(price > 0))
             return null;
@@ -19541,7 +19544,8 @@ class ChatbotFlightSearchService {
             price,
             currency: it?.total?.currency || 'GBP',
             journeyIndex: idx,
-            isReturnLeg: isReturnLeg || undefined
+            isReturnLeg: isReturnLeg || undefined,
+            isMultiCity: isMultiCity || undefined
         };
     }
     /**
@@ -19583,7 +19587,7 @@ class ChatbotFlightSearchService {
             }
         }
         const sorted = [...bySig.values()];
-        const fareIndex = this.indexFaresByFlights(journeys, false, false);
+        const fareIndex = this.indexFaresByFlights(journeys, false, false, true);
         const cards = [];
         for (let i = 0; i < Math.min(MAX_FLIGHT_CARDS, sorted.length); i++) {
             const journey = sorted[i];
@@ -21505,11 +21509,13 @@ class ChatbotTaxiSearchService {
     chatbotService;
     searchService;
     resultAwareService;
+    userService;
     travelType = 'taxi';
-    constructor(chatbotService, searchService, resultAwareService) {
+    constructor(chatbotService, searchService, resultAwareService, userService) {
         this.chatbotService = chatbotService;
         this.searchService = searchService;
         this.resultAwareService = resultAwareService;
+        this.userService = userService;
     }
     async handle(parameters, autoSearch) {
         this.searchService.resetSearchChosenObjects();
@@ -21520,6 +21526,12 @@ class ChatbotTaxiSearchService {
         if (autoSearch) {
             this.chatbotService.setSearching(true, 'taxi');
         }
+        if (this.searchService.travellerInformation.value.length === 0) {
+            const selfTraveller = this.userService.createSelfTraveller();
+            if (selfTraveller) {
+                this.searchService.addTraveller(selfTraveller);
+            }
+        }
         await this.populateTaxiParams(parameters);
         if (!autoSearch) {
             return;
@@ -21618,11 +21630,34 @@ class ChatbotTaxiSearchService {
         if (parameters.vehicleType) {
             taxiSearch.vehicleType = parameters.vehicleType;
         }
+        else {
+            taxiSearch.vehicleType = CabHireVehicleType.Any;
+        }
+        if (parameters.limoType) {
+            taxiSearch.limoType = parameters.limoType;
+        }
+        if (parameters.transportType) {
+            taxiSearch.transportType = parameters.transportType;
+        }
+        if (parameters.limoAsDirectedDuration) {
+            taxiSearch.limoAsDirectedDuration = parameters.limoAsDirectedDuration;
+        }
         const [fromResolved, toResolved, viaResolved] = await Promise.all([
-            this.resolveGeoLocation(parameters.departure, taxiSearch),
-            this.resolveGeoLocation(parameters.arrival, taxiSearch),
-            parameters.via ? this.resolveGeoLocation(parameters.via, taxiSearch) : Promise.resolve(null),
+            parameters.pickupLocationData
+                ? this.locationDataToResolved(parameters.pickupLocationData, taxiSearch)
+                : this.searchAndResolveGeoLocation(parameters.departure, taxiSearch),
+            parameters.dropoffLocationData
+                ? this.locationDataToResolved(parameters.dropoffLocationData, taxiSearch)
+                : this.searchAndResolveGeoLocation(parameters.arrival, taxiSearch),
+            parameters.viaLocationData
+                ? this.locationDataToResolved(parameters.viaLocationData, taxiSearch)
+                : parameters.via ? this.searchAndResolveGeoLocation(parameters.via, taxiSearch) : Promise.resolve(null),
         ]);
+        // Clear via if this search has no stop
+        if (!parameters.via && !parameters.viaLocationData) {
+            taxiSearch.viasTo = null;
+            taxiSearch.viaTerminals = [];
+        }
         if (fromResolved) {
             const { result, address } = fromResolved;
             if (result.terminals?.length) {
@@ -21634,6 +21669,12 @@ class ChatbotTaxiSearchService {
             if (parameters.pickupFlightNumber) {
                 address.FlightNumber = parameters.pickupFlightNumber;
             }
+            if (parameters.pickupCarrier) {
+                address.Carrier = parameters.pickupCarrier;
+            }
+            if (parameters.pickupFlightTime) {
+                address.FlightTrainDateTime = parameters.pickupFlightTime;
+            }
             taxiSearch.fromAddress = address;
         }
         if (toResolved) {
@@ -21647,37 +21688,70 @@ class ChatbotTaxiSearchService {
             if (parameters.dropoffFlightNumber) {
                 address.FlightNumber = parameters.dropoffFlightNumber;
             }
+            if (parameters.dropoffCarrier) {
+                address.Carrier = parameters.dropoffCarrier;
+            }
+            if (parameters.dropoffFlightTime) {
+                address.FlightTrainDateTime = parameters.dropoffFlightTime;
+            }
             taxiSearch.toAddress = address;
         }
         if (viaResolved) {
-            taxiSearch.viasTo = viaResolved.address;
+            const { result, address } = viaResolved;
+            if (result.terminals?.length) {
+                taxiSearch.viaTerminals = result.terminals;
+            }
+            if (parameters.viaFlightNumber)
+                address.FlightNumber = parameters.viaFlightNumber;
+            if (parameters.viaCarrier)
+                address.Carrier = parameters.viaCarrier;
+            if (parameters.viaFlightTime)
+                address.FlightTrainDateTime = parameters.viaFlightTime;
+            taxiSearch.viasTo = address;
         }
     }
-    async resolveGeoLocation(searchTerm, taxiSearch) {
+    async searchAndResolveGeoLocation(searchTerm, taxiSearch) {
         if (!searchTerm)
             return null;
         try {
             const results = await firstValueFrom(this.searchService.getGeoLocations(searchTerm));
             if (results?.length) {
-                const term = searchTerm.toLowerCase();
+                const term = searchTerm.toLowerCase().trim();
+                const isIataCode = /^[a-z]{3}$/.test(term);
                 let location = results[0];
-                if (term.includes('airport')) {
-                    location = results.find((r) => r.type === 'Airport') ?? results[0];
+                if (term.includes('airport') || isIataCode) {
+                    location = results.find((r) => r.type === LocationTypes.Airport) ?? results[0];
                 }
                 else if (term.includes('station') || term.includes('rail')) {
-                    location = results.find((r) => r.type === 'Train Station') ?? results[0];
-                }
-                const address = taxiSearch.getAddress(location);
-                if (location.type === 'Airport' && !address?.Town) {
-                    address.Town = location.name;
+                    location = results.find((r) => r.type === LocationTypes.TrainStation) ?? results[0];
                 }
-                return { result: location, address };
+                return this.resolveGeoLocation(location, taxiSearch);
             }
         }
         catch {
         }
         return null;
     }
+    locationDataToResolved(locationDataJson, taxiSearch) {
+        try {
+            const location = JSON.parse(locationDataJson);
+            // terminals from GetGeoLocationResult are raw string[] — process same as _getGeoLocations does
+            if (Array.isArray(location.terminals)) {
+                location.terminals = this.searchService.processTerminals(location.terminals);
+            }
+            return Promise.resolve(this.resolveGeoLocation(location, taxiSearch));
+        }
+        catch {
+            return Promise.resolve(null);
+        }
+    }
+    resolveGeoLocation(location, taxiSearch) {
+        const address = taxiSearch.getAddress(location);
+        if (location.type === LocationTypes.Airport && !address?.Town) {
+            address.Town = location.name;
+        }
+        return { result: location, address };
+    }
     matchTerminal(aiTerminal, terminals) {
         const t = aiTerminal.toLowerCase().trim();
         if (!t || t.includes('any') || t.includes('main'))
@@ -21688,13 +21762,13 @@ class ChatbotTaxiSearchService {
         const byKey = terminals.find((x) => x.key.toLowerCase().includes(t) || t.includes(x.value.toLowerCase()));
         return byKey ? byKey.key : null;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.20", ngImport: i0, type: ChatbotTaxiSearchService, deps: [{ token: ChatbotService }, { token: EnterpriseSearchService }, { token: ResultAwareService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.20", ngImport: i0, type: ChatbotTaxiSearchService, deps: [{ token: ChatbotService }, { token: EnterpriseSearchService }, { token: ResultAwareService }, { token: UserService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.20", ngImport: i0, type: ChatbotTaxiSearchService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.20", ngImport: i0, type: ChatbotTaxiSearchService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: () => [{ type: ChatbotService }, { type: EnterpriseSearchService }, { type: ResultAwareService }] });
+        }], ctorParameters: () => [{ type: ChatbotService }, { type: EnterpriseSearchService }, { type: ResultAwareService }, { type: UserService }] });
 
 /** Safety timeout (ms) waiting for eurostar results. */
 const EUROSTAR_RESULTS_WAIT_MS = 60_000;