Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sorting capabilities to most models in the API #1022

Merged
merged 1 commit into from
Mar 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions app/Http/Controllers/Api/ApiActivityController.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,13 @@ class ApiActivityController extends ApiController
*/
public function index(Request $request)
{
$activities = auth()->user()->account->activities()
->paginate($this->getLimitPerPage());
try {
$activities = auth()->user()->account->activities()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return ActivityResource::collection($activities);
}
Expand Down Expand Up @@ -237,8 +242,13 @@ public function activities(Request $request, $contactId)
return $this->respondNotFound();
}

$activities = $contact->activities()
try {
$activities = $contact->activities()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return ActivityResource::collection($activities);
}
Expand Down
9 changes: 7 additions & 2 deletions app/Http/Controllers/Api/ApiCallController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ class ApiCallController extends ApiController
*/
public function index(Request $request)
{
$calls = auth()->user()->account->calls()
->paginate($this->getLimitPerPage());
try {
$calls = auth()->user()->account->calls()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return CallResource::collection($calls);
}
Expand Down
6 changes: 6 additions & 0 deletions app/Http/Controllers/Api/ApiController.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,12 @@ public function setSortCriteria($criteria)
'-updated_at',
'completed_at',
'-completed_at',
'called_at',
'-called_at',
'favorited_at',
'-favorited_at',
'next_expected_date',
'-next_expected_date',
];

if (in_array($criteria, $acceptedCriteria)) {
Expand Down
9 changes: 7 additions & 2 deletions app/Http/Controllers/Api/ApiDebtController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ class ApiDebtController extends ApiController
*/
public function index(Request $request)
{
$debts = auth()->user()->account->debts()
->paginate($this->getLimitPerPage());
try {
$debts = auth()->user()->account->debts()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return DebtResource::collection($debts);
}
Expand Down
9 changes: 7 additions & 2 deletions app/Http/Controllers/Api/ApiGiftController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ class ApiGiftController extends ApiController
*/
public function index(Request $request)
{
$gifts = auth()->user()->account->gifts()
->paginate($this->getLimitPerPage());
try {
$gifts = auth()->user()->account->gifts()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return GiftResource::collection($gifts);
}
Expand Down
9 changes: 7 additions & 2 deletions app/Http/Controllers/Api/ApiJournalController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ class ApiJournalController extends ApiController
*/
public function index(Request $request)
{
$entries = auth()->user()->account->entries()
->paginate($this->getLimitPerPage());
try {
$entries = auth()->user()->account->entries()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return JournalResource::collection($entries);
}
Expand Down
9 changes: 7 additions & 2 deletions app/Http/Controllers/Api/ApiNoteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ class ApiNoteController extends ApiController
*/
public function index(Request $request)
{
$notes = auth()->user()->account->notes()
->paginate($this->getLimitPerPage());
try {
$notes = auth()->user()->account->notes()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return NoteResource::collection($notes);
}
Expand Down
9 changes: 7 additions & 2 deletions app/Http/Controllers/Api/ApiReminderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ class ApiReminderController extends ApiController
*/
public function index(Request $request)
{
$reminders = auth()->user()->account->reminders()
->paginate($this->getLimitPerPage());
try {
$reminders = auth()->user()->account->reminders()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return ReminderResource::collection($reminders);
}
Expand Down
9 changes: 7 additions & 2 deletions app/Http/Controllers/Api/ApiTagController.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,13 @@ class ApiTagController extends ApiController
*/
public function index(Request $request)
{
$tags = auth()->user()->account->tags()
->paginate($this->getLimitPerPage());
try {
$tags = auth()->user()->account->tags()
->orderBy($this->sort, $this->sortDirection)
->paginate($this->getLimitPerPage());
} catch (QueryException $e) {
return $this->respondInvalidQuery();
}

return TagResource::collection($tags);
}
Expand Down