@opentripplanner/core-utils 14.2.4 → 14.3.1

package/src/__tests__/itinerary.ts

@@ -18,6 +18,7 @@ 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 tripleItinerary from "./__mocks__/three-transfer-itinerary.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";
 
@@ -267,6 +268,14 @@ describe("util > itinerary", () => {
       const result = getItineraryCost(complexItinerary.legs, "0", "ADULT");
       expect(result.amount).toEqual(3.0);
     });
+    it("should calculate the total cost of an itinerary with three different fares v2 transfers with different rider categories", () => {
+      const result = getItineraryCost(
+        tripleItinerary.legs,
+        ["0", "0"],
+        ["ADULT", null]
+      );
+      expect(result.amount).toEqual(11.55);
+    });
     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

@@ -735,31 +735,31 @@ export function getItineraryCost(
     return total;
   }
 
-  const legCostsObj = legs
+  const legCosts = legs
     // Only legs with fares (no walking legs)
     .filter(leg => leg.fareProducts?.length > 0)
     // Get the leg cost object of each leg
-    .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))
-      )
+    .reduce<{ seenIds: string[]; legCosts: AppliedFareProduct[] }>(
+      (acc, leg) => {
+        // getLegCost handles filtering out duplicate use IDs
+        // One fare product can be used on multiple legs,
+        // and we don't want to count it more than once.
+        // Use an object keyed by productUseId to deduplicate, then extract prices
+        const { appliedFareProduct, productUseId } = getLegCost(
+          leg,
+          mediumId,
+          riderCategoryId,
+          acc.seenIds
+        );
+        if (!appliedFareProduct) return acc;
+        return {
+          legCosts: [...acc.legCosts, appliedFareProduct],
+          seenIds: [...acc.seenIds, productUseId]
+        };
+      },
+      { seenIds: [], legCosts: [] }
     )
-    .filter(cost => cost.appliedFareProduct?.legPrice !== undefined)
-    // Filter out duplicate use IDs
-    // One fare product can be used on multiple legs,
-    // and we don't want to count it more than once.
-    // Use an object keyed by productUseId to deduplicate, then extract prices
-    .reduce<{ [productUseId: string]: Money }>((acc, cur) => {
-      if (cur.productUseId && acc[cur.productUseId] === undefined) {
-        acc[cur.productUseId] = cur.appliedFareProduct?.legPrice;
-      }
-      return acc;
-    }, {});
-  const legCosts = Object.values(legCostsObj);
+    .legCosts.map(lc => lc.legPrice);
 
   if (legCosts.length === 0) return undefined;
   // Calculate the total