🔍 Implement basic event visibility

See https://framagit.org/framasoft/mobilizon/wikis/spec/Event#visibility

Also brings support for event status (tentative/confirmed/cancelled)

Closes #56

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-01-14 15:56:07 +01:00
parent 3723eed1fe
commit ab56d3e607
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
7 changed files with 157 additions and 41 deletions

View file

@ -1,3 +1,14 @@
import EctoEnum
defenum(Mobilizon.Events.CommentVisibilityEnum, :comment_visibility_type, [
:public,
:local,
:group,
:unlisted,
:moderated,
:private
])
defmodule Mobilizon.Events.Comment do defmodule Mobilizon.Events.Comment do
@moduledoc """ @moduledoc """
An actor comment (for instance on an event or on a group) An actor comment (for instance on an event or on a group)
@ -14,6 +25,7 @@ defmodule Mobilizon.Events.Comment do
field(:text, :string) field(:text, :string)
field(:url, :string) field(:url, :string)
field(:local, :boolean, default: true) field(:local, :boolean, default: true)
field(:visibility, :integer)
field(:uuid, Ecto.UUID) field(:uuid, Ecto.UUID)
belongs_to(:actor, Actor, foreign_key: :actor_id) belongs_to(:actor, Actor, foreign_key: :actor_id)
belongs_to(:attributed_to, Actor, foreign_key: :attributed_to_id) belongs_to(:attributed_to, Actor, foreign_key: :attributed_to_id)
@ -38,7 +50,7 @@ defmodule Mobilizon.Events.Comment do
else: "#{MobilizonWeb.Endpoint.url()}/comments/#{uuid}" else: "#{MobilizonWeb.Endpoint.url()}/comments/#{uuid}"
comment comment
|> cast(attrs, [ |> Ecto.Changeset.cast(attrs, [
:url, :url,
:text, :text,
:actor_id, :actor_id,

View file

@ -1,5 +1,19 @@
import EctoEnum import EctoEnum
defenum(AddressTypeEnum, :address_type, [:physical, :url, :phone, :other]) defenum(Mobilizon.Events.AddressTypeEnum, :address_type, [:physical, :url, :phone, :other])
defenum(Mobilizon.Events.EventVisibilityEnum, :event_visibility_type, [
:public,
:unlisted,
:private,
:moderated,
:invite
])
defenum(Mobilizon.Events.EventStatusEnum, :event_status_type, [
:tentative,
:confirmed,
:cancelled
])
defmodule Mobilizon.Events.Event do defmodule Mobilizon.Events.Event do
@moduledoc """ @moduledoc """
@ -18,17 +32,13 @@ defmodule Mobilizon.Events.Event do
field(:description, :string) field(:description, :string)
field(:ends_on, Timex.Ecto.DateTimeWithTimezone) field(:ends_on, Timex.Ecto.DateTimeWithTimezone)
field(:title, :string) field(:title, :string)
# ??? field(:status, Mobilizon.Events.EventStatusEnum, default: :confirmed)
field(:state, :integer, default: 0) field(:visibility, Mobilizon.Events.EventVisibilityEnum, default: :public)
# Event status: TENTATIVE 1, CONFIRMED 2, CANCELLED 3
field(:status, :integer, default: 0)
# If the event is public or private
field(:public, :boolean, default: true)
field(:thumbnail, :string) field(:thumbnail, :string)
field(:large_image, :string) field(:large_image, :string)
field(:publish_at, Timex.Ecto.DateTimeWithTimezone) field(:publish_at, Timex.Ecto.DateTimeWithTimezone)
field(:uuid, Ecto.UUID, default: Ecto.UUID.generate()) field(:uuid, Ecto.UUID, default: Ecto.UUID.generate())
field(:address_type, AddressTypeEnum, default: :physical) field(:address_type, Mobilizon.Events.AddressTypeEnum, default: :physical)
field(:online_address, :string) field(:online_address, :string)
field(:phone, :string) field(:phone, :string)
belongs_to(:organizer_actor, Actor, foreign_key: :organizer_actor_id) belongs_to(:organizer_actor, Actor, foreign_key: :organizer_actor_id)
@ -54,9 +64,8 @@ defmodule Mobilizon.Events.Event do
:ends_on, :ends_on,
:organizer_actor_id, :organizer_actor_id,
:category_id, :category_id,
:state,
:status, :status,
:public, :visibility,
:thumbnail, :thumbnail,
:large_image, :large_image,
:publish_at, :publish_at,

View file

@ -50,7 +50,7 @@ defmodule Mobilizon.Events do
from( from(
e in Event, e in Event,
select: count(e.id), select: count(e.id),
where: e.local == ^true where: e.local == ^true and e.visibility == ^:public
) )
) )
end end
@ -80,7 +80,7 @@ defmodule Mobilizon.Events do
e in Event, e in Event,
join: a in Address, join: a in Address,
on: a.id == e.physical_address_id, on: a.id == e.physical_address_id,
where: st_dwithin_in_meters(^point, a.geom, ^radius), where: e.visibility == ^:public and st_dwithin_in_meters(^point, a.geom, ^radius),
preload: :organizer_actor preload: :organizer_actor
) )
) )
@ -130,9 +130,10 @@ defmodule Mobilizon.Events do
""" """
@spec get_event_full_by_uuid(String.t()) :: Event.t() @spec get_event_full_by_uuid(String.t()) :: Event.t()
def get_event_full_by_uuid(uuid) do def get_event_full_by_uuid(uuid) do
event = Repo.get_by(Event, uuid: uuid) from(
e in Event,
Repo.preload(event, [ where: e.uuid == ^uuid and e.visibility in [^:public, ^:unlisted],
preload: [
:organizer_actor, :organizer_actor,
:category, :category,
:sessions, :sessions,
@ -140,7 +141,9 @@ defmodule Mobilizon.Events do
:tags, :tags,
:participants, :participants,
:physical_address :physical_address
]) ]
)
|> Repo.one()
end end
@doc """ @doc """
@ -166,7 +169,7 @@ defmodule Mobilizon.Events do
def get_event_full_by_url(url) do def get_event_full_by_url(url) do
case Repo.one( case Repo.one(
from(e in Event, from(e in Event,
where: e.url == ^url, where: e.url == ^url and e.visibility in [^:public, ^:unlisted],
preload: [ preload: [
:organizer_actor, :organizer_actor,
:category, :category,
@ -187,9 +190,10 @@ defmodule Mobilizon.Events do
Gets an event by it's URL Gets an event by it's URL
""" """
def get_event_full_by_url!(url) do def get_event_full_by_url!(url) do
event = Repo.get_by!(Event, url: url) Repo.one(
from(e in Event,
Repo.preload(event, [ where: e.url == ^url and e.visibility in [^:public, ^:unlisted],
preload: [
:organizer_actor, :organizer_actor,
:category, :category,
:sessions, :sessions,
@ -197,7 +201,9 @@ defmodule Mobilizon.Events do
:tags, :tags,
:participants, :participants,
:physical_address :physical_address
]) ]
)
)
end end
@doc """ @doc """
@ -211,7 +217,11 @@ defmodule Mobilizon.Events do
""" """
def list_events(page \\ nil, limit \\ nil) do def list_events(page \\ nil, limit \\ nil) do
query = query =
from(e in Event, preload: [:organizer_actor]) from(
e in Event,
where: e.visibility == ^:public,
preload: [:organizer_actor]
)
|> paginate(page, limit) |> paginate(page, limit)
Repo.all(query) Repo.all(query)
@ -228,7 +238,7 @@ defmodule Mobilizon.Events do
query = query =
from(e in Event, from(e in Event,
where: ilike(e.title, ^like_sanitize(name)), where: e.visibility == ^:public and ilike(e.title, ^like_sanitize(name)),
preload: [:organizer_actor] preload: [:organizer_actor]
) )
|> paginate(page, limit) |> paginate(page, limit)

View file

@ -2,7 +2,7 @@ defmodule Mobilizon.Repo.Migrations.AddAddressType do
use Ecto.Migration use Ecto.Migration
def up do def up do
AddressTypeEnum.create_type Mobilizon.Events.AddressTypeEnum.create_type
alter table(:events) do alter table(:events) do
add :address_type, :address_type add :address_type, :address_type
add :online_address, :string add :online_address, :string
@ -21,7 +21,7 @@ defmodule Mobilizon.Repo.Migrations.AddAddressType do
remove :online_address remove :online_address
remove :phone remove :phone
end end
AddressTypeEnum.drop_type Mobilizon.Events.AddressTypeEnum.drop_type
drop constraint(:events, "events_physical_address_id_fkey") drop constraint(:events, "events_physical_address_id_fkey")
rename table(:events), :physical_address_id, to: :address_id rename table(:events), :physical_address_id, to: :address_id
alter table(:events) do alter table(:events) do

View file

@ -0,0 +1,27 @@
defmodule Mobilizon.Repo.Migrations.FixEventVisibility do
use Ecto.Migration
def up do
Mobilizon.Events.EventVisibilityEnum.create_type
Mobilizon.Events.EventStatusEnum.create_type
alter table(:events) do
remove(:public)
remove(:status)
remove(:state)
add(:visibility, Mobilizon.Events.EventVisibilityEnum.type())
add(:status, Mobilizon.Events.EventStatusEnum.type())
end
end
def down do
alter table(:events) do
remove(:visibility)
remove(:status)
add(:state, :integer, null: false, default: 0)
add(:public, :boolean, null: false, default: false)
add(:status, :integer, null: false, default: 0)
end
Mobilizon.Events.EventVisibilityEnum.drop_type
Mobilizon.Events.EventStatusEnum.drop_type
end
end

View file

@ -241,5 +241,63 @@ defmodule MobilizonWeb.Resolvers.EventResolverTest do
assert json_response(res, 200)["data"]["events"] |> length == 0 assert json_response(res, 200)["data"]["events"] |> length == 0
end end
test "list_events/3 doesn't list private events", context do
insert(:event, visibility: :private)
insert(:event, visibility: :unlisted)
insert(:event, visibility: :moderated)
insert(:event, visibility: :invite)
query = """
{
events {
uuid,
}
}
"""
res =
context.conn
|> get("/api", AbsintheHelpers.query_skeleton(query, "event"))
assert json_response(res, 200)["data"]["events"] |> Enum.map(& &1["uuid"]) == []
end
test "find_event/3 returns an unlisted event", context do
event = insert(:event, visibility: :unlisted)
query = """
{
event(uuid: "#{event.uuid}") {
uuid,
}
}
"""
res =
context.conn
|> get("/api", AbsintheHelpers.query_skeleton(query, "event"))
assert json_response(res, 200)["data"]["event"]["uuid"] == to_string(event.uuid)
end
test "find_event/3 doesn't return a private event", context do
event = insert(:event, visibility: :private)
query = """
{
event(uuid: "#{event.uuid}") {
uuid,
}
}
"""
res =
context.conn
|> get("/api", AbsintheHelpers.query_skeleton(query, "event"))
assert json_response(res, 200)["errors"] |> hd |> Map.get("message") ==
"Event with UUID #{event.uuid} not found"
end
end end
end end

View file

@ -105,7 +105,7 @@ defmodule Mobilizon.Factory do
organizer_actor: actor, organizer_actor: actor,
category: build(:category), category: build(:category),
physical_address: build(:address), physical_address: build(:address),
public: true, visibility: :public,
url: "@#{actor.url}/#{Ecto.UUID.generate()}" url: "@#{actor.url}/#{Ecto.UUID.generate()}"
} }
end end