[Users] Restoration

Jovert Lota Palonpon · Jovert Lota Palonpon · commit 3e8592dd9112 · 2019-03-24T10:20:55.000+08:00
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
@@ -91,63 +91,23 @@ public function destroy(Request $request, User $user) : JsonResponse
         return response()->json($this->paginatedQuery($request));
     }
 
-    /**
-     * Destroy multiple resources.
-     *
-     * @param Illuminate\Http\Request $request
-     * @param string $idCollectionString
-     *
-     * @return Illuminate\Http\JsonResponse
-     */
-    public function destroyMultiple(Request $request, string $idCollectionString)
-    {
-        $idCollection = explode(',', $idCollectionString);
-
-        foreach ($idCollection as $id) {
-            User::where('id', $id)->delete();
-        }
-
-        return response()->json($this->paginatedQuery($request));
-    }
-
     /**
      * Restore a resource.
      *
      * @param Illuminate\Http\Request $request
-     * @param string $userId
+     * @param string $id
      *
      * @return Illuminate\Http\JsonResponse
      */
-    public function restore(Request $request, $userId)
+    public function restore(Request $request, $id)
     {
-        $user = User::withTrashed()->where('id', $userId)->first();
+        $user = User::withTrashed()->where('id', $id)->first();
         $user->deleted_at = null;
         $user->update();
 
         return response()->json($this->paginatedQuery($request));
     }
 
-    /**
-     * Restore multiple resources.
-     *
-     * @param Illuminate\Http\Request $request
-     * @param string $idCollectionString
-     *
-     * @return Illuminate\Http\JsonResponse
-     */
-    public function restoreMultiple(Request $request, string $idCollectionString)
-    {
-        $idCollection = explode(',', $idCollectionString);
-
-        foreach ($idCollection as $id) {
-            User::withTrashed()->where('id', $id)->update([
-                'deleted_at' => null
-            ]);
-        }
-
-        return response()->json($this->paginatedQuery($request));
-    }
-
     /**
      * Get the paginated resource query.
      *
@@ -162,10 +122,6 @@ protected function paginatedQuery(Request $request) : LengthAwarePaginator
             $request->input('sortType') ?? 'ASC'
         );
 
-        if ($id = $request->input('id')) {
-            $this->filter($users, 'id', $id);
-        }
-
         if ($type = $request->input('type')) {
             $this->filter($users, 'type', $type);
         }
@@ -178,10 +134,6 @@ protected function paginatedQuery(Request $request) : LengthAwarePaginator
             $this->filter($users, 'email', $email);
         }
 
-        if ($last_signin = $request->input('last_signin')) {
-            $this->filter($users, 'last_signin', $last_signin);
-        }
-
         return $users->paginate($request->input('perPage') ?? 10);
     }
 
diff --git a/public/assets.json b/public/assets.json
@@ -1,4 +1,4 @@
 {
-  "js/backoffice.js": "js/backoffice.bundle.4f26014a924451720488.js",
-  "js/vendor.js": "js/vendor.bundle.fe9518cbecd64dd5305d.js"
+  "js/backoffice.js": "js/backoffice.bundle.ac4678226aa6fc94f0dd.js",
+  "js/vendor.js": "js/vendor.bundle.60bab7ed0c4b898e6cd4.js"
 }
diff --git a/public/js/backoffice.bundle.4f26014a924451720488.js b/public/js/backoffice.bundle.4f26014a924451720488.js
diff --git a/public/js/backoffice.bundle.ac4678226aa6fc94f0dd.js b/public/js/backoffice.bundle.ac4678226aa6fc94f0dd.js
diff --git a/public/js/vendor.bundle.60bab7ed0c4b898e6cd4.js b/public/js/vendor.bundle.60bab7ed0c4b898e6cd4.js
diff --git a/public/js/vendor.bundle.fe9518cbecd64dd5305d.js b/public/js/vendor.bundle.fe9518cbecd64dd5305d.js
diff --git a/resources/js/models/User.js b/resources/js/models/User.js
@@ -23,7 +23,7 @@ export default class User {
     /**
      * Delete a user
      *
-     * @param {number}
+     * @param {number} id
      *
      * @return {object}
      */
@@ -36,4 +36,21 @@ export default class User {
 
         return response.data;
     }
