Skip to content

[WIP] Job unique producteurs et réutilisateurs pour l’expiration des JDD #4402

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

Draft
vdegove wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

[WIP] Job unique producteurs et réutilisateurs pour l’expiration des JDD #4402

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
37423e2
Rename outdated data functions for clarity
vdegove Dec 16, 2024
27eb0b1
Move job to Oban
vdegove Dec 16, 2024
e042c0f
Fix Oban job and do test it
vdegove Dec 17, 2024
ef55051
Clean some things in data_checker
vdegove Dec 17, 2024
141f688
Migrate all new dataset notification code to job instead of datachecker
vdegove Dec 17, 2024
d61bb63
Move code from ImportData to OutdatedNotificationJob and merge two si…
vdegove Dec 17, 2024
d278d6c
Rename OutdatedDataJob to ExpirationAdminProducerJob to show proximit…
vdegove Dec 17, 2024
b092f4e
merge expiration jobs into a single one
vdegove Dec 17, 2024
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
Next Next commit
Rename outdated data functions for clarity
  • Loading branch information
@vdegove
vdegove committed Dec 17, 2024
commit 37423e2bca9767b55e45718e0a786ffc7b37a9e3
14 changes: 7 additions & 7 deletions apps/transport/lib/transport/data_checker.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ defmodule Transport.DataChecker do
{delay, gtfs_datasets_expiring_on(date)}
end
|> Enum.reject(fn {_, records} -> Enum.empty?(records) end)
|> send_outdated_data_mail()
|> Enum.map(&send_outdated_data_notifications(&1, job_id))
|> send_outdated_data_admin_mail()
|> Enum.map(&send_outdated_data_producer_notifications(&1, job_id))
end

@spec gtfs_datasets_expiring_on(Date.t()) :: [{DB.Dataset.t(), [DB.Resource.t()]}]
Expand Down Expand Up @@ -160,8 +160,8 @@ defmodule Transport.DataChecker do
end)
end

@spec send_outdated_data_notifications(delay_and_records(), integer()) :: delay_and_records()
def send_outdated_data_notifications({delay, records} = payload, job_id) do
@spec send_outdated_data_producer_notifications(delay_and_records(), integer()) :: delay_and_records()
def send_outdated_data_producer_notifications({delay, records} = payload, job_id) do
Enum.each(records, fn {%DB.Dataset{} = dataset, resources} ->
@expiration_reason
|> DB.NotificationSubscription.subscriptions_for_reason_dataset_and_role(dataset, :producer)
Expand Down Expand Up @@ -189,10 +189,10 @@ defmodule Transport.DataChecker do
|> Enum.map_join(", ", fn %DB.Resource{title: title} -> title end)
end

@spec send_outdated_data_mail([delay_and_records()]) :: [delay_and_records()]
defp send_outdated_data_mail([] = _records), do: []
@spec send_outdated_data_admin_mail([delay_and_records()]) :: [delay_and_records()]
defp send_outdated_data_admin_mail([] = _records), do: []

defp send_outdated_data_mail(records) do
defp send_outdated_data_admin_mail(records) do
Transport.AdminNotifier.expiration(records)
|> Transport.Mailer.deliver()

Expand Down
2 changes: 1 addition & 1 deletion apps/transport/test/transport/data_checker_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ defmodule Transport.DataCheckerTest do
})

job_id = 42
Transport.DataChecker.send_outdated_data_notifications({7, [{dataset, []}]}, job_id)
Transport.DataChecker.send_outdated_data_producer_notifications({7, [{dataset, []}]}, job_id)

assert_email_sent(
from: {"transport.data.gouv.fr", "[email protected]"},
Expand Down