Merge pull request #26 from flyingluscas/improvement/categories

Categories resource controller
codecasts · Dec 2, 2016 · 2aef1f7 · 2aef1f7
2 parents 8f089b5 + aa82ada
commit 2aef1f7
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 42 deletions.
diff --git a/client/src/app/categories/form.vue b/client/src/app/categories/form.vue
@@ -72,7 +72,7 @@
           * Fetch the category from the server
           */
           this.setFetching({ fetching: true })
-          this.$http.get(`categories/${id}/get`).then((res) => {
+          this.$http.get(`categories/${id}`).then((res) => {
             const { id: _id, name } = res.data.category // http://wesbos.com/destructuring-renaming/
             this.category.id = _id
             this.category.name = name
@@ -98,7 +98,7 @@
         }
       },
       save() {
-        this.$http.post('categories/create', { name: this.category.name }).then(() => {
+        this.$http.post('categories', { name: this.category.name }).then(() => {
           /**
           * This event will notify the world about
           * the category creation. In this case
@@ -124,7 +124,7 @@
         })
       },
       update() {
-        this.$http.put(`categories/${this.category.id}/update`, this.category).then(() => {
+        this.$http.put(`categories/${this.category.id}`, this.category).then(() => {
           /**
           * This event will notify the world about
           * the category creation. In this case

diff --git a/client/src/app/categories/main.vue b/client/src/app/categories/main.vue
@@ -111,7 +111,7 @@
       * Makes the HTTP requesto to the API
       */
       remove(category) {
-        this.$http.delete(`categories/${category.id}/remove`).then(() => {
+        this.$http.delete(`categories/${category.id}`).then(() => {
           /**
           * On success fetch a new set of Categories
           * based on current page number

diff --git a/webservice/app/Http/Controllers/CategoriesController.php b/webservice/app/Http/Controllers/CategoriesController.php
@@ -2,13 +2,17 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Category;
 use App\Http\Requests\CategoryRequest;
 
 class CategoriesController extends Controller
 {
-    public function all(Request $request)
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
     {
         try {
             $pager = Category::paginate(10);
@@ -21,44 +25,63 @@ public function all(Request $request)
         }
     }
 
-    public function get($id)
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(CategoryRequest $request)
     {
         try {
-            $category = Category::find($id);
-
-            if (! $category) {
-                return response()->json([
-                    'messages' => ['Category not found'],
-                ], 404);
-            }
+            Category::create($request->only('name'));
 
             return response()->json([
                 'result' => 'success',
-                'category' => $category,
             ], 200);
-        } catch (\Exception $e) {
+        } catch(\Exception $e) {
             return response()->json([
-                'messages' => ['Failed to fetch category'],
+                'messages' => ['Failed to create category'],
             ], 500);
         }
     }
 
-    public function create(CategoryRequest $request)
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
     {
         try {
-            Category::create($request->only('name'));
+            $category = Category::find($id);
+
+            if (! $category) {
+                return response()->json([
+                    'messages' => ['Category not found'],
+                ], 404);
+            }
 
             return response()->json([
                 'result' => 'success',
+                'category' => $category,
             ], 200);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             return response()->json([
-                'messages' => ['Failed to create category'],
+                'messages' => ['Failed to fetch category'],
             ], 500);
         }
     }
 
-    public function update($id, CategoryRequest $request)
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(CategoryRequest $request, $id)
     {
         try {
             $category = Category::find($id);
@@ -82,7 +105,13 @@ public function update($id, CategoryRequest $request)
         }
     }
 
-    public function remove($id)
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
     {
         try {
             $category = Category::find($id);

diff --git a/webservice/composer.lock b/webservice/composer.lock
diff --git a/webservice/routes/api.php b/webservice/routes/api.php
@@ -1,15 +1,15 @@
 <?php
 
-Route::group(['middleware' => ['cors', 'api']], function () {
-    Route::post('login', ['uses' => 'LoginController@login']);
-    Route::group(['middleware' => 'auth:api'], function () {
-        Route::group(['prefix' => 'categories'], function () {
-            Route::get('', ['uses' => 'CategoriesController@all']);
-            Route::get('{id}/get', ['uses' => 'CategoriesController@get']);
-            Route::post('create', ['uses' => 'CategoriesController@create']);
-            Route::put('{id}/update', ['uses' => 'CategoriesController@update']);
-            Route::delete('{id}/remove', ['uses' => 'CategoriesController@remove']);
-        });
+Route::group([
+    'middleware' => ['cors', 'api'],
+], function () {
+    Route::post('/login', 'LoginController@login');
+
+    Route::group([
+        'middleware' => 'auth:api',
+    ], function () {
+        Route::resource('/categories', 'CategoriesController', [
+            'except' => ['create', 'edit'],
+        ]);
     });
 });
-
diff --git a/webservice/tests/Controllers/CategoriesControllerTest.php b/webservice/tests/Controllers/CategoriesControllerTest.php
@@ -16,7 +16,7 @@ public function can_delete_category()
     {
         $this->create(Category::class);
 
-        $this->json('DELETE', '/api/categories/1/remove');
+        $this->json('DELETE', '/api/categories/1');
 
         $this->assertResponseOk();
         $this->dontSeeInDatabase('categories', ['id' => 1]);
@@ -29,7 +29,7 @@ public function can_update_category()
     {
         $this->create(Category::class);
 
-        $this->json('PUT', '/api/categories/1/update', [
+        $this->json('PUT', '/api/categories/1', [
             'name' => 'Dummy',
         ]);
 
@@ -64,9 +64,9 @@ public function get_not_found_if_category_dont_exist($method, $url)
     public function urlProvider()
     {
         return [
-            ['GET', '/api/categories/1/get'],
-            ['PUT', '/api/categories/1/update'],
-            ['DELETE', '/api/categories/1/remove'],
+            ['GET', '/api/categories/1'],
+            ['PUT', '/api/categories/1'],
+            ['DELETE', '/api/categories/1'],
         ];
     }
 
@@ -79,7 +79,7 @@ public function can_get_category()
             'name' => 'Dummy',
         ]);
 
-        $this->json('GET', '/api/categories/1/get');
+        $this->json('GET', '/api/categories/1');
 
         $this->assertResponseOk();
 
@@ -99,7 +99,7 @@ public function can_get_category()
      */
     public function can_create_category()
     {
-        $this->json('POST', '/api/categories/create', [
+        $this->json('POST', '/api/categories', [
             'name' => 'Dummy name',
         ]);