Add Filterable, Orderable and Process Multiple Params trait to users service, add more tests.

Author: joselfonseca

app/Contracts/Users/UsersServiceContract.php

@@ -12,11 +12,13 @@
 interface UsersServiceContract
 {
 
+
     /**
+     * @param array $attributes
      * @param int $limit
      * @return mixed
      */
-    public function get($limit = 20);
+    public function get(array $attributes = [], $limit = 20);
 
     /**
      * @param int|string $id

app/Http/Controllers/Users/UsersController.php

@@ -37,11 +37,15 @@ public function __construct(UsersServiceContract $service)
 
 
     /**
+     * @param Request $request
      * @return mixed
      */
-    public function index()
+    public function index(Request $request)
     {
-        $users = $this->service->get();
+        $attributes = $request->except('page');
+        $limit = isset($attributes['limit']) ? $attributes['limit'] : env('PAGINATION_VALUE', 20);
+        $users = $this->service->get($attributes, $limit);
+        $users->appends($attributes);
         return $this->response->array($this->service->transform($users));
     }
 
@@ -82,12 +86,12 @@ public function update(Request $request, $uuid)
 
     /**
      * @param Request $request
-     * @param $uuid
+     * @param $uuids
      * @return mixed
      */
-    public function destroy(Request $request, $uuid)
+    public function destroy(Request $request, $uuids)
     {
-        $this->service->delete($uuid);
+        $this->service->delete($uuids);
         return $this->response->noContent();
     }
 }

app/Services/Users/UsersService.php

@@ -4,13 +4,16 @@
 
 use App\Entities\User;
 use League\Fractal\TransformerAbstract;
+use Dingo\Api\Exception\ResourceException;
 use App\Transformers\Users\UserTransformer;
 use App\Contracts\Users\UsersServiceContract;
 use Joselfonseca\LaravelApiTools\Contracts\FractalAble;
 use Joselfonseca\LaravelApiTools\Contracts\ValidateAble;
+use Joselfonseca\LaravelApiTools\Traits\FilterableTrait;
 use Joselfonseca\LaravelApiTools\Traits\FractalAbleTrait;
 use Joselfonseca\LaravelApiTools\Traits\ValidateAbleTrait;
-use Joselfonseca\LaravelApiTools\Exceptions\ValidationException;
+use Joselfonseca\LaravelApiTools\Traits\OrderQueryResultHelper;
+use Joselfonseca\LaravelApiTools\Traits\ProcessMultipleParameterHelper;
 
 /**
  * Class UsersService
@@ -19,7 +22,7 @@
 class UsersService implements FractalAble, ValidateAble, UsersServiceContract
 {
 
-    use FractalAbleTrait, ValidateAbleTrait;
+    use FractalAbleTrait, ValidateAbleTrait, FilterableTrait, OrderQueryResultHelper, ProcessMultipleParameterHelper;
 
     /**
      * @var array
@@ -35,7 +38,7 @@ class UsersService implements FractalAble, ValidateAble, UsersServiceContract
      */
     protected $validationUpdateRules = [
         'name' => 'sometimes|required',
-        'email' => 'sometimes|required|unique:users,email'
+        'password' => 'sometimes|required|min:8|confirmed'
     ];
 
     /**
@@ -78,13 +81,21 @@ public function setTransformer() : TransformerAbstract
         return app(UserTransformer::class);
     }
 
+
     /**
+     * @param array $attributes
      * @param int $limit
-     * @return mixed
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator|\Illuminate\Database\Eloquent\Collection|static[]
      */
-    public function get($limit = 20)
+    public function get(Array $attributes = [], $limit = 20)
     {
         $model = $this->model->with($this->includes);
+        $this->addFilter($attributes);
+        $this->applyFilters($model, $attributes);
+
+        $this->processOrderingRules($attributes);
+        $this->applyOrderingRules($model);
+
         if (!empty($limit)) {
             return $model->paginate($limit);
         }
@@ -103,7 +114,7 @@ public function find($id)
     /**
      * @param array $attributes
      * @return User
-     * @throws ValidationException
+     * @throws ResourceException
      */
     public function create(array $attributes = [])
     {
@@ -117,31 +128,48 @@ public function create(array $attributes = [])
      * @param int|string $id
      * @param array $attributes
      * @return User
-     * @throws ValidationException
+     * @throws ResourceException
      */
     public function update($id, array $attributes = [])
     {
         $model = $this->find($id);
         if (isset($attributes['email']) && $attributes['email'] != $model->email) {
             $this->validationUpdateRules['email'] = 'sometimes|required|unique:users,email,'.$model->id;
         }
+        $this->runValidator($attributes, $this->validationUpdateRules, $this->validationMessages);
         if(isset($attributes['password'])) {
             $attributes['password'] = bcrypt($attributes['password']);
         }
-        $this->runValidator($attributes, $this->validationUpdateRules, $this->validationMessages);
         $model->fill($attributes);
         $model->save();
         return $model->fresh();
     }
 
     /**
-     * @param int|string $id
+     * @param int|string $ids
      * @return bool
      */
-    public function delete($id)
+    public function delete($ids)
     {
-        $model = $this->find($id);
-        $model->delete();
+        $parameters = $this->processParameter($ids);
+
+        foreach ($parameters as $id) {
+            $model = $this->find($id);
+            $model->delete();
+        }
+
         return true;
     }
+
+    /**
+     * Filterable fields
+     * @return array
+     */
+    public function getFilterableFields()
+    {
+        return [
+            'name' => 'partial',
+            'email' => 'partial',
+        ];
+    }
 }