Skip to content

Filter null price fare products #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielhep wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Filter null price fare products #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
def7a45
fix error in handling fp with null price
danielhep Mar 16, 2026
46eeba8
test null price fare produxt
danielhep Mar 17, 2026
00bd838
add test for null price fp
danielhep Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions assertions/src/main/java/org/opentripplanner/assertions/ItineraryAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ public ItineraryAssertions withFarePrice(float price, String riderCategoryId, St
.filter(fp -> fp.product().medium().isPresent())
.filter(fp -> fp.product().riderCategory().get().id().equals(riderCategoryId))
.filter(fp -> fp.product().medium().get().id().equals(mediumId))
.filter(fp -> fp.product().price() != null)
.anyMatch(fp -> fp.product().price().amount().floatValue() == price));
return this;
}
Expand Down
16 changes: 14 additions & 2 deletions assertions/src/test/java/org/opentripplanner/assertions/ItineraryAssertionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ void partialMatchesAndErrorDetailsAreIncluded() {

@Test
void withFarePriceHandlesPositiveAndNegativeMatches() {
List<FareProductUse> fares = List.of(fare(2.75f, "orca:regular", "orca:cash"));
List<FareProductUse> fares =
List.of(fare("orca:regular", "orca:cash"), fare(2.75f, "orca:regular", "orca:cash"));
TripPlan plan =
tripPlan(itinerary(transitLeg("E", "E Line", LegMode.BUS, Duration.ofMinutes(12), fares)));

Expand Down Expand Up @@ -236,7 +237,18 @@ private static Place place(String name) {
name, 10.0f, 10.0f, Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty());
}

private static FareProductUse fare(float amount, String riderCategoryId, String mediumId) {
private static FareProductUse fare(String riderCategoryId, String mediumId) {
return new FareProductUse(
"fare-" + riderCategoryId + "-" + mediumId,
new FareProductUse.FareProduct(
"product-" + riderCategoryId + "-" + mediumId,
"Test fare",
null,
Optional.of(new FareProductUse.FareProduct.RiderCategory(riderCategoryId, "Rider")),
Optional.of(new FareProductUse.FareProduct.FareMedium(mediumId, "Medium"))));
}

private static FareProductUse fare(Float amount, String riderCategoryId, String mediumId) {
return new FareProductUse(
"fare-" + riderCategoryId + "-" + mediumId,
new FareProductUse.FareProduct(
Expand Down