+
+    /**
+     * Restore a user
+     *
+     * @param {number} id
+     *
+     * @return {object}
+     */
+    static async restore(id) {
+        const response = await axios.patch(`/api/users/${id}/restore`);
+
+        if (response.status !== 200) {
+            return;
+        }
+
+        return response.data;
+    }
 }
diff --git a/resources/js/views/__backoffice/users/List.js b/resources/js/views/__backoffice/users/List.js
@@ -19,7 +19,6 @@ class List extends Component {
         },
         filters: {},
         selectedResources: [],
-        activeResourceId: 0,
         message: {},
         alert: {},
     };
@@ -34,7 +33,6 @@ class List extends Component {
      */
     handleDeleteClick = resourceId => {
         this.setState({
-            activeResourceId: resourceId,
             alert: {
                 type: 'confirmation',
                 title: Lang.get('resources.delete_confirmation_title', {
@@ -194,6 +192,48 @@ class List extends Component {
         history.push(`${location.pathname}${queryString}`);
     }
 
+    /**
+     * This should send an API request to restore a deleted resource.
+     *
+     * @param {string} resourceId
+     *
+     * @return {undefined}
+     */
+    restoreUser = async resourceId => {
+        this.setState({ loading: true });
+
+        try {
+            const pagination = await User.restore(resourceId);
+
+            this.setState({
+                loading: false,
+                pagination,
+                alert: {},
+                message: {
+                    type: 'success',
+                    body: Lang.get('resources.restored', {
+                        name: 'User',
+                    }),
+                    closed: () => this.setState({ message: {} }),
+                },
+            });
+        } catch (error) {
+            this.setState({
+                loading: false,
+                alert: {},
+                message: {
+                    type: 'error',
+                    body: Lang.get('resources.not_restored', {
+                        name: 'User',
+                    }),
+                    closed: () => this.setState({ message: {} }),
+                    actionText: Lang.get('actions.retry'),
+                    action: async () => await this.restoreUser(resourceId),
+                },
+            });
+        }
+    };
+
     /**
      * This should send an API request to delete a resource.
      *
@@ -213,23 +253,26 @@ class List extends Component {
                 alert: {},
                 message: {
                     type: 'success',
-                    body: 'User successfully deleted!',
+                    body: Lang.get('resources.deleted', {
+                        name: 'User',
+                    }),
                     closed: () => this.setState({ message: {} }),
                     actionText: Lang.get('actions.undo'),
-                    action: () => alert('Recovering...'),
+                    action: async () => this.restoreUser(resourceId),
                 },
             });
         } catch (error) {
-            const { activeResourceId } = this.state;
-
             this.setState({
                 loading: false,
+                alert: {},
                 message: {
                     type: 'error',
-                    body: 'Error deleting user!',
+                    body: Lang.get('resources.not_deleted', {
+                        name: 'User',
+                    }),
                     closed: () => this.setState({ message: {} }),
                     actionText: Lang.get('actions.retry'),
-                    action: async () => await this.deleteUser(activeResourceId),
+                    action: async () => await this.deleteUser(resourceId),
                 },
             });
         }
diff --git a/resources/lang/en/resources.php b/resources/lang/en/resources.php
@@ -18,4 +18,9 @@
 
     'delete_confirmation_title' => 'You are deleting a :name',
     'delete_confirmation_body' => "If not undone, the :name won't be recovered anymore.",
+
+    'deleted' => ':name successfully deleted!',
+    'not_deleted' => 'Error deleting :name!',
+    'restored' => ':name successfully restored!',
+    'not_restored' => 'Error restoring :name!',
 ];
diff --git a/resources/lang/fil/actions.php b/resources/lang/fil/actions.php
@@ -15,4 +15,5 @@
     'cancel' => 'I-cancel',
     'continue' => 'Ituloy',
     'retry' => 'Ulitin',
+    'undo' => 'I-balik',
 ];
diff --git a/resources/lang/fil/resources.php b/resources/lang/fil/resources.php
@@ -18,4 +18,9 @@
 
     'delete_confirmation_title' => 'Ikaw ay nagbubura ng isang :name',
     'delete_confirmation_body' => "Kung maituloy, ang :name ay di na mare-recover pa.",
+
+    'deleted' => 'Ang :name ay burado na!',
+    'not_deleted' => 'Ang :name ay hindi nabura!',
+    'restored' => 'Ang :name ay naibalik!',
+    'not_restored' => 'Ang :name ay hindi naibalik!',
 ];
diff --git a/routes/api.php b/routes/api.php
@@ -31,9 +31,5 @@
     Route::middleware('auth:api')->group(function () {
         Route::resource('users', 'UsersController', ['except' => ['edit', 'create']]);
         Route::patch('users/{user}/restore', 'UsersController@restore')->name('users.restore');
-        Route::delete('users/{idCollectionString}/multiple', 'UsersController@destroyMultiple')
-            ->name('users.destroy-multiple');
-        Route::patch('users/{idCollectionString}/restore/multiple', 'UsersController@restoreMultiple')
-            ->name('users.restore-multiple');
     });
 });
diff --git a/tests/Feature/Api/UsersTest.php b/tests/Feature/Api/UsersTest.php
@@ -17,6 +17,7 @@ public function a_user_can_list_users()
     /** @test */
     public function a_user_can_create_a_user()
     {
+        // A test data that will be used by the API to create a user.
         $attributes = [
             'type' => $this->faker->randomElements(['superuser', 'user'])[0],
             'firstname' => $this->faker->firstName,
@@ -26,10 +27,15 @@ public function a_user_can_create_a_user()
 
         $payload = array_merge($this->getDefaultPayload(), []);
 
+        // Assuming that the user is created through the test data,
+        // It must return a 201 response status and then,
+        // It must return a response body consisting our test data, if not all.
         $this->post(route('api.users.store'), array_merge($attributes, $payload))
             ->assertStatus(201)
             ->assertJson($attributes);
 
+        // Assert against the database that the test data's email property is
+        // found in one of the records in the database.
         $this->assertDatabaseHas('users', [
             'email' => $attributes['email']
         ]);
@@ -39,24 +45,61 @@ public function a_user_can_create_a_user()
     public function a_user_can_view_a_user()
     {
         $payload = array_merge($this->getDefaultPayload(), []);
+
+        // The user to be shown.
         $user = User::first();
 
+        // Assuming that a user is found,
+        // It must return a 200 response status and then,
+        // It must be found as is in the JSON response.
         $this->get(route('api.users.show', $user), $payload)
             ->assertStatus(200)
-            ->assertJson($user->toArray());
+            ->assertExactJson($user->toArray());
     }
 
     /** @test */
     public function a_user_can_delete_a_user()
     {
         $payload = array_merge($this->getDefaultPayload(), []);
+
+        // The user to be deleted.
         $user = User::latest()->first();
+
+        // Decremented counter.
         $decremented =  User::count() - 1;
 
+        // Assuming that the API will delete one,
+        // It must return a 200 response status and then,
+        // It must equal this decremented counter.
         $this->delete(route('api.users.destroy', $user))
             ->assertStatus(200)
             ->assertJsonFragment([
                 'total' => $decremented
             ]);
     }
+
+    /** @test */
+    public function a_user_can_restore_a_user()
+    {
+        $payload = array_merge($this->getDefaultPayload(), []);
+
+        // Delete a user, it will then be restored.
+        $deletedUser = User::latest()->first();
+        $deletedUser->delete();
+
+        // Incremented counter
+        $incremented =  User::count() + 1;
+
+        // Get the deleted user.
+        $recoverableUser = User::withTrashed()->find($deletedUser->id);
+
+        // Assuming that the users count is decremented after deleting one,
+        // It must return a 200 response status and then,
+        // It must equal this incremented counter.
+        $this->patch(route('api.users.restore', $recoverableUser))
+            ->assertStatus(200)
+            ->assertJsonFragment([
+                'total' => $incremented
+            ]);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "js/backoffice.js": "js/backoffice.bundle.4f26014a924451720488.js",`
`3`		`- "js/vendor.js": "js/vendor.bundle.fe9518cbecd64dd5305d.js"`
	`2`	`+ "js/backoffice.js": "js/backoffice.bundle.ac4678226aa6fc94f0dd.js",`
	`3`	`+ "js/vendor.js": "js/vendor.bundle.60bab7ed0c4b898e6cd4.js"`
`4`	`4`	`}`