X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..refs/pull/2820/head:/app/Http/Controllers/Api/BookshelfApiController.php diff --git a/app/Http/Controllers/Api/BookshelfApiController.php b/app/Http/Controllers/Api/BookshelfApiController.php index 57461fce5..c29e5b0ae 100644 --- a/app/Http/Controllers/Api/BookshelfApiController.php +++ b/app/Http/Controllers/Api/BookshelfApiController.php @@ -1,7 +1,9 @@ - [ - 'name' => 'required|string|max:255', + 'name' => 'required|string|max:255', 'description' => 'string|max:1000', - 'books' => 'array', + 'books' => 'array', ], 'update' => [ - 'name' => 'string|min:1|max:255', + 'name' => 'string|min:1|max:255', 'description' => 'string|max:1000', - 'books' => 'array', + 'books' => 'array', ], ]; @@ -42,6 +43,7 @@ class BookshelfApiController extends ApiController public function list() { $shelves = Bookshelf::visible(); + return $this->apiListingResponse($shelves, [ 'id', 'name', 'slug', 'description', 'created_at', 'updated_at', 'created_by', 'updated_by', 'owned_by', 'image_id', ]); @@ -51,6 +53,7 @@ class BookshelfApiController extends ApiController * Create a new shelf in the system. * An array of books IDs can be provided in the request. These * will be added to the shelf in the same order as provided. + * * @throws ValidationException */ public function create(Request $request) @@ -73,8 +76,9 @@ class BookshelfApiController extends ApiController 'tags', 'cover', 'createdBy', 'updatedBy', 'ownedBy', 'books' => function (BelongsToMany $query) { $query->visible()->get(['id', 'name', 'slug']); - } + }, ])->findOrFail($id); + return response()->json($shelf); } @@ -83,6 +87,7 @@ class BookshelfApiController extends ApiController * An array of books IDs can be provided in the request. These * will be added to the shelf in the same order as provided and overwrite * any existing book assignments. + * * @throws ValidationException */ public function update(Request $request, string $id) @@ -94,14 +99,14 @@ class BookshelfApiController extends ApiController $bookIds = $request->get('books', null); $shelf = $this->bookshelfRepo->update($shelf, $requestData, $bookIds); + return response()->json($shelf); } - - /** * Delete a single shelf. * This will typically send the shelf to the recycle bin. + * * @throws Exception */ public function delete(string $id) @@ -110,6 +115,7 @@ class BookshelfApiController extends ApiController $this->checkOwnablePermission('bookshelf-delete', $shelf); $this->bookshelfRepo->destroy($shelf); + return response('', 204); } -} \ No newline at end of file +}