amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add sorting capabilities to most models in the API (#1022)

Browse Source
This commit is contained in:
Régis Freyd
2018-03-20 21:32:59 -04:00
committed by GitHub
parent 8be4c15e90
commit f5810865e7
9 changed files with 68 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/ApiActivityController.php
+13 -3
View File
@@ -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);
}
@@ -237,8 +242,13 @@ class ApiActivityController extends ApiController
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);
}