SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/BaseClasses/BaseService.php

Indentation +169 added lines, -169 removed lines

@@ -7,188 +7,188 @@
 
 abstract class BaseService implements BaseServiceInterface
 {
-    /**
-     * @var object
-     */
-    protected $repo;
+	/**
+	 * @var object
+	 */
+	protected $repo;
 
-    /**
-     * Init new object.
-     *
-     * @param   mixed  $repo
-     * @return  void
-     */
-    public function __construct($repo)
-    {
-        $this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed  $repo
+	 * @return  void
+	 */
+	public function __construct($repo)
+	{
+		$this->repo = new CachingDecorator($repo, \App::make('Illuminate\Contracts\Cache\Repository'));
+	}
 
-    /**
-     * Fetch records with relations based on the given params.
-     *
-     * @param   string  $relations
-     * @param   array   $conditions
-     * @param   integer $perPage
-     * @param   string  $sortBy
-     * @param   boolean $desc
-     * @param   boolean $trashed
-     * @return collection
-     */
-    public function list($relations = [], $conditions = false, $perPage = 15, $sortBy = 'created_at', $desc = true, $trashed = false)
-    {
-        unset($conditions['perPage']);
-        unset($conditions['sortBy']);
-        unset($conditions['sort']);
-        unset($conditions['page']);
+	/**
+	 * Fetch records with relations based on the given params.
+	 *
+	 * @param   string  $relations
+	 * @param   array   $conditions
+	 * @param   integer $perPage
+	 * @param   string  $sortBy
+	 * @param   boolean $desc
+	 * @param   boolean $trashed
+	 * @return collection
+	 */
+	public function list($relations = [], $conditions = false, $perPage = 15, $sortBy = 'created_at', $desc = true, $trashed = false)
+	{
+		unset($conditions['perPage']);
+		unset($conditions['sortBy']);
+		unset($conditions['sort']);
+		unset($conditions['page']);
 
-        if ($trashed) {
-            return $this->deleted(['and' => $conditions], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
-        }
+		if ($trashed) {
+			return $this->deleted(['and' => $conditions], $perPage ?? 15, $sortBy ?? 'created_at', $desc ?? true);
+		}
         
-        if (count($conditions)) {
-            return $this->paginateBy(['and' => $conditions], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-        }
+		if (count($conditions)) {
+			return $this->paginateBy(['and' => $conditions], $perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+		}
 
-        return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
-    }
+		return $this->paginate($perPage ?? 15, $relations, $sortBy ?? 'created_at', $desc ?? true);
+	}
 
-    /**
-     * Fetch all records with relations from the storage.
-     *
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        return $this->repo->all($relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations from the storage.
+	 *
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function all($relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		return $this->repo->all($relations, $sortBy, $desc, $columns);
+	}
     
-    /**
-     * Fetch all records with relations from storage in pages.
-     *
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 *
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		return $this->repo->paginate($perPage, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		return $this->repo->paginateBy($conditions, $perPage, $relations, $sortBy, $desc, $columns);
+	}
     
-    /**
-     * Save the given model to the storage.
-     *
-     * @param  array $data
-     * @return mixed
-     */
-    public function save(array $data)
-    {
-        return $this->repo->save($data);
-    }
+	/**
+	 * Save the given model to the storage.
+	 *
+	 * @param  array $data
+	 * @return mixed
+	 */
+	public function save(array $data)
+	{
+		return $this->repo->save($data);
+	}
 
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     *
-     * @param  var $value condition value
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function delete($value, $attribute = 'id')
-    {
-        return $this->repo->save($value, $attribute);
-    }
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  var $value condition value
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function delete($value, $attribute = 'id')
+	{
+		return $this->repo->save($value, $attribute);
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     *
-     * @param  integer $id
-     * @param  string[]   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = ['*'])
-    {
-        return $this->repo->find($id, $relations, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 *
+	 * @param  integer $id
+	 * @param  string[]   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = ['*'])
+	{
+		return $this->repo->find($id, $relations, $columns);
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		return $this->repo->findBy($conditions, $relations, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function first($conditions, $relations = [], $columns = ['*'])
-    {
-        return $this->repo->first($conditions, $relations, $columns);
-    }
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function first($conditions, $relations = [], $columns = ['*'])
+	{
+		return $this->repo->first($conditions, $relations, $columns);
+	}
 
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
-    {
-        return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
-    }
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function deleted($conditions, $perPage = 15, $sortBy = 'created_at', $desc = 1, $columns = ['*'])
+	{
+		return $this->repo->deleted($conditions, $perPage, $sortBy, $desc, $columns);
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id
-     * @return void
-     */
-    public function restore($id)
-    {
-        return $this->repo->restore($id);
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id
+	 * @return void
+	 */
+	public function restore($id)
+	{
+		return $this->repo->restore($id);
+	}
 }

src/Modules/Core/BaseClasses/BaseApiController.php

Indentation +95 added lines, -95 removed lines

@@ -8,109 +8,109 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * Array of eager loaded relations.
-     *
-     * @var array
-     */
-    protected $relations;
+	/**
+	 * Array of eager loaded relations.
+	 *
+	 * @var array
+	 */
+	protected $relations;
 
-    /**
-     * @var object
-     */
-    protected $service;
+	/**
+	 * @var object
+	 */
+	protected $service;
 
-    /**
-     * Path of the model resource.
-     *
-     * @var string
-     */
-    protected $modelResource;
+	/**
+	 * Path of the model resource.
+	 *
+	 * @var string
+	 */
+	protected $modelResource;
 
-    /**
-     * Path of the sotre form request.
-     *
-     * @var string
-     */
-    protected $storeFormRequest;
+	/**
+	 * Path of the sotre form request.
+	 *
+	 * @var string
+	 */
+	protected $storeFormRequest;
 
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $service
-     * @return  void
-     */
-    public function __construct($service)
-    {
-        $this->service = $service;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $service
+	 * @return  void
+	 */
+	public function __construct($service)
+	{
+		$this->service = $service;
+	}
 
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed')));
-    }
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->service->list($request->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc'), $request->query('trashed')));
+	}
 
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  Request $request
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function show(Request $request, $id)
-    {
-        return new $this->modelResource($this->service->find($id, $request->relations));
-    }
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  Request $request
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function show(Request $request, $id)
+	{
+		return new $this->modelResource($this->service->find($id, $request->relations));
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function store()
-    {
-        $data = \App::make($this->storeFormRequest)->validated();
-        return new $this->modelResource($this->service->save($data));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function store()
+	{
+		$data = \App::make($this->storeFormRequest)->validated();
+		return new $this->modelResource($this->service->save($data));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param integer   $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update($id)
-    {
-        $data = \App::make($this->storeFormRequest)->validated();
-        $data['id'] = $id;
-        return new $this->modelResource($this->service->save($data));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param integer   $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update($id)
+	{
+		$data = \App::make($this->storeFormRequest)->validated();
+		$data['id'] = $id;
+		return new $this->modelResource($this->service->save($data));
+	}
 
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy($id)
-    {
-        return new GeneralResource($this->service->delete($id));
-    }
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function destroy($id)
+	{
+		return new GeneralResource($this->service->delete($id));
+	}
 
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->service->restore($id));
-    }
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->service->restore($id));
+	}
 }

src/Modules/Roles/Database/Seeds/RolesTableSeeder.php

Indentation +75 added lines, -75 removed lines

@@ -8,80 +8,80 @@
 
 class RolesTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {        
-        /**
-         * Assign default users to admin roles.
-         */
-        $adminRoleId = Role::where('name', 'Admin')->select('id')->first()->id;;
-        $adminUserId = AclUser::where('email', 'admin@user.com')->select('id')->first()->id;
-        \DB::table('role_user')->updateOrInsert([
-            'user_id' => $adminUserId,
-            'role_id' => $adminRoleId,
-        ],[]);
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{        
+		/**
+		 * Assign default users to admin roles.
+		 */
+		$adminRoleId = Role::where('name', 'Admin')->select('id')->first()->id;;
+		$adminUserId = AclUser::where('email', 'admin@user.com')->select('id')->first()->id;
+		\DB::table('role_user')->updateOrInsert([
+			'user_id' => $adminUserId,
+			'role_id' => $adminRoleId,
+		],[]);
 
-        /**
-         * Insert the permissions related to roles table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Roles model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'show',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'store',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'destroy',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignPermissions',
-                'model'      => 'role',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-            ]
-        );
-    }
+		/**
+		 * Insert the permissions related to roles table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Roles model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'show',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'store',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'destroy',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignPermissions',
+				'model'      => 'role',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
+	}
 }

src/Modules/Roles/Http/Controllers/RoleController.php

Indentation +33 added lines, -33 removed lines

@@ -10,40 +10,40 @@
 
 class RoleController extends BaseApiController
 {
-    /**
-     * Path of the sotre form request.
-     *
-     * @var string
-     */
-    protected $storeFormRequest = 'App\Modules\Roles\Http\Requests\StoreRole';
+	/**
+	 * Path of the sotre form request.
+	 *
+	 * @var string
+	 */
+	protected $storeFormRequest = 'App\Modules\Roles\Http\Requests\StoreRole';
 
-    /**
-     * Path of the model resource
-     *
-     * @var string
-     */
-    protected $modelResource = 'App\Modules\Roles\Http\Resources\Role';
+	/**
+	 * Path of the model resource
+	 *
+	 * @var string
+	 */
+	protected $modelResource = 'App\Modules\Roles\Http\Resources\Role';
 
-    /**
-     * Init new object.
-     *
-     * @param   RoleService $service
-     * @return  void
-     */
-    public function __construct(RoleService $service)
-    {
-        parent::__construct($service);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   RoleService $service
+	 * @return  void
+	 */
+	public function __construct(RoleService $service)
+	{
+		parent::__construct($service);
+	}
 
-    /**
-     * Handle an assign permissions to role request.
-     *
-     * @param  AssignPermissions $request
-     * @param  integer           $id
-     * @return \Illuminate\Http\Response
-     */
-    public function assignPermissions(AssignPermissions $request, $id)
-    {
-        return new $this->modelResource($this->service->assignPermissions($id, $request->get('permission_ids')));
-    }
+	/**
+	 * Handle an assign permissions to role request.
+	 *
+	 * @param  AssignPermissions $request
+	 * @param  integer           $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignPermissions(AssignPermissions $request, $id)
+	{
+		return new $this->modelResource($this->service->assignPermissions($id, $request->get('permission_ids')));
+	}
 }

src/Modules/Roles/Http/Requests/AssignPermissions.php

Indentation +20 added lines, -20 removed lines

@@ -6,25 +6,25 @@
 
 class AssignPermissions extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'permission_ids' => 'required|exists:permissions,id'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'permission_ids' => 'required|exists:permissions,id'
+		];
+	}
 }

src/Modules/Roles/Http/Requests/StoreRole.php

Indentation +20 added lines, -20 removed lines

@@ -6,25 +6,25 @@
 
 class StoreRole extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'name' => 'required|string|max:100|unique:roles,name,'.$this->get('id')
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'name' => 'required|string|max:100|unique:roles,name,'.$this->get('id')
+		];
+	}
 }

src/Modules/Roles/Routes/api.php

Indentation +7 added lines, -7 removed lines

@@ -15,11 +15,11 @@
 
 Route::group(['prefix' => 'roles'], function () {
 
-    Route::get('/', 'RoleController@index');
-    Route::get('{id}', 'RoleController@show');
-    Route::post('/', 'RoleController@store');
-    Route::patch('{id}', 'RoleController@update');
-    Route::delete('{id}', 'RoleController@destroy');
-    Route::patch('{id}/restore', 'RoleController@restore');
-    Route::patch('{id}/assign/permissions', 'RoleController@assignPermissions');
+	Route::get('/', 'RoleController@index');
+	Route::get('{id}', 'RoleController@show');
+	Route::post('/', 'RoleController@store');
+	Route::patch('{id}', 'RoleController@update');
+	Route::delete('{id}', 'RoleController@destroy');
+	Route::patch('{id}/restore', 'RoleController@restore');
+	Route::patch('{id}/assign/permissions', 'RoleController@assignPermissions');
 });

src/Modules/Users/Database/Seeds/UsersTableSeeder.php

Indentation +99 added lines, -99 removed lines

@@ -8,105 +8,105 @@
 
 class UsersTableSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        /**
-         * Create Default roles.
-         */
-        $role = Role::updateOrInsert([
-            'name' => 'Admin',
-        ],[
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-        ]);
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		/**
+		 * Create Default roles.
+		 */
+		$role = Role::updateOrInsert([
+			'name' => 'Admin',
+		],[
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+		]);
 
-        /**
-         * Create Default user.
-         */
-        AclUser::updateOrInsert([
-            'email' => 'admin@user.com',
-        ],[
-            'name'       => 'Admin',
-            'password'   => \Hash::make('123456'),
-            'confirmed'  => 1,
-            'created_at' => \DB::raw('NOW()'),
-            'updated_at' => \DB::raw('NOW()')
-        ]);
+		/**
+		 * Create Default user.
+		 */
+		AclUser::updateOrInsert([
+			'email' => 'admin@user.com',
+		],[
+			'name'       => 'Admin',
+			'password'   => \Hash::make('123456'),
+			'confirmed'  => 1,
+			'created_at' => \DB::raw('NOW()'),
+			'updated_at' => \DB::raw('NOW()')
+		]);
 
-        /**
-         * Insert the permissions related to users table.
-         */
-        \DB::table('permissions')->insert(
-            [
-                /**
-                 * Users model permissions.
-                 */
-                [
-                'name'       => 'index',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'show',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'store',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'update',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'destroy',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'deleted',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'restore',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'assignRoles',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'block',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ],
-                [
-                'name'       => 'unblock',
-                'model'      => 'user',
-                'created_at' => \DB::raw('NOW()'),
-                'updated_at' => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+		/**
+		 * Insert the permissions related to users table.
+		 */
+		\DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'index',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'show',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'store',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'update',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'destroy',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'deleted',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'restore',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignRoles',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'block',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'unblock',
+				'model'      => 'user',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 }

src/Modules/Users/Http/Controllers/UserController.php

Indentation +207 added lines, -207 removed lines

@@ -20,211 +20,211 @@
 
 class UserController extends BaseApiController
 {
-    /**
-     * Path of the sotre form request.
-     *
-     * @var string
-     */
-    protected $storeFormRequest = 'App\Modules\Users\Http\Requests\StoreUser';
-
-    /**
-     * Path of the model resource.
-     *
-     * @var string
-     */
-    protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
-
-    /**
-     * Init new object.
-     *
-     * @param   UserService $service
-     * @return  void
-     */
-    public function __construct(UserService $service)
-    {
-        parent::__construct($service);
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function account(Request $request)
-    {
-        return new $this->modelResource($this->service->account($request->relations));
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return new $this->modelResource($this->service->block($id));
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id Id of the user.
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return new $this->modelResource($this->service->unblock($id));
-    }
-
-    /**
-     * Logout the user.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return new GeneralResource($this->service->logout());
-    }
-
-    /**
-     * Handle the registration request.
-     *
-     * @param Register $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Register $request)
-    {
-        return new $this->modelResource($this->service->register($request->get('name'), $request->get('email'), $request->get('password')));
-    }
-
-    /**
-     * Handle the login request to the application.
-     *
-     * @param Login $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Login $request)
-    {
-        $result = $this->service->login($request->get('email'), $request->get('password'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Handle the social login request the application.
-     *
-     * @param LoginSocial $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(LoginSocial $request)
-    {
-        $result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
-
-        return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
-    }
-
-    /**
-     * Assign the given roles to the given user.
-     *
-     * @param AssignRoles $request
-     * @param integer     $id
-     * @return \Illuminate\Http\Response
-     */
-    public function assignRoles(AssignRoles $request, $id)
-    {
-        return new $this->modelResource($this->service->assignRoles($id, $request->get('role_ids')));
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param SendReset $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendReset(SendReset $request)
-    {
-        return new GeneralResource($this->service->sendReset($request->get('email')));
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param ResetPassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetPassword(ResetPassword $request)
-    {
-        return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param ChangePassword $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(ChangePassword $request)
-    {
-        return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
-    }
-
-    /**
-     * Confirm email using the confirmation code.
-     *
-     * @param ConfirmEmail $request
-     * @return \Illuminate\Http\Response
-     */
-    public function confirmEmail(ConfirmEmail $request)
-    {
-        return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
-    }
-
-    /**
-     * Resend the email confirmation mail.
-     *
-     * @param ResendEmailConfirmation $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resendEmailConfirmation(ResendEmailConfirmation $request)
-    {
-        return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @param RefreshToken $request
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshToken(RefreshToken $request)
-    {
-        return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param SaveProfile $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(SaveProfile $request)
-    {
-        return new $this->modelResource($this->service->saveProfile($request->get('name'), $request->get('email'), $request->get('profile_picture')));
-    }
+	/**
+	 * Path of the sotre form request.
+	 *
+	 * @var string
+	 */
+	protected $storeFormRequest = 'App\Modules\Users\Http\Requests\StoreUser';
+
+	/**
+	 * Path of the model resource.
+	 *
+	 * @var string
+	 */
+	protected $modelResource = 'App\Modules\Users\Http\Resources\AclUser';
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'changePassword', 'saveProfile'];
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendReset', 'resetPassword', 'refreshToken', 'confirmEmail', 'resendEmailConfirmation'];
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   UserService $service
+	 * @return  void
+	 */
+	public function __construct(UserService $service)
+	{
+		parent::__construct($service);
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account(Request $request)
+	{
+		return new $this->modelResource($this->service->account($request->relations));
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return new $this->modelResource($this->service->block($id));
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id Id of the user.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return new $this->modelResource($this->service->unblock($id));
+	}
+
+	/**
+	 * Logout the user.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return new GeneralResource($this->service->logout());
+	}
+
+	/**
+	 * Handle the registration request.
+	 *
+	 * @param Register $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Register $request)
+	{
+		return new $this->modelResource($this->service->register($request->get('name'), $request->get('email'), $request->get('password')));
+	}
+
+	/**
+	 * Handle the login request to the application.
+	 *
+	 * @param Login $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Login $request)
+	{
+		$result = $this->service->login($request->get('email'), $request->get('password'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Handle the social login request the application.
+	 *
+	 * @param LoginSocial $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(LoginSocial $request)
+	{
+		$result = $this->service->loginSocial($request->get('auth_code'), $request->get('access_token'), $request->get('type'));
+
+		return (new $this->modelResource($result['user']))->additional(['meta' => $result['tokens']]);
+	}
+
+	/**
+	 * Assign the given roles to the given user.
+	 *
+	 * @param AssignRoles $request
+	 * @param integer     $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assignRoles(AssignRoles $request, $id)
+	{
+		return new $this->modelResource($this->service->assignRoles($id, $request->get('role_ids')));
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param SendReset $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendReset(SendReset $request)
+	{
+		return new GeneralResource($this->service->sendReset($request->get('email')));
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param ResetPassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetPassword(ResetPassword $request)
+	{
+		return new GeneralResource($this->service->resetPassword($request->get('email'), $request->get('password'), $request->get('password_confirmation'), $request->get('token')));
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param ChangePassword $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(ChangePassword $request)
+	{
+		return new GeneralResource($this->service->changePassword($request->get('password'), $request->get('old_password')));
+	}
+
+	/**
+	 * Confirm email using the confirmation code.
+	 *
+	 * @param ConfirmEmail $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function confirmEmail(ConfirmEmail $request)
+	{
+		return new GeneralResource($this->service->confirmEmail($request->only('confirmation_code')));
+	}
+
+	/**
+	 * Resend the email confirmation mail.
+	 *
+	 * @param ResendEmailConfirmation $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resendEmailConfirmation(ResendEmailConfirmation $request)
+	{
+		return new GeneralResource($this->service->sendConfirmationEmail($request->get('email')));
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @param RefreshToken $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshToken(RefreshToken $request)
+	{
+		return new GeneralResource($this->service->refreshToken($request->get('refresh_token')));
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param SaveProfile $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(SaveProfile $request)
+	{
+		return new $this->modelResource($this->service->saveProfile($request->get('name'), $request->get('email'), $request->get('profile_picture')));
+	}
 }