case harmonization with other fields

- longevents -> long_events (back-end)
- longevents -> longEvents (front-end)
This commit is contained in:
Massedil
2024-11-21 20:12:20 +01:00
committed by setop
parent 91b0e7d265
commit 71c0ce37a9
10 changed files with 28 additions and 28 deletions

View File

@@ -76,7 +76,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
limit: limit,
order_by: order_by,
direction: direction,
longevents: longevents,
long_events: long_events,
location: location,
radius: radius
},
@@ -84,7 +84,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
)
when limit < @event_max_limit do
{:ok,
Events.list_events(page, limit, order_by, direction, true, longevents, location, radius)}
Events.list_events(page, limit, order_by, direction, true, long_events, location, radius)}
end
def list_events(

View File

@@ -400,7 +400,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
description: "Direction for the sort"
)
arg(:longevents, :boolean,
arg(:long_events, :boolean,
default_value: nil,
description: "if mention filter in or out long events"
)

View File

@@ -287,7 +287,7 @@ defmodule Mobilizon.GraphQL.Schema.SearchType do
description: "Radius around the location to search in"
)
arg(:longevents, :boolean, description: "if mention filter in or out long events")
arg(:long_events, :boolean, description: "if mention filter in or out long events")
arg(:bbox, :string, description: "The bbox to search events into")
arg(:zoom, :integer, description: "The zoom level for searching events")

View File

@@ -383,7 +383,7 @@ defmodule Mobilizon.Events do
sort \\ :begins_on,
direction \\ :asc,
is_future \\ true,
longevents \\ nil,
long_events \\ nil,
location \\ nil,
radius \\ nil
) do
@@ -394,7 +394,7 @@ defmodule Mobilizon.Events do
|> maybe_join_address(%{location: location, radius: radius})
|> events_for_location(%{location: location, radius: radius})
|> filter_future_events(is_future)
|> events_for_longevents(longevents)
|> events_for_long_events(long_events)
|> filter_public_visibility()
|> filter_draft()
|> filter_cancelled_events()
@@ -604,7 +604,7 @@ defmodule Mobilizon.Events do
|> events_for_search_query()
|> events_for_begins_on(Map.get(args, :begins_on, DateTime.utc_now()))
|> events_for_ends_on(Map.get(args, :ends_on))
|> events_for_longevents(Map.get(args, :longevents))
|> events_for_long_events(Map.get(args, :long_events))
|> events_for_category(args)
|> events_for_categories(args)
|> events_for_languages(args)
@@ -1414,14 +1414,14 @@ defmodule Mobilizon.Events do
end
end
@spec events_for_longevents(Ecto.Queryable.t(), Boolean.t() | nil) :: Ecto.Query.t()
defp events_for_longevents(query, longevents) do
@spec events_for_long_events(Ecto.Queryable.t(), Boolean.t() | nil) :: Ecto.Query.t()
defp events_for_long_events(query, long_events) do
duration = Config.get([:instance, :duration_of_long_event], 0)
if duration <= 0 do
query
else
case longevents do
case long_events do
nil ->
query