-
Notifications
You must be signed in to change notification settings - Fork 16
feat(ScheduleFinderLive): services picker #2849
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.
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
thecristen
wants to merge
9
commits into
main
Choose a base branch
from
cbj/sf2.0-service-pick
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+737
−231
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
9c6b425
wip(ScheduleFinderLive): a new services picker!
thecristen d4ec935
fix broken tests
thecristen 8726857
refactor(Dotcom.ServicePatterns): shared logic
thecristen bb54acf
cleanup/update with main
thecristen 928c11b
fix dialyzer
thecristen ef84349
Update lib/dotcom/schedule_finder/service_groups.ex
thecristen fddf2e4
feedback: fix test warning
thecristen b40cbd8
fixup: remove more test flakiness
thecristen bfef12b
feedback(ServiceGroups): clearer mapping/sorting
thecristen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| defmodule Dotcom.ScheduleFinder.ServiceGroup do | ||
| @moduledoc """ | ||
| A group of services sharing a similar timeframe or trait, such as future, | ||
| current, holiday, planned work. | ||
| """ | ||
|
|
||
| alias Dotcom.ServicePatterns | ||
|
|
||
| defstruct [:services, :group_label] | ||
|
|
||
| @type t :: %__MODULE__{ | ||
| group_label: String.t(), | ||
| services: [ | ||
| %{ | ||
| label: String.t(), | ||
| next_date: Date.t() | nil, | ||
| now_date: Date.t() | nil, | ||
| last_service_date: Date.t() | ||
| } | ||
| ] | ||
| } | ||
|
|
||
| @spec for_route(Routes.Route.id_t(), Date.t()) :: [__MODULE__.t()] | ||
| def for_route(route_id, current_date) do | ||
| route_id | ||
| |> ServicePatterns.for_route() | ||
| |> Enum.map(fn sp -> | ||
| %{ | ||
| now_date: if(current_date in sp.dates, do: current_date), | ||
| next_date: nil, | ||
| service_pattern: sp | ||
| } | ||
| end) | ||
| |> tag_next_available(current_date) | ||
| |> Enum.group_by(& &1.service_pattern.group_label) | ||
| |> Enum.sort_by(&group_sort_order/1) | ||
| |> Enum.map(&to_service_group/1) | ||
| end | ||
|
|
||
| defp tag_next_available([], _), do: [] | ||
|
|
||
| defp tag_next_available(service_patterns, current_date) do | ||
| if Enum.any?(service_patterns, & &1.now_date) do | ||
| service_patterns | ||
| else | ||
| next_date = | ||
| service_patterns | ||
| |> Enum.flat_map(& &1.service_pattern.dates) | ||
| |> Enum.sort(Date) | ||
| |> Enum.find(&Date.after?(&1, current_date)) | ||
|
|
||
| if next_date do | ||
| Enum.map(service_patterns, &maybe_add_next_date(&1, next_date)) | ||
| else | ||
| service_patterns | ||
| end | ||
| end | ||
| end | ||
|
|
||
| defp maybe_add_next_date(%{service_pattern: %{dates: dates}} = service_pattern, next_date) do | ||
| if next_date in dates do | ||
| %{service_pattern | next_date: next_date} | ||
| else | ||
| service_pattern | ||
| end | ||
| end | ||
|
|
||
| defp group_sort_order({{group_key, _}, _}) do | ||
| [:current, :future, :extra, :holiday, :planned] | ||
| |> Enum.find_index(&(&1 == group_key)) | ||
| end | ||
|
|
||
| defp to_service_group({{_, group_label}, patterns}) do | ||
| %__MODULE__{ | ||
| group_label: group_label, | ||
| services: | ||
| patterns | ||
| |> Enum.sort_by(&pattern_mapper(&1.service_pattern.service_label)) | ||
| |> Enum.map(fn pattern -> | ||
| Map.take(pattern, [:next_date, :now_date]) | ||
| |> Map.put(:label, pattern_label(pattern)) | ||
| |> Map.put(:last_service_date, pattern_date(pattern)) | ||
| end) | ||
| } | ||
| end | ||
|
|
||
| # Sort such that typical patterns are first, in a specified ordering, followed | ||
| # by patterns with the other typicalities, ordered by date. Use label or | ||
| # description as the tie-breaker. | ||
| defp pattern_mapper({:typical, type_key, label}) do | ||
| index = | ||
| [:monday_thursday, :friday, :weekday, :saturday, :sunday, :weekend] | ||
| |> Enum.find_index(&(&1 == type_key)) | ||
|
|
||
| {0, index, label} | ||
| end | ||
|
|
||
| defp pattern_mapper({typicality, first_date, description}) do | ||
| {1, typicality, to_string(first_date), description} | ||
| end | ||
|
|
||
| defp pattern_label(%{service_pattern: %{service_label: {_, _, label}}}), do: label | ||
|
|
||
| defp pattern_date(%{service_pattern: %{dates: dates}}), do: List.last(dates) | ||
| end |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,10 @@ defmodule Dotcom.ServicePatterns do | |
| Information about transit service! | ||
| """ | ||
|
|
||
| use Dotcom.Gettext.Sigils | ||
|
|
||
| alias Dotcom.Utils.ServiceDateTime | ||
| alias Services.Service | ||
|
|
||
| @services_repo Application.compile_env!(:dotcom, :repo_modules)[:services] | ||
|
|
||
|
|
@@ -23,6 +26,260 @@ defmodule Dotcom.ServicePatterns do | |
| opts | ||
| |> Keyword.fetch!(:route) | ||
| |> @services_repo.by_route_id() | ||
| |> Enum.any?(&Services.Service.serves_date?(&1, date)) | ||
| |> Enum.any?(&Service.serves_date?(&1, date)) | ||
| end | ||
|
|
||
| @spec for_route(Routes.Route.id_t()) :: [Service.t()] | ||
| def for_route(route_id) do | ||
| route_id | ||
| |> @services_repo.by_route_id() | ||
| |> Stream.reject(&(&1.typicality == :canonical)) | ||
| |> Stream.flat_map(&unwrap_multiple_holidays/1) | ||
| |> Stream.map(&add_single_date_description/1) | ||
| |> Stream.map(&adjust_planned_description/1) | ||
| |> Enum.reject(&Date.before?(&1.end_date, ServiceDateTime.service_date())) | ||
| |> dedup_identical_services() | ||
| |> dedup_similar_services() | ||
| |> to_service_pattern() | ||
| end | ||
|
|
||
| defp unwrap_multiple_holidays( | ||
| %{typicality: :holiday_service, added_dates: added_dates} = service | ||
| ) | ||
| when length(added_dates) > 1 do | ||
| for added_date <- added_dates do | ||
| %{ | ||
| service | ||
| | added_dates: [added_date], | ||
| added_dates_notes: Map.take(service.added_dates_notes, [added_date]) | ||
| } | ||
| end | ||
| end | ||
|
|
||
| defp unwrap_multiple_holidays(service), do: [service] | ||
|
|
||
| defp add_single_date_description( | ||
| %{ | ||
| added_dates: [single_date], | ||
| added_dates_notes: added_dates_notes, | ||
| typicality: typicality | ||
| } = service | ||
| ) | ||
| when typicality in [:extra_service, :holiday_service] do | ||
| date_note = Map.get(added_dates_notes, single_date) || service.description | ||
|
|
||
| formatted_date = | ||
| single_date | ||
| |> Date.from_iso8601!() | ||
| |> format_tiny_date() | ||
|
|
||
| %{ | ||
| service | ||
| | description: "#{date_note}, #{formatted_date}" | ||
| } | ||
| end | ||
|
|
||
| defp add_single_date_description(service), do: service | ||
|
|
||
| defp format_tiny_date(date), do: Dotcom.Utils.Time.format!(date, :month_day_short) | ||
|
|
||
| defp adjust_planned_description(%{typicality: :planned_disruption} = service) do | ||
| dates = | ||
| if service.start_date == service.end_date do | ||
| " (#{format_tiny_date(service.start_date)})" | ||
| else | ||
| " (#{format_tiny_date(service.start_date)} - #{format_tiny_date(service.end_date)})" | ||
| end | ||
|
|
||
| Map.update!(service, :description, &(&1 <> dates)) | ||
| end | ||
|
|
||
| defp adjust_planned_description(service), do: service | ||
|
|
||
| defp dedup_identical_services(services) do | ||
| services | ||
| |> Enum.group_by(fn service -> | ||
| {service.start_date, service.end_date, service.valid_days, service.removed_dates, | ||
| service.added_dates} | ||
| end) | ||
| |> Enum.map(fn {_key, [service | _rest]} -> | ||
| service | ||
| end) | ||
| end | ||
|
|
||
| # If we have two services A and B with the same type and typicality, | ||
| # with the date range from A's start to A's end a subset of the date | ||
| # range from B's start to B's end, either A is in the list of services | ||
| # erroneously (for example, in the case of the 39 in the fall 2019 | ||
| # rating), or A represents a special service that's not a holiday (for | ||
| # instance, the Thanksgiving-week extra service to Logan on the SL1 in | ||
| # the fall 2019 rating). | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Was this comment copy-pasted from somewhere? The fall 2019 rating was a long time ago
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yup!! |
||
| # | ||
| # However, in neither of these cases do we want to show service A. In the | ||
| # first case, we don't want to show A because it's erroneous, and in the | ||
| # second case, we don't want to show A for parity with the paper/PDF | ||
| # schedules, in which these special services are not generally called | ||
| # out. | ||
|
|
||
| @spec dedup_similar_services([Service.t()]) :: [Service.t()] | ||
| defp dedup_similar_services(services) do | ||
| services | ||
| |> Enum.group_by(&{&1.type, &1.typicality, &1.rating_description}) | ||
| |> Enum.flat_map(fn {_, service_group} -> | ||
| service_group | ||
| |> drop_extra_weekday_schedule_if_friday_present() | ||
| |> then(fn services -> | ||
| Enum.reject(services, &service_completely_overlapped?(&1, services)) | ||
| end) | ||
| end) | ||
| end | ||
|
|
||
| # If there's a Friday service and two overlapping weekday schedules, we want to show the Monday-Thursday one rather than the Monday-Friday one. | ||
| defp drop_extra_weekday_schedule_if_friday_present(services) do | ||
| if Enum.find(services, &Service.friday_typical_service?/1) && | ||
| Enum.find(services, &Service.monday_to_thursday_typical_service?/1) do | ||
| Enum.reject(services, &(&1.valid_days == [1, 2, 3, 4, 5])) | ||
| else | ||
| services | ||
| end | ||
| end | ||
|
|
||
| defp service_completely_overlapped?(%{typicality: :holiday_service}, _), do: false | ||
|
|
||
| defp service_completely_overlapped?(service, services) do | ||
| Enum.any?(services, fn other_service -> | ||
| # There's an other service that | ||
| # - starts earlier/same time as this service | ||
| # - and ends later/same time as this service | ||
| # - and covers the same valid_days as this service | ||
| other_service != service && String.contains?(service.name, other_service.name) && | ||
| Date.compare(other_service.start_date, service.start_date) != :gt && | ||
| Date.compare(other_service.end_date, service.end_date) != :lt && | ||
| Enum.all?(service.valid_days, &Enum.member?(other_service.valid_days, &1)) | ||
| end) | ||
| end | ||
|
|
||
| defp to_service_pattern(services) do | ||
| services | ||
| |> Enum.map(fn service -> | ||
| %{ | ||
| service: service, | ||
| dates: Service.all_valid_dates_for_service(service), | ||
| group_label: group_label(service) | ||
| } | ||
| end) | ||
| |> merge_similar_typical() | ||
| end | ||
|
|
||
| def group_label(service) do | ||
| case service.typicality do | ||
| :holiday_service -> | ||
| {:holiday, ~t"Holiday Schedules"} | ||
|
|
||
| :extra_service -> | ||
| {:extra, ~t"Extra Service"} | ||
|
|
||
| :planned_disruption -> | ||
| {:planned, gettext("%{rating} Planned Work", rating: service.rating_description)} | ||
|
|
||
| _ -> | ||
| typical_service_group(service) | ||
| end | ||
| end | ||
|
|
||
| defp typical_service_group( | ||
| %Service{ | ||
| rating_description: rating_description, | ||
| rating_end_date: rating_end_date, | ||
| rating_start_date: rating_start_date | ||
| } = service | ||
| ) do | ||
| start_date = short_format(rating_start_date) | ||
|
|
||
| if Service.in_current_rating?(service) do | ||
| label = | ||
| if rating_end_date do | ||
| gettext("%{rating} Schedules, ends %{date}", | ||
| rating: rating_description, | ||
| date: short_format(rating_end_date) | ||
| ) | ||
| else | ||
| gettext("%{rating} Schedules, starts %{date}", | ||
| rating: rating_description, | ||
| date: start_date | ||
| ) | ||
| end | ||
|
|
||
| {:current, label} | ||
| else | ||
| if Service.in_future_rating?(service) do | ||
| label = | ||
| gettext("%{rating} Schedules, starts %{date}", | ||
| rating: rating_description, | ||
| date: start_date | ||
| ) | ||
|
|
||
| {:future, label} | ||
| else | ||
| {:other, ~t"Other Schedules"} | ||
| end | ||
| end | ||
| end | ||
|
|
||
| defp short_format(date) do | ||
| case Dotcom.Utils.Time.format(date, :month_day_short) do | ||
| {:ok, value} -> value | ||
| _ -> nil | ||
| end | ||
| end | ||
|
|
||
| defp merge_similar_typical(all) do | ||
| all | ||
| |> Enum.group_by(&similar_typical_items/1) | ||
| |> Enum.map(&merge_items/1) | ||
| end | ||
|
|
||
| defp similar_typical_items(%{ | ||
| dates: dates, | ||
| service: %Service{typicality: :typical_service} = service | ||
| }) do | ||
| typical_groups = [ | ||
| {:monday_thursday, ~t"Monday - Thursday schedules", | ||
| fn s -> | ||
| s.type == :weekday && | ||
| (s.valid_days == [1, 2, 3, 4] || s.description =~ "Monday - Thursday") | ||
| end}, | ||
| {:friday, ~t"Friday schedules", | ||
| fn s -> | ||
| s.type == :weekday && (s.valid_days == [5] || s.description =~ "Friday") | ||
| end}, | ||
| {:weekday, ~t"Weekday schedules", fn s -> s.type == :weekday end}, | ||
| {:saturday, ~t"Saturday schedules", fn s -> s.type == :saturday end}, | ||
| {:sunday, ~t"Sunday schedules", fn s -> s.type == :sunday end}, | ||
| {:weekend, ~t"Weekend schedules", fn s -> s.type == :weekend end} | ||
| ] | ||
|
|
||
| case Enum.find(typical_groups, fn {_, _, func} -> func.(service) end) do | ||
| {key, label, _} -> {:typical, key, label} | ||
| _ -> {service.typicality, List.first(dates), service.description} | ||
| end | ||
| end | ||
|
|
||
| defp similar_typical_items(%{dates: dates, service: service}), | ||
| do: {service.typicality, List.first(dates), service.description} | ||
|
|
||
| defp merge_items({label, [%{service: _, dates: dates, group_label: group_label}]}) do | ||
| %{service_label: label, dates: dates, group_label: group_label} | ||
| end | ||
|
|
||
| defp merge_items({label, many_items}) do | ||
| merged_dates = | ||
| many_items | ||
| |> Enum.flat_map(& &1.dates) | ||
| |> Enum.uniq() | ||
| |> Enum.sort(Date) | ||
|
|
||
| merged_label = List.first(many_items) |> Map.get(:group_label) | ||
| %{service_label: label, dates: merged_dates, group_label: merged_label} | ||
| end | ||
| end | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Praise: This whole function reads quite nicely, and makes it super clear what it's doing! Each step is a bit confusing (just inherently, because the problem is confusing), but this top-level function-call chain ties it all together nicely and makes the confusion a lot easier to sift through.