hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Encore des commits degeu

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2018-06-06 17:42:53 +02:00
parent 90de5a105b
commit 63b63d9ee2
31 changed files with 3200 additions and 2937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/eventos_web/controllers/address_controller.ex
View File

@@ -27,6 +27,27 @@ defmodule EventosWeb.AddressController do
end
end
def process_geom(%{"type" => type, "data" => data}) do
import Logger
Logger.debug("Process geom")
Logger.debug(inspect data)
Logger.debug(inspect type)
types = [:point]
unless is_atom(type) do
type = String.to_existing_atom(type)
end
case type do
:point ->
%Geo.Point{coordinates: {data["latitude"], data["longitude"]}, srid: 4326}
nil ->
nil
end
end
def process_geom(nil) do
nil
end
def show(conn, %{"id" => id}) do
address = Addresses.get_address!(id)
render(conn, "show.json", address: address)

37
lib/eventos_web/controllers/event_controller.ex
View File

@@ -17,18 +17,30 @@ defmodule EventosWeb.EventController do
end
def create(conn, %{"event" => event_params}) do
event_params = %{event_params | "address" => process_address(event_params["address"])}
address = process_address(event_params["address"])
event_params = if is_nil address do
event_params
else
%{event_params | "address" => address}
end
with {:ok, %Event{} = event} <- Events.create_event(event_params) do
conn
|> put_status(:created)
|> put_resp_header("location", event_path(conn, :show, event))
|> put_resp_header("location", event_path(conn, :show, event.uuid))
|> render("show_simple.json", event: event)
end
end
defp process_address(address) do
case Addresses.process_geom(address["geom"]) do
{:ok, geom} ->
import Logger
Logger.debug("process address")
Logger.debug(inspect address)
geom = EventosWeb.AddressController.process_geom(address["geom"])
Logger.debug(inspect geom)
case geom do
nil ->
address
_ ->
%{address | "geom" => geom}
_ ->
address
@@ -40,27 +52,26 @@ defmodule EventosWeb.EventController do
render(conn, "index.json", events: events)
end
def show(conn, %{"username" => username, "slug" => slug}) do
event = Events.get_event_full_by_name_and_slug!(username, slug)
def show(conn, %{"uuid" => uuid}) do
event = Events.get_event_full_by_uuid(uuid)
render(conn, "show.json", event: event)
end
def export_to_ics(conn, %{"username" => username, "slug" => slug}) do
event = Events.get_event_full_by_name_and_slug!(username, slug)
|> ICalendar.export_event()
def export_to_ics(conn, %{"uuid" => uuid}) do
event = Events.get_event_full_by_uuid(uuid) |> ICalendar.export_event()
send_resp(conn, 200, event)
end
def update(conn, %{"username" => username, "slug" => slug, "event" => event_params}) do
event = Events.get_event_full_by_name_and_slug!(username, slug)
def update(conn, %{"uuid" => uuid, "event" => event_params}) do
event = Events.get_event_full_by_uuid(uuid)
with {:ok, %Event{} = event} <- Events.update_event(event, event_params) do
render(conn, "show_simple.json", event: event)
end
end
def delete(conn, %{"username" => username, "slug" => slug}) do
event = Events.get_event_full_by_name_and_slug!(username, slug)
def delete(conn, %{"uuid" => uuid}) do
event = Events.get_event_by_uuid(uuid)
with {:ok, %Event{}} <- Events.delete_event(event) do
send_resp(conn, :no_content, "")
end

16
lib/eventos_web/controllers/group_controller.ex
View File

@@ -5,7 +5,7 @@ defmodule EventosWeb.GroupController do
use EventosWeb, :controller
alias Eventos.Actors
alias Eventos.Actors.Actor
alias Eventos.Actors.{Actor, Member}
action_fallback EventosWeb.FallbackController
@@ -23,4 +23,18 @@ defmodule EventosWeb.GroupController do
|> render(EventosWeb.ActorView, "acccount_basic.json", actor: group)
end
end
def join(conn, %{"name" => group_name}) do
with actor = Guardian.Plug.current_resource(conn).actor,
group <- Actors.get_group_by_name(group_name),
%Member{} = member <- Actors.create_member(%{"parent_id" => group.id, "actor_id" => actor.id}) do
conn
|> put_status(:created)
|> render(EventosWeb.MemberView, "member.json", member: member)
else
err ->
import Logger
Logger.debug(inspect err)
end
end
end

17
lib/eventos_web/router.ex
View File

@@ -40,10 +40,10 @@ defmodule EventosWeb.Router do
get "/groups", GroupController, :index
get "/events", EventController, :index
get "/events/search/:name", EventController, :search
get "/events/:username/:slug", EventController, :show
get "/events/:username/:slug/ics", EventController, :export_to_ics
get "/events/:username/:slug/tracks", TrackController, :show_tracks_for_event
get "/events/:username/:slug/sessions", SessionController, :show_sessions_for_event
get "/events/:uuid/ics", EventController, :export_to_ics
get "/events/:uuid/tracks", TrackController, :show_tracks_for_event
get "/events/:uuid/sessions", SessionController, :show_sessions_for_event
get "/events/:uuid", EventController, :show
resources "/comments", CommentController, only: [:show]
get "/bots/:id", BotController, :view
@@ -71,18 +71,17 @@ defmodule EventosWeb.Router do
resources "/users", UserController, except: [:new, :edit, :show]
patch "/actors/:name", ActorController, :update
post "/events", EventController, :create
patch "/events/:username/:slug", EventController, :update
put "/events/:username/:slug", EventController, :update
delete "/events/:username/:slug", EventController, :delete
patch "/events/:uuid", EventController, :update
put "/events/:uuid", EventController, :update
delete "/events/:uuid", EventController, :delete
resources "/comments", CommentController, except: [:new, :edit, :show]
#post "/events/:id/request", EventRequestController, :create_for_event
resources "/participant", ParticipantController
resources "/bots", BotController, except: [:new, :edit, :show]
#resources "/requests", EventRequestController
post "/groups", GroupController, :create
#post "/groups/:id/request", GroupRequestController, :create_for_group
post "/groups/:name/join", GroupController, :join
resources "/members", MemberController
#resources "/requests", GroupRequestController
resources "/sessions", SessionController, except: [:index, :show]
resources "/tracks", TrackController, except: [:index, :show]
get "/tracks/:id/sessions", SessionController, :show_sessions_for_track

14
lib/eventos_web/views/actor_view.ex
View File

@@ -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

9
lib/eventos_web/views/event_view.ex
View File

@@ -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"),

9
lib/eventos_web/views/member_view.ex
View File

@@ -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

20
lib/eventos_web/views/request_view.ex
View File

@@ -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