updates list rest api
- list no longer returns a json array but a json object, which contains a "messages" json array instead
This commit is contained in:
@ -16,12 +16,12 @@ defmodule Bump.Messages do
|
||||
Repo.delete_all(from m in "messages", where: m.id == ^res.id)
|
||||
%{data: res.data, timestamp: res.timestamp}
|
||||
else
|
||||
nil
|
||||
%{}
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def peak(sender) do
|
||||
def peek(sender) do
|
||||
query = from m in "messages",
|
||||
where: m.sender == ^sender,
|
||||
order_by: [desc: m.timestamp],
|
||||
|
@ -9,19 +9,19 @@ defmodule BumpWeb.MessageController do
|
||||
|
||||
def list(conn, %{"sender" => sender, "minutes" => minutes}) do
|
||||
list = Messages.list(sender, String.to_integer(minutes))
|
||||
text conn, Jason.encode!(list)
|
||||
text conn, Jason.encode!(%{"messages" => list})
|
||||
|
||||
end
|
||||
|
||||
def clear(conn, %{"sender" => sender}) do
|
||||
Messages.clear(sender)
|
||||
text conn, "OK"
|
||||
text conn, Jason.encode!(%{"status" => "OK"})
|
||||
|
||||
end
|
||||
|
||||
def push(conn, %{"sender" => sender, "message" => message}) do
|
||||
def push(conn, %{"sender" => sender, "data" => message}) do
|
||||
Messages.push(sender, message)
|
||||
text conn, "OK"
|
||||
text conn, Jason.encode!(%{"status" => "OK"})
|
||||
|
||||
end
|
||||
|
||||
@ -30,8 +30,8 @@ defmodule BumpWeb.MessageController do
|
||||
text conn, Jason.encode!(message)
|
||||
end
|
||||
|
||||
def peak(conn, %{"sender" => sender}) do
|
||||
message = Messages.peak(sender)
|
||||
def peek(conn, %{"sender" => sender}) do
|
||||
message = Messages.peek(sender)
|
||||
text conn, Jason.encode!(message)
|
||||
end
|
||||
end
|
||||
|
@ -8,7 +8,7 @@ defmodule BumpWeb.Router do
|
||||
scope "/api", BumpWeb do
|
||||
pipe_through :api
|
||||
post "/push", MessageController, :push
|
||||
post "/peak", MessageController, :peak
|
||||
post "/peek", MessageController, :peek
|
||||
post "/pop", MessageController, :pop
|
||||
post "/list", MessageController, :list
|
||||
post "/clear", MessageController, :clear
|
||||
|
Reference in New Issue
Block a user