Make tests great again !

(Also use only one field for public/private key pem)
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/eventos/events/comment.ex

@@ -10,7 +10,9 @@ defmodule Eventos.Events.Comment do
     field :text, :string
     field :url, :string
     field :local, :boolean, default: true
+    field :uuid, Ecto.UUID
     belongs_to :actor, Actor, [foreign_key: :actor_id]
+    belongs_to :attributed_to, Actor, [foreign_key: :attributed_to_id]
     belongs_to :event, Event, [foreign_key: :event_id]
     belongs_to :in_reply_to_comment, Comment, [foreign_key: :in_reply_to_comment_id]
     belongs_to :origin_comment, Comment, [foreign_key: :origin_comment_id]
@@ -20,8 +22,11 @@ defmodule Eventos.Events.Comment do
 
   @doc false
   def changeset(comment, attrs) do
+    uuid = Ecto.UUID.generate()
     comment
-    |> cast(attrs, [:url, :text, :actor_id, :event_id, :in_reply_to_comment_id])
-    |> validate_required([:url, :text, :actor_id])
+    |> cast(attrs, [:url, :text, :actor_id, :event_id, :in_reply_to_comment_id, :attributed_to_id])
+    |> validate_required([:text, :actor_id])
+    |> put_change(:uuid, uuid)
+    |> put_change(:url, "#{EventosWeb.Endpoint.url()}/comments/#{uuid}")
   end
 end

lib/eventos/events/event.ex

@@ -53,6 +53,7 @@ defmodule Eventos.Events.Event do
     field :publish_at, Timex.Ecto.DateTimeWithTimezone
     field :uuid, Ecto.UUID, default: Ecto.UUID.generate()
     belongs_to :organizer_actor, Actor, [foreign_key: :organizer_actor_id]
+    belongs_to :attributed_to, Actor, [foreign_key: :attributed_to_id]
     many_to_many :tags, Tag, join_through: "events_tags"
     belongs_to :category, Category
     many_to_many :participants, Actor, join_through: Participant
@@ -65,17 +66,22 @@ defmodule Eventos.Events.Event do
 
   @doc false
   def changeset(%Event{} = event, attrs) do
-    changeset = event
+    uuid = Ecto.UUID.generate()
+
+    # TODO : check what's the use here. Tests ?
+    actor_url = if Map.has_key?(attrs, :organizer_actor) do
+      attrs.organizer_actor.preferred_username
+    else
+      ""
+    end
+    event
     |> cast(attrs, [:title, :description, :url, :begins_on, :ends_on, :organizer_actor_id, :category_id, :state, :status, :public, :thumbnail, :large_image, :publish_at])
     |> cast_assoc(:tags)
     |> cast_assoc(:address)
-    |> validate_required([:title, :description, :begins_on, :ends_on, :organizer_actor_id, :category_id])
     |> TitleSlug.maybe_generate_slug()
     |> TitleSlug.unique_constraint()
-    |> put_change(:uuid, Ecto.UUID.generate())
-
-    import Logger
-    Logger.debug(inspect changeset)
-    changeset
+    |> put_change(:uuid, uuid)
+    |> put_change(:url, "#{EventosWeb.Endpoint.url()}/@#{actor_url}/#{uuid}")
+    |> validate_required([:title, :description, :begins_on, :ends_on, :organizer_actor_id, :category_id, :url, :uuid])
   end
 end

lib/eventos/events/events.ex

@@ -152,10 +152,11 @@ defmodule Eventos.Events do
 
   """
   def create_event(attrs \\ %{}) do
-    %Event{}
-    |> Event.changeset(attrs)
-    |> Repo.insert!()
-    |> Repo.preload([:organizer_actor])
+    case %Event{} |> Event.changeset(attrs) |> Repo.insert() do
+      {:ok, %Event{} = event} -> {:ok, Repo.preload(event, [:organizer_actor])}
+      err -> err
+    end
+
   end
 
   @doc """
@@ -522,8 +523,13 @@ defmodule Eventos.Events do
   @doc """
   Returns the list of sessions for an event
   """
-  def list_sessions_for_event(event_id) do
-    Repo.all(from s in Session, where: s.event_id == ^event_id)
+  def list_sessions_for_event(event_uuid) do
+    Repo.all(
+      from s in Session,
+      join: e in Event,
+      on: s.event_id == e.id,
+      where: e.uuid == ^event_uuid
+    )
   end
 
   @doc """
@@ -741,6 +747,8 @@ defmodule Eventos.Events do
   """
   def get_comment!(id), do: Repo.get!(Comment, id)
 
+  def get_comment_with_uuid!(uuid), do: Repo.get_by!(Comment, uuid: uuid)
+
   @doc """
   Creates a comment.
 

lib/eventos/events/participant.ex

@@ -9,8 +9,7 @@ defmodule Eventos.Events.Participant do
 
   @primary_key false
   schema "participants" do
-    field :role, :integer, default: 0 # 0 : participant, 1 : moderator, 2 : administrator, 3 : creator
-    field :approved, :boolean
+    field :role, :integer, default: 0 # 0 : not_approved, 1 : participant, 2 : moderator, 3 : administrator, 4 : creator
     belongs_to :event, Event, primary_key: true
     belongs_to :actor, Actor, primary_key: true