@opentripplanner/core-utils 14.2.3 → 14.3.0

package/src/__tests__/itinerary.ts

@@ -17,6 +17,7 @@ import {
 import bikeRentalItinerary from "./__mocks__/bike-rental-itinerary.json";
 import tncItinerary from "./__mocks__/tnc-itinerary.json";
 import fareProductItinerary from "./__mocks__/fare-products-itinerary.json";
+import complexItinerary from "./__mocks__/complex-fares.json";
 import flexItinerary from "../../../itinerary-body/src/__mocks__/itineraries/flex-itinerary.json";
 import faresv2Itinerary from "../../../itinerary-body/src/__mocks__/itineraries/fares-v2-fare-components.json";
 
@@ -262,6 +263,10 @@ describe("util > itinerary", () => {
       );
       expect(complexResult.amount).toEqual(2.8 * 2);
     });
+    it("should calculate the total cost of an itinerary with multiple v2 fares & transfers", () => {
+      const result = getItineraryCost(complexItinerary.legs, "0", "ADULT");
+      expect(result.amount).toEqual(3.0);
+    });
     it("should calculate the individual leg cost of a fares v2 legs", () => {
       const firstLegResult = getLegCost(faresv2Itinerary.legs[1], "3", "ADULT");
       expect(firstLegResult.price?.amount).toEqual(2);

package/src/itinerary.ts

@@ -713,7 +713,7 @@ export function getItineraryCost(
   riderCategoryId: string | string[] | null
 ): Money | undefined {
   // TODO: Better input type handling
-  if (Array.isArray(mediumId) && Array.isArray(riderCategoryId)) {
+  if (Array.isArray(mediumId) || Array.isArray(riderCategoryId)) {
     if (mediumId?.length !== riderCategoryId.length) {
       console.warn(
         "Invalid input types, only using first item. medium id list and rider category list must have same number of items"
@@ -739,8 +739,15 @@ export function getItineraryCost(
     // Only legs with fares (no walking legs)
     .filter(leg => leg.fareProducts?.length > 0)
     // Get the leg cost object of each leg
-    // @ts-expect-error TS doesn't like our check in the if statement above
-    .map(leg => getLegCost(leg, mediumId, riderCategoryId))
+    .map((leg, index, arr) =>
+      getLegCost(
+        leg,
+        mediumId,
+        riderCategoryId,
+        // We need to include the seen fare ids by gathering all previous leg fare product ids
+        arr.splice(0, index).flatMap(l => l?.fareProducts.map(fp => fp?.id))
+      )
+    )
     .filter(cost => cost.appliedFareProduct?.legPrice !== undefined)
     // Filter out duplicate use IDs
     // One fare product can be used on multiple legs,