Fix event notification tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -3,11 +3,10 @@ defmodule Mobilizon.Service.Workers.Notification do
|
||||
Worker to send notifications
|
||||
"""
|
||||
|
||||
alias Mobilizon.{Actors, Events, Users}
|
||||
alias Mobilizon.Actors.Actor
|
||||
alias Mobilizon.Events
|
||||
alias Mobilizon.Events.{Event, Participant}
|
||||
alias Mobilizon.Storage.Page
|
||||
alias Mobilizon.Users
|
||||
alias Mobilizon.Users.{Setting, User}
|
||||
alias Mobilizon.Web.Email.{Mailer, Notification}
|
||||
|
||||
@@ -22,12 +21,19 @@ defmodule Mobilizon.Service.Workers.Notification do
|
||||
def perform(%Job{
|
||||
args: %{"op" => "before_event_notification", "participant_id" => participant_id}
|
||||
}) do
|
||||
with %Participant{actor: %Actor{user_id: user_id}, event: %Event{status: :confirmed}} =
|
||||
participant <- Events.get_participant(participant_id),
|
||||
%User{email: email, locale: locale, settings: %Setting{notification_before_event: true}} <-
|
||||
Users.get_user_with_settings!(user_id) do
|
||||
with %Participant{} = participant <- Events.get_participant(participant_id),
|
||||
%Event{status: :confirmed} = event <-
|
||||
Events.get_event_with_preload!(participant.event_id),
|
||||
%Actor{user_id: user_id} = actor when not is_nil(user_id) <-
|
||||
Actors.get_actor_with_preload!(participant.actor_id) do
|
||||
%User{email: email, locale: locale, settings: %Setting{notification_before_event: true}} =
|
||||
Users.get_user_with_settings!(user_id)
|
||||
|
||||
email
|
||||
|> Notification.before_event_notification(participant, locale)
|
||||
|> Notification.before_event_notification(
|
||||
%Participant{participant | event: event, actor: actor},
|
||||
locale
|
||||
)
|
||||
|> Mailer.send_email_later()
|
||||
|
||||
:ok
|
||||
@@ -50,7 +56,12 @@ defmodule Mobilizon.Service.Workers.Notification do
|
||||
Enum.filter(participations, fn participation ->
|
||||
participation.event.status == :confirmed
|
||||
end),
|
||||
true <- length(participations) > 0 do
|
||||
true <- length(participations) > 0,
|
||||
participations <-
|
||||
Enum.map(participations, fn participation ->
|
||||
%Event{} = event = Events.get_event_with_preload!(participation.event_id)
|
||||
%Participant{participation | event: event}
|
||||
end) do
|
||||
user
|
||||
|> Notification.on_day_notification(participations, total, locale)
|
||||
|> Mailer.send_email_later()
|
||||
@@ -79,7 +90,12 @@ defmodule Mobilizon.Service.Workers.Notification do
|
||||
Enum.filter(participations, fn participation ->
|
||||
participation.event.status == :confirmed
|
||||
end),
|
||||
true <- length(participations) > 0 do
|
||||
true <- length(participations) > 0,
|
||||
participations <-
|
||||
Enum.map(participations, fn participation ->
|
||||
%Event{} = event = Events.get_event_with_preload!(participation.event_id)
|
||||
%Participant{participation | event: event}
|
||||
end) do
|
||||
user
|
||||
|> Notification.weekly_notification(participations, total, locale)
|
||||
|> Mailer.send_email_later()
|
||||
@@ -99,7 +115,7 @@ defmodule Mobilizon.Service.Workers.Notification do
|
||||
}
|
||||
}) do
|
||||
with %User{} = user <- Users.get_user(user_id),
|
||||
{:ok, %Event{} = event} <- Events.get_event(event_id),
|
||||
{:ok, %Event{} = event} <- Events.get_event_with_preload(event_id),
|
||||
%Page{total: total} when total > 0 <-
|
||||
Events.list_participants_for_event(event_id, [:not_approved]) do
|
||||
user
|
||||
|
||||
Reference in New Issue
Block a user