Encore des commits degeu

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

lib/eventos_web/views/actor_view.ex

@@ -3,7 +3,8 @@ defmodule EventosWeb.ActorView do
   View for Actors
   """
   use EventosWeb, :view
-  alias EventosWeb.{ActorView, EventView}
+  alias EventosWeb.{ActorView, EventView, MemberView}
+  alias Eventos.Actors
 
   def render("index.json", %{actors: actors}) do
     %{data: render_many(actors, ActorView, "acccount_basic.json")}
@@ -32,7 +33,7 @@ defmodule EventosWeb.ActorView do
   end
 
   def render("actor.json", %{actor: actor}) do
-    %{id: actor.id,
+    output = %{id: actor.id,
       username: actor.preferred_username,
       domain: actor.domain,
       display_name: actor.name,
@@ -45,5 +46,14 @@ defmodule EventosWeb.ActorView do
       banner: actor.banner_url,
       organized_events: render_many(actor.organized_events, EventView, "event_for_actor.json")
     }
+    import Logger
+    Logger.debug(inspect actor.type)
+    if actor.type == :Group do
+      Logger.debug("I'm a group !")
+      Map.put(output, :members, render_many(Actors.members_for_group(actor), MemberView, "member.json"))
+    else
+      Logger.debug("not a group")
+      output
+    end
   end
 end

lib/eventos_web/views/event_view.ex

@@ -20,7 +20,8 @@ defmodule EventosWeb.EventView do
   def render("event_for_actor.json", %{event: event}) do
     %{id: event.id,
       title: event.title,
-      slug: event.slug
+      slug: event.slug,
+      uuid: event.uuid,
     }
   end
 
@@ -31,8 +32,11 @@ defmodule EventosWeb.EventView do
       description: event.description,
       begins_on: event.begins_on,
       ends_on: event.ends_on,
+      uuid: event.uuid,
       organizer: %{
-        username: event.organizer_actor.preferred_username
+        username: event.organizer_actor.preferred_username,
+        display_name: event.organizer_actor.name,
+        avatar: event.organizer_actor.avatar_url,
       },
       type: "Event",
     }
@@ -44,6 +48,7 @@ defmodule EventosWeb.EventView do
       description: event.description,
       begins_on: event.begins_on,
       ends_on: event.ends_on,
+      uuid: event.uuid,
       organizer: render_one(event.organizer_actor, ActorView, "acccount_basic.json"),
       participants: render_many(event.participants, ActorView, "show_basic.json"),
       address: render_one(event.address, AddressView, "address.json"),

lib/eventos_web/views/member_view.ex

@@ -3,7 +3,7 @@ defmodule EventosWeb.MemberView do
   View for Members
   """
   use EventosWeb, :view
-  alias EventosWeb.MemberView
+  alias EventosWeb.{MemberView, ActorView}
 
   def render("index.json", %{members: members}) do
     %{data: render_many(members, MemberView, "member.json")}
@@ -14,7 +14,10 @@ defmodule EventosWeb.MemberView do
   end
 
   def render("member.json", %{member: member}) do
-    %{id: member.id,
-      role: member.role}
+    %{
+      role: member.role,
+      actor: render_one(member.actor, ActorView, "acccount_basic.json"),
+      group: render_one(member.parent, ActorView, "acccount_basic.json")
+    }
   end
 end

lib/eventos_web/views/request_view.ex

@@ -1,20 +0,0 @@
-defmodule EventosWeb.RequestView do
-  @moduledoc """
-  View for event request
-  """
-  use EventosWeb, :view
-  alias EventosWeb.RequestView
-
-  def render("index.json", %{requests: requests}) do
-    %{data: render_many(requests, RequestView, "request.json")}
-  end
-
-  def render("show.json", %{request: request}) do
-    %{data: render_one(request, RequestView, "request.json")}
-  end
-
-  def render("request.json", %{request: request}) do
-    %{id: request.id,
-      state: request.state}
-  end
-end