correct api definition errors
This commit is contained in:
Paul Liverman III
parent
b2a31cc045
commit
aa98c4c478
@ -34,88 +34,82 @@ get_task = =>
|
||||
|
||||
class extends Application
|
||||
-- api_key AND text
|
||||
[new: "/new"]: capture_errors_json =>
|
||||
json_params =>
|
||||
key = get_key(@)
|
||||
yield_error "Task text not specified." unless @params.text and @params.text\len! > 0
|
||||
[new: "/new"]: capture_errors_json json_params =>
|
||||
key = get_key(@)
|
||||
yield_error "Task text not specified." unless @params.text and @params.text\len! > 0
|
||||
|
||||
task = assert_error Tasks\create {
|
||||
user_id: key.user_id
|
||||
text: @params.text
|
||||
}
|
||||
task = assert_error Tasks\create {
|
||||
user_id: key.user_id
|
||||
text: @params.text
|
||||
}
|
||||
|
||||
return json: { success: true, :task }
|
||||
|
||||
-- api_key AND id
|
||||
[do: "/do"]: capture_errors_json json_params =>
|
||||
if task = get_task(@)
|
||||
task = assert_error task\update { done: true }
|
||||
return json: { success: true, :task }
|
||||
else
|
||||
return standard_err!
|
||||
|
||||
-- api_key AND id
|
||||
[do: "/do"]: capture_errors_json =>
|
||||
json_params =>
|
||||
if task = get_task(@)
|
||||
task = assert_error task\update { done: true }
|
||||
return json: { success: true, :task }
|
||||
else
|
||||
return standard_err!
|
||||
|
||||
-- api_key AND id
|
||||
[undo: "/undo"]: capture_errors_json =>
|
||||
json_params =>
|
||||
if task = get_task(@)
|
||||
task = assert_error task\update { done: false }
|
||||
return json: { success: true, :task }
|
||||
else
|
||||
return standard_err!
|
||||
[undo: "/undo"]: capture_errors_json json_params =>
|
||||
if task = get_task(@)
|
||||
task = assert_error task\update { done: false }
|
||||
return json: { success: true, :task }
|
||||
else
|
||||
return standard_err!
|
||||
|
||||
-- api_key AND (id OR (done true/false/nil AND/OR page))
|
||||
[fetch: "/fetch"]: capture_errors_json =>
|
||||
json_params =>
|
||||
if @params.id
|
||||
if task = get_task(@)
|
||||
return json: { success: true, :task }
|
||||
else
|
||||
return standard_err!
|
||||
[fetch: "/fetch"]: capture_errors_json json_params =>
|
||||
if @params.id
|
||||
if task = get_task(@)
|
||||
return json: { success: true, :task }
|
||||
else
|
||||
key = get_key(@)
|
||||
page = tonumber(@params.page) or 1
|
||||
return standard_err!
|
||||
else
|
||||
key = get_key(@)
|
||||
page = tonumber(@params.page) or 1
|
||||
|
||||
local paginator
|
||||
if @params.done != nil
|
||||
paginator = Tasks\paginated "WHERE user_id = ? AND done = ? ORDER BY id ASC", key.user_id, @params.done, per_page: 50
|
||||
else
|
||||
paginator = Tasks\paginated "WHERE user_id = ? ORDER BY id ASC", key.user_id, per_page: 50
|
||||
local paginator
|
||||
if @params.done != nil
|
||||
paginator = Tasks\paginated "WHERE user_id = ? AND done = ? ORDER BY id ASC", key.user_id, @params.done, per_page: 50
|
||||
else
|
||||
paginator = Tasks\paginated "WHERE user_id = ? ORDER BY id ASC", key.user_id, per_page: 50
|
||||
|
||||
tasks = paginator\get_page page
|
||||
return json: { success: true, :tasks }
|
||||
tasks = paginator\get_page page
|
||||
return json: { success: true, :tasks }
|
||||
|
||||
-- api_key AND done true/false/nil
|
||||
[random: "/fetch/random"]: capture_errors_json =>
|
||||
json_params =>
|
||||
key = get_key(@)
|
||||
[random: "/fetch/random"]: capture_errors_json json_params =>
|
||||
key = get_key(@)
|
||||
|
||||
local tasks
|
||||
if @params.done
|
||||
offset = random Tasks\count "user_id = ? AND done = ? ORDER BY id ASC", key.user_id, @params.done
|
||||
tasks = Tasks\select "WHERE user_id = ? AND done = ? ORDER BY id ASC OFFSET ? LIMIT 1", key.user_id, @params.done, offset
|
||||
else
|
||||
offset = random Tasks\count "user_id = ? ORDER BY id ASC", key.user_id
|
||||
tasks = Tasks\select "WHERE user_id = ? ORDER BY id ASC OFFSET ? LIMIT 1", key.user_id, offset
|
||||
local tasks
|
||||
if @params.done
|
||||
offset = random Tasks\count "user_id = ? AND done = ? ORDER BY id ASC", key.user_id, @params.done
|
||||
tasks = Tasks\select "WHERE user_id = ? AND done = ? ORDER BY id ASC OFFSET ? LIMIT 1", key.user_id, @params.done, offset
|
||||
else
|
||||
offset = random Tasks\count "user_id = ? ORDER BY id ASC", key.user_id
|
||||
tasks = Tasks\select "WHERE user_id = ? ORDER BY id ASC OFFSET ? LIMIT 1", key.user_id, offset
|
||||
|
||||
if tasks and #tasks == 1
|
||||
return json: { success: true, task: tasks[1] }
|
||||
else
|
||||
return standard_err!
|
||||
if tasks and #tasks == 1
|
||||
return json: { success: true, task: tasks[1] }
|
||||
else
|
||||
return standard_err!
|
||||
|
||||
-- api_key AND done true/false/nil AND/OR case true
|
||||
[search: "/search"]: capture_errors_json =>
|
||||
json_params =>
|
||||
key = get_key(@)
|
||||
like = @params.case and "ILIKE" or "LIKE"
|
||||
[search: "/search"]: capture_errors_json json_params =>
|
||||
key = get_key(@)
|
||||
like = @params.case and "ILIKE" or "LIKE"
|
||||
|
||||
local tasks
|
||||
if @params.done
|
||||
tasks = Tasks\select "WHERE user_id = ? AND done = ? AND text #{like} ? ORDER BY id ASC", key.user_id, @params.done, escape_similar_to @params.text
|
||||
else
|
||||
tasks = Tasks\select "WHERE user_id = ? AND text #{like} ? ORDER BY id ASC", key.user_id, escape_similar_to @params.text
|
||||
local tasks
|
||||
if @params.done
|
||||
tasks = Tasks\select "WHERE user_id = ? AND done = ? AND text #{like} ? ORDER BY id ASC", key.user_id, @params.done, escape_similar_to @params.text
|
||||
else
|
||||
tasks = Tasks\select "WHERE user_id = ? AND text #{like} ? ORDER BY id ASC", key.user_id, escape_similar_to @params.text
|
||||
|
||||
if tasks and #tasks >= 1
|
||||
return json: { success: true, :tasks }
|
||||
else
|
||||
return standard_err!
|
||||
if tasks and #tasks >= 1
|
||||
return json: { success: true, :tasks }
|
||||
else
|
||||
return standard_err!
|
||||
|
||||
Loading…
Reference in New Issue
Block a user