feat(reports): allow reports to hold multiple events

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

js/src/components/Comment/EventComment.vue

@@ -352,7 +352,7 @@ const reportComment = async (
 ): Promise<void> => {
   if (!props.comment.actor) return;
   createReportMutation({
-    eventId: props.event.id,
+    eventsIds: [props.event.id ?? ""],
     reportedId: props.comment.actor?.id ?? "",
     commentsIds: [props.comment.id ?? ""],
     content,

js/src/components/Event/EventActionSection.vue

@@ -648,7 +648,7 @@ const reportEvent = async (
   if (!organizer.value) return;
 
   createReportMutation({
-    eventId: event.value?.id ?? "",
+    eventsIds: [event.value?.id ?? ""],
     reportedId: organizer.value?.id ?? "",
     content,
     forward,

js/src/composition/apollo/report.ts

@@ -5,7 +5,7 @@ export function useCreateReport() {
   return useMutation<
     { createReport: { id: string } },
     {
-      eventId?: string;
+      eventsIds?: string[];
       reportedId: string;
       content?: string;
       commentsIds?: string[];

js/src/graphql/report.ts

@@ -20,7 +20,7 @@ export const REPORTS = gql`
           ...ActorFragment
           suspended
         }
-        event {
+        events {
           id
           uuid
           title
@@ -46,7 +46,7 @@ const REPORT_FRAGMENT = gql`
     reporter {
       ...ActorFragment
     }
-    event {
+    events {
       id
       uuid
       title
@@ -97,14 +97,14 @@ export const REPORT = gql`
 
 export const CREATE_REPORT = gql`
   mutation CreateReport(
-    $eventId: ID
+    $eventsIds: [ID]
     $reportedId: ID!
     $content: String
     $commentsIds: [ID]
     $forward: Boolean
   ) {
     createReport(
-      eventId: $eventId
+      eventsIds: $eventsIds
       reportedId: $reportedId
       content: $content
       commentsIds: $commentsIds

js/src/types/report.model.ts

@@ -16,7 +16,7 @@ export interface IReport extends IActionLogObject {
   id: string;
   reported: IActor;
   reporter: IPerson;
-  event?: IEvent;
+  events?: IEvent[];
   comments: IComment[];
   content: string;
   notes: IReportNote[];

js/src/views/Moderation/ReportView.vue

@@ -150,14 +150,14 @@
               <span v-else>{{ t("Unknown") }}</span>
             </td>
           </tr>
-          <tr v-if="report.event && report.comments.length > 0">
+          <!-- <tr v-if="report.events && report.comments.length > 0">
-            <td>{{ t("Event") }}</td>
+            <td>{{ t("Events") }}</td>
             <td class="flex gap-2 items-center">
               <router-link
                 class="underline"
                 :to="{
                   name: RouteName.EVENT,
-                  params: { uuid: report.event.uuid },
+                  params: { uuid: report.events.uuid },
                 }"
               >
                 {{ report.event.title }}
@@ -169,7 +169,7 @@
                 >{{ t("Delete") }}</o-button
               >
             </td>
-          </tr>
+          </tr> -->
         </tbody>
       </table>
     </section>
@@ -206,17 +206,23 @@
 
     <section
       class="bg-white dark:bg-zinc-700 rounded px-2 pt-1 pb-2 my-3"
-      v-if="report.event && report.comments.length === 0"
+      v-if="
+        report.events &&
+        report.events?.length > 0 &&
+        report.comments.length === 0
+      "
     >
       <h2 class="mb-1">{{ t("Reported content") }}</h2>
-      <EventCard :event="report.event" mode="row" class="my-2 max-w-4xl" />
+      <div v-for="event in report.events" :key="event.id">
-      <o-button
+        <EventCard :event="event" mode="row" class="my-2 max-w-4xl" />
-        variant="danger"
+        <o-button
-        @click="confirmEventDelete()"
+          variant="danger"
-        icon-left="delete"
+          @click="confirmEventDelete(event)"
-        size="small"
+          icon-left="delete"
-        >{{ t("Delete") }}</o-button
+          size="small"
-      >
+          >{{ t("Delete") }}</o-button
+        >
+      </div>
     </section>
 
     <section
@@ -337,6 +343,7 @@ import { Dialog } from "@/plugins/dialog";
 import { Notifier } from "@/plugins/notifier";
 import EventCard from "@/components/Event/EventCard.vue";
 import { useFeatures } from "@/composition/apollo/config";
+import { IEvent } from "@/types/event.model";
 
 const router = useRouter();
 
@@ -419,7 +426,7 @@ createReportNoteMutationError((error) => {
 
 const dialog = inject<Dialog>("dialog");
 
-const confirmEventDelete = (): void => {
+const confirmEventDelete = (event: IEvent): void => {
   dialog?.confirm({
     title: t("Deleting event"),
     message: t(
@@ -428,7 +435,7 @@ const confirmEventDelete = (): void => {
     confirmText: t("Delete Event"),
     variant: "danger",
     hasIcon: true,
-    onConfirm: () => deleteEvent(),
+    onConfirm: () => deleteEvent(event),
   });
 };
 
@@ -451,8 +458,8 @@ const {
   onError: deleteEventMutationError,
 } = useMutation<{ deleteEvent: { id: string } }>(DELETE_EVENT);
 
-deleteEventMutationDone(() => {
+deleteEventMutationDone((result) => {
-  const eventTitle = report.value?.event?.title;
+  const eventTitle = result?.context?.eventTitle;
   notifier?.success(
     t("Event {eventTitle} deleted", {
       eventTitle,
@@ -464,10 +471,13 @@ deleteEventMutationError((error) => {
   console.error(error);
 });
 
-const deleteEvent = async (): Promise<void> => {
+const deleteEvent = async (event: IEvent): Promise<void> => {
-  if (!report.value?.event?.id) return;
+  if (!event?.id) return;
 
-  deleteEventMutation({ eventId: report.value.event.id });
+  deleteEventMutation(
+    { eventId: event.id },
+    { context: { eventTitle: event.title } }
+  );
 };
 
 const {

lib/federation/activity_pub/types/reports.ex

@@ -2,7 +2,6 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Reports do
   @moduledoc false
   alias Mobilizon.{Actors, Discussions, Events, Reports}
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events.Event
   alias Mobilizon.Federation.ActivityStream
   alias Mobilizon.Federation.ActivityStream.Convertible
   alias Mobilizon.Reports.Report
@@ -26,15 +25,16 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Reports do
     %Actor{} = reported_actor = Actors.get_actor!(args.reported_id)
     content = HTML.strip_tags(args.content)
 
-    event_id = Map.get(args, :event_id)
+    events =
-
+      args
-    event =
+      |> Map.get(:events_ids, [])
-      if is_nil(event_id) do
+      |> Enum.map(fn event_id ->
-        nil
+        case Events.get_event(event_id) do
-      else
+          {:ok, event} -> event
-        {:ok, %Event{} = event} = Events.get_event(event_id)
+          {:error, :event_not_found} -> nil
-        event
+        end
-      end
+      end)
+      |> Enum.filter(& &1)
 
     comments =
       Discussions.list_comments_by_actor_and_ids(
@@ -46,7 +46,7 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Reports do
       reporter: reporter_actor,
       reported: reported_actor,
       content: content,
-      event: event,
+      events: events,
       comments: comments
     })
   end

lib/federation/activity_stream/converter/flag.ex

@@ -9,11 +9,11 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
   """
 
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Discussions
+  alias Mobilizon.Discussions.Comment
-  alias Mobilizon.Events
   alias Mobilizon.Events.Event
   alias Mobilizon.Reports.Report
 
+  alias Mobilizon.Federation.ActivityPub
   alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.Relay
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
@@ -38,7 +38,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
         "uri" => params["uri"],
         "content" => params["content"],
         "reported_id" => params["reported"].id,
-        "event_id" => (!is_nil(params["event"]) && params["event"].id) || nil,
+        "events" => params["events"],
         "comments" => params["comments"]
       }
     end
@@ -50,9 +50,10 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
   @impl Converter
   @spec model_to_as(Report.t()) :: map
   def model_to_as(%Report{} = report) do
-    object = [report.reported.url] ++ Enum.map(report.comments, fn comment -> comment.url end)
+    object =
-
+      [report.reported.url] ++
-    object = if report.event, do: object ++ [report.event.url], else: object
+        Enum.map(report.comments, fn comment -> comment.url end) ++
+        Enum.map(report.events, & &1.url)
 
     %{
       "type" => "Flag",
@@ -68,14 +69,13 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
     with {:ok, %Actor{} = reporter} <-
            ActivityPubActor.get_or_fetch_actor_by_url(object["actor"]),
          %Actor{} = reported <- find_reported(objects),
-         event <- find_event(objects),
+         %{events: events, comments: comments} <- find_events_and_comments(objects) do
-         comments <- find_comments(objects, reported, event) do
       %{
         "reporter" => reporter,
         "uri" => object["id"],
         "content" => object["content"],
         "reported" => reported,
-        "event" => event,
+        "events" => events,
         "comments" => comments
       }
     end
@@ -94,26 +94,19 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
     end)
   end
 
-  # Remove the reported actor and the event from the object list.
+  defp find_events_and_comments(objects) do
-  @spec find_comments(list(String.t()), Actor.t() | nil, Event.t() | nil) :: list(Comment.t())
-  defp find_comments(objects, reported, event) do
     objects
-    |> Enum.filter(fn url ->
+    |> Enum.map(&ActivityPub.fetch_object_from_url/1)
-      !((!is_nil(reported) && url == reported.url) || (!is_nil(event) && event.url == url))
+    |> Enum.reduce(%{comments: [], events: []}, fn res, acc ->
-    end)
+      case res do
-    |> Enum.map(&Discussions.get_comment_from_url/1)
+        {:ok, %Event{} = event} ->
-    |> Enum.filter(& &1)
+          Map.put(acc, :events, [event | acc.events])
-  end
 
-  @spec find_event(list(String.t())) :: Event.t() | nil
+        {:ok, %Comment{} = comment} ->
-  defp find_event(objects) do
+          Map.put(acc, :comments, [comment | acc.comments])
-    Enum.reduce_while(objects, nil, fn url, _ ->
-      case Events.get_event_by_url(url) do
-        %Event{} = event ->
-          {:halt, event}
 
         _ ->
-          {:cont, nil}
+          acc
       end
     end)
   end

lib/graphql/resolvers/report.ex

@@ -67,7 +67,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Report do
       {:ok, _, %Report{} = report} ->
         {:ok, report}
 
-      _error ->
+      error ->
         {:error, dgettext("errors", "Error while saving report")}
     end
   end

lib/graphql/schema/report.ex

@@ -19,7 +19,7 @@ defmodule Mobilizon.GraphQL.Schema.ReportType do
     field(:uri, :string, description: "The URI of the report", meta: [private: true])
     field(:reported, :actor, description: "The actor that is being reported")
     field(:reporter, :actor, description: "The actor that created the report")
-    field(:event, :event, description: "The event that is being reported")
+    field(:events, list_of(:event), description: "The event that is being reported")
     field(:comments, list_of(:comment), description: "The comments that are reported")
 
     field(:notes, list_of(:report_note),
@@ -100,11 +100,15 @@ defmodule Mobilizon.GraphQL.Schema.ReportType do
     field :create_report, type: :report do
       arg(:content, :string, description: "The message sent with the report")
       arg(:reported_id, non_null(:id), description: "The actor's ID that is being reported")
-      arg(:event_id, :id, default_value: nil, description: "The event ID that is being reported")
+
+      arg(:events_ids, list_of(:id),
+        default_value: [],
+        description: "The list of event IDs that are being reported"
+      )
 
       arg(:comments_ids, list_of(:id),
         default_value: [],
-        description: "The comment ID that is being reported"
+        description: "The comment IDs that are being reported"
       )
 
       arg(:forward, :boolean,

lib/mobilizon/reports/report.ex

@@ -22,13 +22,13 @@ defmodule Mobilizon.Reports.Report do
           reported: Actor.t(),
           reporter: Actor.t(),
           manager: Actor.t(),
-          event: Event.t(),
+          events: [Event.t()],
           comments: [Comment.t()],
           notes: [Note.t()]
         }
 
   @required_attrs [:url, :reported_id, :reporter_id]
-  @optional_attrs [:content, :status, :manager_id, :event_id, :local]
+  @optional_attrs [:content, :status, :manager_id, :local]
   @attrs @required_attrs ++ @optional_attrs
 
   @timestamps_opts [type: :utc_datetime]
@@ -46,8 +46,8 @@ defmodule Mobilizon.Reports.Report do
     belongs_to(:reporter, Actor)
     # The actor who last acted on this report
     belongs_to(:manager, Actor)
-    # The eventual Event inside the report
+    # The eventual Events inside the report
-    belongs_to(:event, Event)
+    many_to_many(:events, Event, join_through: "reports_events", on_replace: :delete)
     # The eventual Comments inside the report
     many_to_many(:comments, Comment, join_through: "reports_comments", on_replace: :delete)
     # The notes associated to the report
@@ -62,6 +62,7 @@ defmodule Mobilizon.Reports.Report do
     report
     |> cast(attrs, @attrs)
     |> maybe_generate_url()
+    |> maybe_put_events(attrs)
     |> maybe_put_comments(attrs)
     |> validate_required(@required_attrs)
   end
@@ -72,6 +73,12 @@ defmodule Mobilizon.Reports.Report do
 
   defp maybe_put_comments(%Ecto.Changeset{} = changeset, _), do: changeset
 
+  defp maybe_put_events(%Ecto.Changeset{} = changeset, %{events: events}) do
+    put_assoc(changeset, :events, events)
+  end
+
+  defp maybe_put_events(%Ecto.Changeset{} = changeset, _), do: changeset
+
   @spec maybe_generate_url(Ecto.Changeset.t()) :: Ecto.Changeset.t()
   defp maybe_generate_url(%Ecto.Changeset{} = changeset) do
     with res when res in [:error, {:data, nil}] <- fetch_field(changeset, :url),

lib/mobilizon/reports/reports.ex

@@ -21,7 +21,7 @@ defmodule Mobilizon.Reports do
   def get_report(id) do
     Report
     |> Repo.get(id)
-    |> Repo.preload([:reported, :reporter, :manager, :event, :comments, :notes])
+    |> Repo.preload([:reported, :reporter, :manager, :events, :comments, :notes])
   end
 
   @doc """
@@ -33,7 +33,7 @@ defmodule Mobilizon.Reports do
            %Report{}
            |> Report.changeset(attrs)
            |> Repo.insert() do
-      {:ok, Repo.preload(report, [:event, :reported, :reporter, :comments])}
+      {:ok, Repo.preload(report, [:events, :reported, :reporter, :comments])}
     end
   end
 
@@ -102,7 +102,7 @@ defmodule Mobilizon.Reports do
   @spec list_reports_query(atom()) :: Ecto.Query.t()
   defp list_reports_query(status) do
     Report
-    |> preload([:reported, :reporter, :manager, :event, :comments, :notes])
+    |> preload([:reported, :reporter, :manager, :events, :comments, :notes])
     |> where([r], r.status == ^status)
   end
 

lib/service/anti_spam/akismet.ex

@@ -139,7 +139,7 @@ defmodule Mobilizon.Service.AntiSpam.Akismet do
     end
   end
 
-  defp report_to_akismet_comment(%Report{event: %Event{id: event_id}}) do
+  defp report_to_akismet_comment(%Report{events: [%Event{id: event_id} | _]}) do
     with %Event{description: body, organizer_actor: %Actor{} = actor} <-
            Events.get_event_with_preload!(event_id),
          {email, preferred_username, ip} <- actor_details(actor) do

lib/web/templates/email/report.html.heex

@@ -104,7 +104,7 @@
           </td>
         </tr>
       <% end %>
-      <%= if Map.has_key?(@report, :event) and @report.event do %>
+      <%= if Map.has_key?(@report, :events) and length(@report.events) > 0 do %>
         <tr>
           <td
             bgcolor="#ffffff"
@@ -112,16 +112,19 @@
             style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;"
           >
             <p style="margin: 0;">
-              <h3><%= gettext("Event") %></h3>
+              <h3><%= gettext("Flagged events") %></h3>
-              <a
+              <%= for event <- @report.events do %>
-                href={"#{"#{Mobilizon.Web.Endpoint.url()}/events/#{@report.event.uuid}"}"}
+                <a
-                target="_blank"
+                  href={"#{"#{Mobilizon.Web.Endpoint.url()}/events/#{event.uuid}"}"}
-              >
+                  target="_blank"
-                <%= gettext("%{title} by %{creator}",
+                >
-                  title: @report.event.title,
+                  <%= gettext("%{title} by %{creator}",
-                  creator: Mobilizon.Actors.Actor.preferred_username_and_domain(@report.reported)
+                    title: event.title,
-                ) %>
+                    creator:
-              </a>
+                      Mobilizon.Actors.Actor.preferred_username_and_domain(@report.reported)
+                  ) %>
+                </a>
+              <% end %>
             </p>
             <table
               cellspacing="0"

lib/web/templates/email/report.text.eex

@@ -7,9 +7,11 @@
     <%= gettext "Profile %{profile} was reported", profile: Mobilizon.Actors.Actor.display_name_and_username(@report.reported) %>
   <% end %>
 <% end %>
-<%= if Map.has_key?(@report, :event) and @report.event do %>
+<%= if Map.has_key?(@report, :event) && length(@report.events) > 0 do %>
-  <%= gettext "Event" %>
+  <%= gettext "Events" %>
-  <%= @report.event.title %>
+  <%= for event <- @report.events do %>
+    <%= event.title %>
+  <% end %>
 <% end %>
 <%= if Map.has_key?(@report, :comments) && length(@report.comments) > 0 do %>
   <%= gettext "Comments" %>

priv/repo/migrations/20230605143534_allow_multiple_events_to_be_reported.exs

@@ -0,0 +1,14 @@
+defmodule Mobilizon.Storage.Repo.Migrations.AllowMultipleEventsToBeReported do
+  use Ecto.Migration
+
+  def up do
+    create table(:reports_events, primary_key: false) do
+      add(:report_id, references(:reports, on_delete: :delete_all), null: false)
+      add(:event_id, references(:events, on_delete: :delete_all), null: false)
+    end
+  end
+
+  def down do
+    drop table(:reports_events)
+  end
+end

priv/repo/migrations/20230605153836_backfill_report_events_with_old_events.exs

@@ -0,0 +1,31 @@
+defmodule Mobilizon.Storage.Repo.Migrations.BackfillReportEventsWithOldEvents do
+  use Ecto.Migration
+
+  def up do
+    process_reports_with_events()
+  end
+
+  def down do
+    IO.puts("Doing nothing, migration can't be reverted")
+  end
+
+  defp process_reports_with_events do
+    %Postgrex.Result{rows: rows} =
+      Ecto.Adapters.SQL.query!(
+        Mobilizon.Storage.Repo,
+        "SELECT id, event_id FROM reports WHERE event_id IS NOT NULL"
+      )
+
+    Enum.map(rows, &migrate_event_row/1)
+  end
+
+  defp migrate_event_row([report_id, event_id]) when not is_nil(event_id) do
+    Ecto.Adapters.SQL.query!(
+      Mobilizon.Storage.Repo,
+      "INSERT INTO reports_events VALUES ($1, $2)",
+      [report_id, event_id]
+    )
+  end
+
+  defp migrate_event_row(_), do: :ok
+end

priv/repo/migrations/20230605154106_remove_obsolete_event_id_on_reports.exs

@@ -0,0 +1,15 @@
+defmodule Mobilizon.Storage.Repo.Migrations.RemoveObsoleteEventIdOnReports do
+  use Ecto.Migration
+
+  def up do
+    alter table(:reports) do
+      remove_if_exists :event_id, :integer
+    end
+  end
+
+  def down do
+    alter table(:reports) do
+      add(:event_id, references(:events, on_delete: :delete_all), null: true)
+    end
+  end
+end

test/graphql/api/report_test.exs

@@ -30,7 +30,7 @@ defmodule Mobilizon.GraphQL.API.ReportTest do
                  reporter_id: reporter_id,
                  reported_id: reported_id,
                  content: comment,
-                 event_id: event_id,
+                 events_ids: [event_id],
                  comments_ids: [],
                  forward: false
                })
@@ -64,7 +64,7 @@ defmodule Mobilizon.GraphQL.API.ReportTest do
                  reporter_id: reporter_id,
                  reported_id: reported_id,
                  content: comment,
-                 event_id: nil,
+                 events_ids: [],
                  comments_ids: [comment_1_id, comment_2_id]
                })
 
@@ -100,7 +100,7 @@ defmodule Mobilizon.GraphQL.API.ReportTest do
                  reporter_id: reporter_id,
                  reported_id: reported_id,
                  content: comment,
-                 event_id: nil,
+                 events_ids: [],
                  comments_ids: [comment_1_id, comment_2_id],
                  forward: true
                })
@@ -131,7 +131,7 @@ defmodule Mobilizon.GraphQL.API.ReportTest do
                  reporter_id: reporter_id,
                  reported_id: reported_id,
                  content: "This is not a nice thing",
-                 event_id: nil,
+                 events_ids: [],
                  comments_ids: [comment_1_id],
                  forward: true
                })
@@ -157,7 +157,7 @@ defmodule Mobilizon.GraphQL.API.ReportTest do
                  reporter_id: reporter_id,
                  reported_id: reported_id,
                  content: "This is not a nice thing",
-                 event_id: nil,
+                 events_ids: [],
                  comments_ids: [comment_1_id],
                  forward: true
                })

test/graphql/resolvers/report_test.exs

@@ -15,17 +15,17 @@ defmodule Mobilizon.GraphQL.Resolvers.ReportTest do
 
   describe "Resolver: Report a content" do
     @create_report_mutation """
-    mutation CreateReport($reportedId: ID!, $eventId: ID, $content: String) {
+    mutation CreateReport($reportedId: ID!, $eventsIds: [ID], $content: String) {
       createReport(
         reportedId: $reportedId,
-        eventId: $eventId,
+        eventsIds: $eventsIds,
         content: $content
       ) {
           content,
           reporter {
             id
           },
-          event {
+          events {
             id
           },
           status
@@ -55,7 +55,7 @@ defmodule Mobilizon.GraphQL.Resolvers.ReportTest do
           query: @create_report_mutation,
           variables: %{
             reportedId: reported.id,
-            eventId: event.id,
+            eventsIds: [event.id],
             content: "This is an issue"
           }
         )
@@ -63,7 +63,7 @@ defmodule Mobilizon.GraphQL.Resolvers.ReportTest do
       assert res["errors"] == nil
       assert res["data"]["createReport"]["content"] == "This is an issue"
       assert res["data"]["createReport"]["status"] == "OPEN"
-      assert res["data"]["createReport"]["event"]["id"] == to_string(event.id)
+      assert res["data"]["createReport"]["events"] |> hd |> Map.get("id") == to_string(event.id)
 
       assert res["data"]["createReport"]["reporter"]["id"] ==
                to_string(reporter.id)
@@ -122,7 +122,7 @@ defmodule Mobilizon.GraphQL.Resolvers.ReportTest do
         reporter {
           id
         },
-        event {
+        events {
           id
         },
         status
@@ -280,7 +280,7 @@ defmodule Mobilizon.GraphQL.Resolvers.ReportTest do
           reporter {
             preferredUsername
           },
-          event {
+          events {
             title
           },
           comments {
@@ -312,7 +312,9 @@ defmodule Mobilizon.GraphQL.Resolvers.ReportTest do
                reporter.preferred_username
 
       assert json_response(res, 200)["data"]["report"]["content"] == report.content
-      assert json_response(res, 200)["data"]["report"]["event"]["title"] == report.event.title
+
+      assert json_response(res, 200)["data"]["report"]["events"] |> hd |> Map.get("title") ==
+               report.events |> hd |> Map.get(:title)
 
       assert json_response(res, 200)["data"]["report"]["comments"] |> hd |> Map.get("text") ==
                report.comments |> hd |> Map.get(:text)

test/support/factory.ex

@@ -322,7 +322,7 @@ defmodule Mobilizon.Factory do
       url: "http://mobilizon.test/report/deae1020-54b8-47df-9eea-d8c0e943e57f/activity",
       reported: build(:actor),
       reporter: build(:actor),
-      event: build(:event),
+      events: build_list(1, :event),
       comments: build_list(1, :comment)
     }
   end