fix: Make Service.serves_date?/2 use added_stops as a full override #2248
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This accommodates a very specific type of GTFS service, which looks
like
%Services.Service{
added_dates: ["2024-12-05"],
added_dates_notes: %{"2024-12-05" => nil},
description: "Weekday schedule",
end_date: ~D[2024-12-04],
name: "Weekday",
id: "LRV42024-hlb44011-Weekday-01",
removed_dates: [],
removed_dates_notes: %{},
start_date: ~D[2024-11-27],
type: :weekday,
typicality: :typical_service,
valid_days: [1, 2, 3, 5],
rating_start_date: ~D[2024-08-25],
rating_end_date: nil,
rating_description: "Fall"
}
The edge case is when the `valid_days` doesn't include the day of the
week for the `added_date(s)`. When that happens, the added dates
should still be considered served, but the previous version was only
handling that correctly if `valid_days` was `[]`.
anthonyshull
reviewed
Dec 5, 2024
lib/services/service.ex
Outdated
Comment on lines
191
to
192
| |> Enum.reject(fn date -> Enum.member?(removed_dates, date) end) | ||
| |> Enum.reject(fn date -> Timex.weekday(date) not in valid_days end) |
There was a problem hiding this comment.
Credo is going to complain about the double reject. Probably easiest to make it a private function that does both checks.
There was a problem hiding this comment.
Ah yep - I saw that - I used Stream and Credo stopped complaining 🙊
anthonyshull
reviewed
Dec 5, 2024
lib/services/service.ex
Outdated
Comment on lines
193
to
194
| |> Enum.map(&Timex.to_date/1) | ||
| |> Enum.uniq()) ++ parse_listed_dates(added_dates) |
There was a problem hiding this comment.
This syntax is really funky. Would be pretty easy to break it out a little
There was a problem hiding this comment.
Yeah I didn't love it either :\
Will push up a change
thecristen
reviewed
Dec 5, 2024
lib/services/service.ex
Outdated
| dates | ||
| |> Stream.reject(fn date -> Enum.member?(removed_dates, date) end) | ||
| |> Stream.reject(fn date -> Timex.weekday(date) not in valid_days end) | ||
| |> Stream.map(&Timex.to_date/1) |
There was a problem hiding this comment.
You don't need this line anymore
lib/services/service.ex
Outdated
| |> Stream.map(&Timex.to_date/1) | ||
| |> Enum.uniq() | ||
|
|
||
| explicitly_added_dates ++ valid_dates |
There was a problem hiding this comment.
I wonder if you ought to do the Enum.uniq() after this step?
thecristen
approved these changes
Dec 5, 2024
joshlarson
deleted the
jdl/fix-treat-added-stops-in-gtfs-services-correctly
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This accommodates a very specific type of GTFS service, which looks like
The edge case is when the
valid_daysdoesn't include the day of the week for theadded_date(s). When that happens, the added dates should still be considered served, but the previous version was only handling that correctly ifvalid_dayswas[].Before
After