SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/Repositories/GroupRepository.php

Indentation +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 			$group->permissions()->attach($permission_ids);
 		});
 
-        return $this->find($group_id);
+		return $this->find($group_id);
 	}
 }

src/Modules/V1/Core/Interfaces/RepositoryInterface.php

Indentation +106 added lines, -106 removed lines

@@ -2,119 +2,119 @@
 
 interface RepositoryInterface
 {
-    /**
-     * Fetch all records with relations from the storage.
-     * 
-     * @param  array  $relations
-     * @param  array  $sortBy
-     * @param  array  $desc
-     * @param  array  $columns
-     * @return collection
-     */
-    public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	/**
+	 * Fetch all records with relations from the storage.
+	 * 
+	 * @param  array  $relations
+	 * @param  array  $sortBy
+	 * @param  array  $desc
+	 * @param  array  $columns
+	 * @return collection
+	 */
+	public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
     
-    /**
-     * Fetch all records with relations from storage in pages 
-     * that matche the given query.
-     * 
-     * @param  string  $query
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	/**
+	 * Fetch all records with relations from storage in pages 
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
 
-    /**
-     * Fetch all records with relations from storage in pages.
-     * 
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	/**
+	 * Fetch all records with relations from storage in pages.
+	 * 
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
     
-    /**
-     * 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  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	/**
+	 * 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  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
 
-     /**
-     * Save the given model/models to the storage.
-     * 
-     * @param  array   $data
-     * @param  boolean $saveLog
-     * @return object
-     */
-    public function save(array $data, $saveLog = true);
+	 /**
+	  * Save the given model/models to the storage.
+	  * 
+	  * @param  array   $data
+	  * @param  boolean $saveLog
+	  * @return object
+	  */
+	public function save(array $data, $saveLog = true);
 
-    /**
-     * Update record in the storage based on the given
-     * condition.
-     * 
-     * @param  var     $value condition value
-     * @param  array   $data
-     * @param  string  $attribute condition column name
-     * @return integer affected rows
-     */
-    public function update($value, array $data, $attribute = 'id');
+	/**
+	 * Update record in the storage based on the given
+	 * condition.
+	 * 
+	 * @param  var     $value condition value
+	 * @param  array   $data
+	 * @param  string  $attribute condition column name
+	 * @return integer affected rows
+	 */
+	public function update($value, array $data, $attribute = 'id');
 
-    /**
-     * Delete record from the storage based on the given
-     * condition.
-     * 
-     * @param  var     $value condition value
-     * @param  string  $attribute condition column name
-     * @return integer affected rows
-     */
-    public function delete($value, $attribute = 'id');
+	/**
+	 * Delete record from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  var     $value condition value
+	 * @param  string  $attribute condition column name
+	 * @return integer affected rows
+	 */
+	public function delete($value, $attribute = 'id');
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     * 
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = array('*'));
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 * 
+	 * @param  integer $id
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = array('*'));
     
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     * 
-     * @param  array   $conditions array of conditions
-     * @param  array   $relations
-     * @param  array   $sortBy
-     * @param  array   $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  array   $conditions array of conditions
+	 * @param  array   $relations
+	 * @param  array   $sortBy
+	 * @param  array   $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
 
-    /**
-     * Fetch the first record fro 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 = array('*'));
+	/**
+	 * Fetch the first record fro 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 = array('*'));
 }
\ No newline at end of file

src/Modules/V1/Notifications/Repositories/NotificationRepository.php

Indentation +18 added lines, -18 removed lines

@@ -15,23 +15,23 @@
 	}
 
 	/**
-     * Set the notification notified to true.
-     * 
-     * @param  integer  $id
-     * @return object
-     */
-    public function notified($id)
-    {
-        return $this->save(['id' => $id, 'notified' => 1]);
-    }
+	 * Set the notification notified to true.
+	 * 
+	 * @param  integer  $id
+	 * @return object
+	 */
+	public function notified($id)
+	{
+		return $this->save(['id' => $id, 'notified' => 1]);
+	}
 
-    /**
-     * Set the notification notified to all.
-     * 
-     * @return void
-     */
-    public function notifyAll()
-    {
-        $this->update(false, ['notified' => 1], 'notified');
-    }
+	/**
+	 * Set the notification notified to all.
+	 * 
+	 * @return void
+	 */
+	public function notifyAll()
+	{
+		$this->update(false, ['notified' => 1], 'notified');
+	}
 }

src/Modules/V1/Acl/Http/Controllers/UsersController.php

Indentation +180 added lines, -180 removed lines

@@ -7,184 +7,184 @@
 
 class UsersController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'users';
-
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['account', 'logout', 'sendreset'];
-
-    /**
-     * 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'];
-
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules     = [
-    'email'    => 'required|email|unique:users,email,{id}',
-    'password' => 'min:6'
-    ];
-
-    /**
-     * Return the logged in user account.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-       $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
-       return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return \Response::json(\Core::users()->block($id), 200);
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function unblock($id)
-    {
-        return \Response::json(\Core::users()->unblock($id), 200);
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function logout()
-    {
-        return \Response::json(\Core::users()->logout(), 200);
-    }
-
-    /**
-     * Handle a registration request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function register(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'required|email|unique:users,email,{id}', 
-            'password' => 'required|min:6'
-            ]);
-
-        return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
-    }
-
-    /**
-     * Handle a login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function login(Request $request)
-    {
-        $this->validate($request, [
-            'email'    => 'required|email', 
-            'password' => 'required|min:6',
-            'admin'    => 'boolean'
-            ]);
-
-        return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function loginSocial(Request $request)
-    {
-        $this->validate($request, [
-            'auth_code'    => 'required_without:access_token',
-            'access_token' => 'required_without:auth_code',
-            'type'         => 'required|in:facebook,google'
-            ]);
-
-        return \Response::json(\Core::users()->loginSocial($request->only('auth_code', 'access_token', 'type')), 200);
-    }
-
-    /**
-     * Handle an assign groups to user request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function assigngroups(Request $request)
-    {
-        $this->validate($request, [
-            'group_ids' => 'required|exists:groups,id', 
-            'user_id'   => 'required|exists:users,id'
-            ]);
-
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function sendreset(Request $request)
-    {
-        $this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
-
-        return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function resetpassword(Request $request)
-    {
-        $this->validate($request, [
-            'token'                 => 'required',
-            'email'                 => 'required|email',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
-
-        return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshtoken()
-    {
-        return \Response::json(\Core::users()->refreshtoken(), 200);
-    }
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'users';
+
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'sendreset'];
+
+	/**
+	 * 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'];
+
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules     = [
+	'email'    => 'required|email|unique:users,email,{id}',
+	'password' => 'min:6'
+	];
+
+	/**
+	 * Return the logged in user account.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+	   $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
+	   return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find(\JWTAuth::parseToken()->authenticate()->id, $relations), 200);
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer  $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function block($id)
+	{
+		return \Response::json(\Core::users()->block($id), 200);
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer  $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unblock($id)
+	{
+		return \Response::json(\Core::users()->unblock($id), 200);
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function logout()
+	{
+		return \Response::json(\Core::users()->logout(), 200);
+	}
+
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'required|email|unique:users,email,{id}', 
+			'password' => 'required|min:6'
+			]);
+
+		return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
+	}
+
+	/**
+	 * Handle a login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function login(Request $request)
+	{
+		$this->validate($request, [
+			'email'    => 'required|email', 
+			'password' => 'required|min:6',
+			'admin'    => 'boolean'
+			]);
+
+		return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function loginSocial(Request $request)
+	{
+		$this->validate($request, [
+			'auth_code'    => 'required_without:access_token',
+			'access_token' => 'required_without:auth_code',
+			'type'         => 'required|in:facebook,google'
+			]);
+
+		return \Response::json(\Core::users()->loginSocial($request->only('auth_code', 'access_token', 'type')), 200);
+	}
+
+	/**
+	 * Handle an assign groups to user request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function assigngroups(Request $request)
+	{
+		$this->validate($request, [
+			'group_ids' => 'required|exists:groups,id', 
+			'user_id'   => 'required|exists:users,id'
+			]);
+
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function sendreset(Request $request)
+	{
+		$this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
+
+		return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function resetpassword(Request $request)
+	{
+		$this->validate($request, [
+			'token'                 => 'required',
+			'email'                 => 'required|email',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
+
+		return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshtoken()
+	{
+		return \Response::json(\Core::users()->refreshtoken(), 200);
+	}
 }

src/Modules/V1/Reporting/Repositories/ReportRepository.php

Indentation +59 added lines, -59 removed lines

@@ -4,66 +4,66 @@
 
 class ReportRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Reporting\Report';
-    }
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Reporting\Report';
+	}
 
-    /**
-     * Render the given report db view based on the given
-     * condition.
-     *
-     * @param  string  $reportName
-     * @param  array   $conditions array of conditions
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @return object
-     */
-    public function getReport($reportName, $conditions = false, $perPage = 0, $relations = [])
-    {
-        /**
-         * Fetch the report from db.
-         */
-        $reportConditions = $this->constructConditions(['report_name' => $reportName]);
-        $report           = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first();
+	/**
+	 * Render the given report db view based on the given
+	 * condition.
+	 *
+	 * @param  string  $reportName
+	 * @param  array   $conditions array of conditions
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @return object
+	 */
+	public function getReport($reportName, $conditions = false, $perPage = 0, $relations = [])
+	{
+		/**
+		 * Fetch the report from db.
+		 */
+		$reportConditions = $this->constructConditions(['report_name' => $reportName]);
+		$report           = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first();
         
-        /**
-         * Check report existance and permission.
-         */
-        if ( ! $report) 
-        {
-            \ErrorHandler::notFound('report');
-        }
-        else if ( ! \Core::users()->can($report->view_name, 'reports'))
-        {
-            \ErrorHandler::noPermissions();
-        }
+		/**
+		 * Check report existance and permission.
+		 */
+		if ( ! $report) 
+		{
+			\ErrorHandler::notFound('report');
+		}
+		else if ( ! \Core::users()->can($report->view_name, 'reports'))
+		{
+			\ErrorHandler::noPermissions();
+		}
 
-        /**
-         * Fetch data from the report based on the given conditions.
-         */
-        $report = \DB::table($report->view_name);
-        unset($conditions['page']);
-        if (count($conditions))
-        {
-            $conditions = $this->constructConditions($conditions);
-            $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);   
-        }
-        /**
-         * Paginate or all data.
-         */
-        if ($perPage) 
-        {
-            return $report->paginate($perPage);
-        }
-        else
-        {
-            return $report->get();  
-        }
-    }
+		/**
+		 * Fetch data from the report based on the given conditions.
+		 */
+		$report = \DB::table($report->view_name);
+		unset($conditions['page']);
+		if (count($conditions))
+		{
+			$conditions = $this->constructConditions($conditions);
+			$report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);   
+		}
+		/**
+		 * Paginate or all data.
+		 */
+		if ($perPage) 
+		{
+			return $report->paginate($perPage);
+		}
+		else
+		{
+			return $report->get();  
+		}
+	}
 }

src/Modules/V1/Reporting/Http/Controllers/ReportsController.php

Indentation +27 added lines, -27 removed lines

@@ -7,33 +7,33 @@
 
 class ReportsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model               = 'reports';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'reports';
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['getReport'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['getReport'];
 
-    /**
-     * Render the total income report db view between the given two dates.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $reportName
-     * @param  integer $perPage
-     * @return \Illuminate\Http\Response
-     */
-    public function getReport(Request $request, $reportName, $perPage = 0) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->getReport($reportName, $request->all(), $perPage), 200);
-        }
-    }
+	/**
+	 * Render the total income report db view between the given two dates.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $reportName
+	 * @param  integer $perPage
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getReport(Request $request, $reportName, $perPage = 0) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->getReport($reportName, $request->all(), $perPage), 200);
+		}
+	}
 }

src/Modules/V1/Acl/AclUser.php

Indentation +54 added lines, -54 removed lines

@@ -6,67 +6,67 @@
 
 class AclUser extends User {
 
-    use SoftDeletes;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name', 'email', 'password'];
-    protected $appends  = ['permissions'];
-    public $searchable  = ['name', 'email'];
+	use SoftDeletes;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token','deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name', 'email', 'password'];
+	protected $appends  = ['permissions'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     * 
-     * @param string $value 
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 * 
+	 * @param string $value 
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
 
-    public function logs()
-    {
-        return $this->hasMany('App\Modules\V1\Core\Log', 'user_id');
-    }
+	public function logs()
+	{
+		return $this->hasMany('App\Modules\V1\Core\Log', 'user_id');
+	}
 
-    public function groups()
-    {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
 
-    public function getPermissionsAttribute()
-    {
-        $permissions = [];
-        foreach ($this->groups()->get() as $group)
-        {
-            $group->permissions->each(function ($permission) use (&$permissions){
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
+	public function getPermissionsAttribute()
+	{
+		$permissions = [];
+		foreach ($this->groups()->get() as $group)
+		{
+			$group->permissions->each(function ($permission) use (&$permissions){
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
 
-        return \Illuminate\Database\Eloquent\Collection::make($permissions);
-    }
+		return \Illuminate\Database\Eloquent\Collection::make($permissions);
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
+	}
 }

src/Modules/V1/Core/AbstractRepositories/AbstractRepository.php

Indentation +570 added lines, -570 removed lines

@@ -4,584 +4,584 @@
 
 abstract class AbstractRepository implements RepositoryInterface
 {
-    /**
-     * The model implementation.
-     * 
-     * @var model
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var model
+	 */
+	public $model;
     
-    /**
-     * The config implementation.
-     * 
-     * @var config
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 * 
+	 * @var config
+	 */
+	protected $config;
     
-    /**
-     * Create new AbstractRepository instance.
-     */
-    public function __construct()
-    {   
-        $this->config = \CoreConfig::getConfig();
-        $this->model  = \App::make($this->getModel());
-    }
-
-    /**
-     * 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 = array('*'))
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
-    }
-
-    /**
-     * Fetch all records with relations from storage in pages 
-     * that matche the given query.
-     * 
-     * @param  string  $query
-     * @param  integer $perPage
-     * @param  array   $relations
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @param  array   $columns
-     * @return collection
-     */
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
-    {
-        $model            = call_user_func_array("{$this->getModel()}::with", array($relations));
-        $conditionColumns = $this->model->searchable;
-        $sort             = $desc ? 'desc' : 'asc';
-
-        /**
-         * Construct the select conditions for the model.
-         */
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
-
-            if (count($conditionColumns)) 
-            {
-                /**
-                 * Use the first element in the model columns to construct the first condition.
-                 */
-                $q->where(\DB::raw('LOWER(' . array_shift($conditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
-            }
-
-            /**
-             * Loop through the rest of the columns to construct or where conditions.
-             */
-            foreach ($conditionColumns as $column) 
-            {
-                $q->orWhere(\DB::raw('LOWER(' . $column . ')'), 'LIKE', '%' . strtolower($query) . '%');
-            }
-
-            /**
-             * Loop through the model relations.
-             */
-            foreach ($relations as $relation) 
-            {
-                /**
-                 * Remove the sub relation if exists.
-                 */
-                $relation = explode('.', $relation)[0];
-
-                /**
-                 * Try to fetch the relation repository from the core.
-                 */
-                if (\Core::$relation()) 
-                {
-                    /**
-                     * Construct the relation condition.
-                     */
-                    $q->orWhereHas($relation, function ($subModel) use ($query, $relation){
-
-                        $subModel->where(function ($q) use ($query, $relation){
-
-                            /**
-                             * Get columns of the relation.
-                             */
-                            $subConditionColumns = \Core::$relation()->model->searchable;
-
-                            if (count($subConditionColumns)) 
-                            {
-                                /**
-                                * Use the first element in the relation model columns to construct the first condition.
-                                 */
-                                $q->where(\DB::raw('LOWER(' . array_shift($subConditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
-                            }
-
-                            /**
-                             * Loop through the rest of the columns to construct or where conditions.
-                             */
-                            foreach ($subConditionColumns as $subConditionColumn)
-                            {
-                                $q->orWhere(\DB::raw('LOWER(' . $subConditionColumn . ')'), 'LIKE', '%' . strtolower($query) . '%');
-                            } 
-                        });
-
-                    });
-                }
-            }
-        });
+	/**
+	 * Create new AbstractRepository instance.
+	 */
+	public function __construct()
+	{   
+		$this->config = \CoreConfig::getConfig();
+		$this->model  = \App::make($this->getModel());
+	}
+
+	/**
+	 * 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 = array('*'))
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->get($columns);
+	}
+
+	/**
+	 * Fetch all records with relations from storage in pages 
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query
+	 * @param  integer $perPage
+	 * @param  array   $relations
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @param  array   $columns
+	 * @return collection
+	 */
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 1, $columns = array('*'))
+	{
+		$model            = call_user_func_array("{$this->getModel()}::with", array($relations));
+		$conditionColumns = $this->model->searchable;
+		$sort             = $desc ? 'desc' : 'asc';
+
+		/**
+		 * Construct the select conditions for the model.
+		 */
+		$model->where(function ($q) use ($query, $conditionColumns, $relations){
+
+			if (count($conditionColumns)) 
+			{
+				/**
+				 * Use the first element in the model columns to construct the first condition.
+				 */
+				$q->where(\DB::raw('LOWER(' . array_shift($conditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
+			}
+
+			/**
+			 * Loop through the rest of the columns to construct or where conditions.
+			 */
+			foreach ($conditionColumns as $column) 
+			{
+				$q->orWhere(\DB::raw('LOWER(' . $column . ')'), 'LIKE', '%' . strtolower($query) . '%');
+			}
+
+			/**
+			 * Loop through the model relations.
+			 */
+			foreach ($relations as $relation) 
+			{
+				/**
+				 * Remove the sub relation if exists.
+				 */
+				$relation = explode('.', $relation)[0];
+
+				/**
+				 * Try to fetch the relation repository from the core.
+				 */
+				if (\Core::$relation()) 
+				{
+					/**
+					 * Construct the relation condition.
+					 */
+					$q->orWhereHas($relation, function ($subModel) use ($query, $relation){
+
+						$subModel->where(function ($q) use ($query, $relation){
+
+							/**
+							 * Get columns of the relation.
+							 */
+							$subConditionColumns = \Core::$relation()->model->searchable;
+
+							if (count($subConditionColumns)) 
+							{
+								/**
+								 * Use the first element in the relation model columns to construct the first condition.
+								 */
+								$q->where(\DB::raw('LOWER(' . array_shift($subConditionColumns) . ')'), 'LIKE', '%' . strtolower($query) . '%');
+							}
+
+							/**
+							 * Loop through the rest of the columns to construct or where conditions.
+							 */
+							foreach ($subConditionColumns as $subConditionColumn)
+							{
+								$q->orWhere(\DB::raw('LOWER(' . $subConditionColumn . ')'), 'LIKE', '%' . strtolower($query) . '%');
+							} 
+						});
+
+					});
+				}
+			}
+		});
         
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);
-    }
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $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 = array('*'))
-    {
-        $sort = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $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 = array('*'))
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $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 = array('*'))
+	{
+		$sort = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->orderBy($sortBy, $sort)->paginate($perPage, $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 = array('*'))
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->paginate($perPage, $columns);
+	}
     
-    /**
-     * Save the given model to the storage.
-     * 
-     * @param  array   $data
-     * @param  boolean $saveLog
-     * @return void
-     */
-    public function save(array $data, $saveLog = true)
-    {
-        $model      = false;
-        $modelClass = $this->model;
-        $relations  = [];
-
-        \DB::transaction(function () use (&$model, &$relations, $data, $saveLog, $modelClass) {
-            /**
-             * If the id is present in the data then select the model for updating,
-             * else create new model.
-             * @var array
-             */
-            $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
-            if ( ! $model) 
-            {
-                \ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
-            }
-
-            /**
-             * Construct the model object with the given data,
-             * and if there is a relation add it to relations array,
-             * then save the model.
-             */
-            foreach ($data as $key => $value) 
-            {
-                /**
-                 * If the attribute is a relation.
-                 */
-                $relation = camel_case($key);
-                if (method_exists($model, $relation) && \Core::$relation())
-                {
-
-                    /**
-                     * Check if the relation is a collection.
-                     */
-                    if (class_basename($model->$relation) == 'Collection') 
-                    {   
-                        /**
-                         * If the relation has no value then marke the relation data 
-                         * related to the model to be deleted.
-                         */
-                        if ( ! $value || ! count($value)) 
-                        {
-                            $relations[$relation] = 'delete';
-                        }   
-                    }
-                    if (is_array($value)) 
-                    {
-                        /**
-                         * Loop through the relation data.
-                         */
-                        foreach ($value as $attr => $val) 
-                        {
-                            /**
-                             * Get the relation model.
-                             */
-                            $relationBaseModel = \Core::$relation()->model;
-
-                            /**
-                             * Check if the relation is a collection.
-                             */
-                            if (class_basename($model->$relation) == 'Collection')
-                            {
-                                /**
-                                 * If the id is present in the data then select the relation model for updating,
-                                 * else create new model.
-                                 */
-                                $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
-
-                                /**
-                                 * If model doesn't exists.
-                                 */
-                                if ( ! $relationModel) 
-                                {
-                                    \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
-                                }
-
-                                /**
-                                 * Loop through the relation attributes.
-                                 */
-                                foreach ($val as $attr => $val) 
-                                {
-                                    /**
-                                     * Prevent the sub relations or attributes not in the fillable.
-                                     */
-                                    if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
-                                    {
-                                        $relationModel->$attr = $val;
-                                    }
-                                }
-                                $relations[$relation][] = $relationModel;
-                            }
-                            /**
-                             * If not collection.
-                             */
-                            else
-                            {
-                                /**
-                                 * Prevent the sub relations.
-                                 */
-                                if (gettype($val) !== 'object' && gettype($val) !== 'array') 
-                                {
-                                    /**
-                                     * If the id is present in the data then select the relation model for updating,
-                                     * else create new model.
-                                     */
-                                    $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
-
-                                    /**
-                                     * If model doesn't exists.
-                                     */
-                                    if ( ! $relationModel) 
-                                    {
-                                        \ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
-                                    }
-
-                                    /**
-                                     * Prevent attributes not in the fillable.
-                                     */
-                                    if (array_search($attr, $relationModel->getFillable(), true) !== false) 
-                                    {
-                                        $relationModel->$attr = $val;
-                                        $relations[$relation] = $relationModel;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                /**
-                 * If the attribute isn't a relation and prevent attributes not in the fillable.
-                 */
-                else if (array_search($key, $model->getFillable(), true) !== false)
-                {
-                    $model->$key = $value;   
-                }
-            }
-            /**
-             * Save the model.
-             */
-            $model->save();
-
-            /**
-             * Loop through the relations array.
-             */
-            foreach ($relations as $key => $value) 
-            {
-                /**
-                 * If the relation is marked for delete then delete it.
-                 */
-                if ($value == 'delete' && $model->$key()->count())
-                {
-                    $model->$key()->delete();
-                }
-                /**
-                 * If the relation is an array.
-                 */
-                else if (gettype($value) == 'array') 
-                {
-                    $ids = [];
-                    /**
-                     * Loop through the relations.
-                     */
-                    foreach ($value as $val) 
-                    {
-                        switch (class_basename($model->$key())) 
-                        {
-                            /**
-                             * If the relation is one to many then update it's foreign key with
-                             * the model id and save it then add its id to ids array to delete all 
-                             * relations who's id isn't in the ids array.
-                             */
-                            case 'HasMany':
-                                $foreignKeyName       = explode('.', $model->$key()->getForeignKey())[1];
-                                $val->$foreignKeyName = $model->id;
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
-
-                            /**
-                             * If the relation is many to many then add it's id to the ids array to
-                             * attache these ids to the model.
-                             */
-                            case 'BelongsToMany':
-                                $val->save();
-                                $ids[] = $val->id;
-                                break;
-                        }
-                    }
-                    switch (class_basename($model->$key())) 
-                    {
-                        /**
-                         * If the relation is one to many then delete all 
-                         * relations who's id isn't in the ids array.
-                         */
-                        case 'HasMany':
-                            $model->$key()->whereNotIn('id', $ids)->delete();
-                            break;
-
-                        /**
-                         * If the relation is many to many then 
-                         * detach the previous data and attach 
-                         * the ids array to the model.
-                         */
-                        case 'BelongsToMany':
-                            $model->$key()->detach();
-                            $model->$key()->attach($ids);
-                            break;
-                    }
-                }
-                /**
-                 * If the relation isn't array.
-                 */
-                else
-                {
-                    switch (class_basename($model->$key())) 
-                    {
-                        /**
-                         * If the relation is one to many or one to one.
-                         */
-                        case 'BelongsTo':
-                            $value->save();
-                            $model->$key()->associate($value);
-                            $model->save();
-                            break;
-                    }
-                }
-            }
-
-            $saveLog ? \Logging::saveLog(array_key_exists('id', $data) ? 'update' : 'create', class_basename($modelClass), $this->getModel(), $model->id, $model) : false;
-        });
-    }
+	/**
+	 * Save the given model to the storage.
+	 * 
+	 * @param  array   $data
+	 * @param  boolean $saveLog
+	 * @return void
+	 */
+	public function save(array $data, $saveLog = true)
+	{
+		$model      = false;
+		$modelClass = $this->model;
+		$relations  = [];
+
+		\DB::transaction(function () use (&$model, &$relations, $data, $saveLog, $modelClass) {
+			/**
+			 * If the id is present in the data then select the model for updating,
+			 * else create new model.
+			 * @var array
+			 */
+			$model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
+			if ( ! $model) 
+			{
+				\ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+			}
+
+			/**
+			 * Construct the model object with the given data,
+			 * and if there is a relation add it to relations array,
+			 * then save the model.
+			 */
+			foreach ($data as $key => $value) 
+			{
+				/**
+				 * If the attribute is a relation.
+				 */
+				$relation = camel_case($key);
+				if (method_exists($model, $relation) && \Core::$relation())
+				{
+
+					/**
+					 * Check if the relation is a collection.
+					 */
+					if (class_basename($model->$relation) == 'Collection') 
+					{   
+						/**
+						 * If the relation has no value then marke the relation data 
+						 * related to the model to be deleted.
+						 */
+						if ( ! $value || ! count($value)) 
+						{
+							$relations[$relation] = 'delete';
+						}   
+					}
+					if (is_array($value)) 
+					{
+						/**
+						 * Loop through the relation data.
+						 */
+						foreach ($value as $attr => $val) 
+						{
+							/**
+							 * Get the relation model.
+							 */
+							$relationBaseModel = \Core::$relation()->model;
+
+							/**
+							 * Check if the relation is a collection.
+							 */
+							if (class_basename($model->$relation) == 'Collection')
+							{
+								/**
+								 * If the id is present in the data then select the relation model for updating,
+								 * else create new model.
+								 */
+								$relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
+
+								/**
+								 * If model doesn't exists.
+								 */
+								if ( ! $relationModel) 
+								{
+									\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+								}
+
+								/**
+								 * Loop through the relation attributes.
+								 */
+								foreach ($val as $attr => $val) 
+								{
+									/**
+									 * Prevent the sub relations or attributes not in the fillable.
+									 */
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
+									{
+										$relationModel->$attr = $val;
+									}
+								}
+								$relations[$relation][] = $relationModel;
+							}
+							/**
+							 * If not collection.
+							 */
+							else
+							{
+								/**
+								 * Prevent the sub relations.
+								 */
+								if (gettype($val) !== 'object' && gettype($val) !== 'array') 
+								{
+									/**
+									 * If the id is present in the data then select the relation model for updating,
+									 * else create new model.
+									 */
+									$relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
+
+									/**
+									 * If model doesn't exists.
+									 */
+									if ( ! $relationModel) 
+									{
+										\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+									}
+
+									/**
+									 * Prevent attributes not in the fillable.
+									 */
+									if (array_search($attr, $relationModel->getFillable(), true) !== false) 
+									{
+										$relationModel->$attr = $val;
+										$relations[$relation] = $relationModel;
+									}
+								}
+							}
+						}
+					}
+				}
+				/**
+				 * If the attribute isn't a relation and prevent attributes not in the fillable.
+				 */
+				else if (array_search($key, $model->getFillable(), true) !== false)
+				{
+					$model->$key = $value;   
+				}
+			}
+			/**
+			 * Save the model.
+			 */
+			$model->save();
+
+			/**
+			 * Loop through the relations array.
+			 */
+			foreach ($relations as $key => $value) 
+			{
+				/**
+				 * If the relation is marked for delete then delete it.
+				 */
+				if ($value == 'delete' && $model->$key()->count())
+				{
+					$model->$key()->delete();
+				}
+				/**
+				 * If the relation is an array.
+				 */
+				else if (gettype($value) == 'array') 
+				{
+					$ids = [];
+					/**
+					 * Loop through the relations.
+					 */
+					foreach ($value as $val) 
+					{
+						switch (class_basename($model->$key())) 
+						{
+							/**
+							 * If the relation is one to many then update it's foreign key with
+							 * the model id and save it then add its id to ids array to delete all 
+							 * relations who's id isn't in the ids array.
+							 */
+							case 'HasMany':
+								$foreignKeyName       = explode('.', $model->$key()->getForeignKey())[1];
+								$val->$foreignKeyName = $model->id;
+								$val->save();
+								$ids[] = $val->id;
+								break;
+
+							/**
+							 * If the relation is many to many then add it's id to the ids array to
+							 * attache these ids to the model.
+							 */
+							case 'BelongsToMany':
+								$val->save();
+								$ids[] = $val->id;
+								break;
+						}
+					}
+					switch (class_basename($model->$key())) 
+					{
+						/**
+						 * If the relation is one to many then delete all 
+						 * relations who's id isn't in the ids array.
+						 */
+						case 'HasMany':
+							$model->$key()->whereNotIn('id', $ids)->delete();
+							break;
+
+						/**
+						 * If the relation is many to many then 
+						 * detach the previous data and attach 
+						 * the ids array to the model.
+						 */
+						case 'BelongsToMany':
+							$model->$key()->detach();
+							$model->$key()->attach($ids);
+							break;
+					}
+				}
+				/**
+				 * If the relation isn't array.
+				 */
+				else
+				{
+					switch (class_basename($model->$key())) 
+					{
+						/**
+						 * If the relation is one to many or one to one.
+						 */
+						case 'BelongsTo':
+							$value->save();
+							$model->$key()->associate($value);
+							$model->save();
+							break;
+					}
+				}
+			}
+
+			$saveLog ? \Logging::saveLog(array_key_exists('id', $data) ? 'update' : 'create', class_basename($modelClass), $this->getModel(), $model->id, $model) : false;
+		});
+	}
     
-    /**
-     * Update record in the storage based on the given
-     * condition.
-     * 
-     * @param  [type] $value condition value
-     * @param  array $data
-     * @param  string $attribute condition column name
-     * @return void
-     */
-    public function update($value, array $data, $attribute = 'id', $saveLog = true)
-    {
-        if ($attribute == 'id') 
-        {
-            $model = $this->model->lockForUpdate()->find($value);
-            $model ? $model->update($data) : 0;
-            $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
-        }
-        else
-        {
-            call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
-                $model->update($data);
-                $saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
-            });
-        }
-    }
-
-    /**
-     * 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', $saveLog = true)
-    {
-        if ($attribute == 'id') 
-        {
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
-                $model = $this->model->lockForUpdate()->find($value);
-                if ( ! $model) 
-                {
-                    \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
-                }
+	/**
+	 * Update record in the storage based on the given
+	 * condition.
+	 * 
+	 * @param  [type] $value condition value
+	 * @param  array $data
+	 * @param  string $attribute condition column name
+	 * @return void
+	 */
+	public function update($value, array $data, $attribute = 'id', $saveLog = true)
+	{
+		if ($attribute == 'id') 
+		{
+			$model = $this->model->lockForUpdate()->find($value);
+			$model ? $model->update($data) : 0;
+			$saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
+		}
+		else
+		{
+			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
+				$model->update($data);
+				$saveLog ? \Logging::saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
+			});
+		}
+	}
+
+	/**
+	 * 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', $saveLog = true)
+	{
+		if ($attribute == 'id') 
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
+				$model = $this->model->lockForUpdate()->find($value);
+				if ( ! $model) 
+				{
+					\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
+				}
                 
-                $model->delete();
-                $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
-            });
-        }
-        else
-        {
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
-                    $model->delete();
-                    $saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
-                });
-            });   
-        }
-    }
+				$model->delete();
+				$saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
+			});
+		}
+		else
+		{
+			\DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+					$model->delete();
+					$saveLog ? \Logging::saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
+				});
+			});   
+		}
+	}
     
-    /**
-     * Fetch records from the storage based on the given
-     * id.
-     * 
-     * @param  integer $id
-     * @param  array   $relations
-     * @param  array   $columns
-     * @return object
-     */
-    public function find($id, $relations = [], $columns = array('*'))
-    {
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns);
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * id.
+	 * 
+	 * @param  integer $id
+	 * @param  array   $relations
+	 * @param  array   $columns
+	 * @return object
+	 */
+	public function find($id, $relations = [], $columns = array('*'))
+	{
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $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 = array('*'))
-    {
-        $conditions = $this->constructConditions($conditions);
-        $sort       = $desc ? 'desc' : 'asc';
-        return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($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 = array('*'))
-    {
-        $conditions = $this->constructConditions($conditions);
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
-    }
-
-    /**
-     * Build the conditions recursively for the retrieving methods.
-     * @param  array $conditions
-     * @return array
-     */
-    protected function constructConditions($conditions)
-    {   
-        $conditionString = '';
-        $conditionValues = [];
-        foreach ($conditions as $key => $value) 
-        {
-            if ($key == 'and') 
-            {
-                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
-                $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else if ($key == 'or')
-            {
-                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
-                $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
-            }
-            else
-            {
-                if (is_array($value)) 
-                {
-                    $operator = $value['op'];
-                    if (strtolower($operator) == 'between') 
-                    {
-                        $value1 = $value['val1'];
-                        $value2 = $value['val2'];
-                    }
-                    else
-                    {
-                        $value = $value['val'];
-                    }
-                }
-                else
-                {
-                    $operator = '=';
-                }
+	/**
+	 * 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 = array('*'))
+	{
+		$conditions = $this->constructConditions($conditions);
+		$sort       = $desc ? 'desc' : 'asc';
+		return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($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 = array('*'))
+	{
+		$conditions = $this->constructConditions($conditions);
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns);  
+	}
+
+	/**
+	 * Build the conditions recursively for the retrieving methods.
+	 * @param  array $conditions
+	 * @return array
+	 */
+	protected function constructConditions($conditions)
+	{   
+		$conditionString = '';
+		$conditionValues = [];
+		foreach ($conditions as $key => $value) 
+		{
+			if ($key == 'and') 
+			{
+				$conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
+				$conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
+			}
+			else if ($key == 'or')
+			{
+				$conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
+				$conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
+			}
+			else
+			{
+				if (is_array($value)) 
+				{
+					$operator = $value['op'];
+					if (strtolower($operator) == 'between') 
+					{
+						$value1 = $value['val1'];
+						$value2 = $value['val2'];
+					}
+					else
+					{
+						$value = $value['val'];
+					}
+				}
+				else
+				{
+					$operator = '=';
+				}
                 
-                if (strtolower($operator) == 'between') 
-                {
-                    $conditionString  .= $key . '>=? and ';
-                    $conditionValues[] = $value1;
-
-                    $conditionString  .= $key . '<=? {op} ';
-                    $conditionValues[] = $value2;
-                }
-                else
-                {
-                    $conditionString  .= $key . $operator . '? {op} ';
-                    $conditionValues[] = $value;
-                }
-            }
-        }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
-        return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
-    }
-
-    /**
-     * Abstract method that return the necessary 
-     * information (full model namespace)
-     * needed to preform the previous actions.
-     * 
-     * @return string
-     */
-    abstract protected function getModel();
+				if (strtolower($operator) == 'between') 
+				{
+					$conditionString  .= $key . '>=? and ';
+					$conditionValues[] = $value1;
+
+					$conditionString  .= $key . '<=? {op} ';
+					$conditionValues[] = $value2;
+				}
+				else
+				{
+					$conditionString  .= $key . $operator . '? {op} ';
+					$conditionValues[] = $value;
+				}
+			}
+		}
+		$conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
+	}
+
+	/**
+	 * Abstract method that return the necessary 
+	 * information (full model namespace)
+	 * needed to preform the previous actions.
+	 * 
+	 * @return string
+	 */
+	abstract protected function getModel();
 }
\ No newline at end of file

src/Modules/V1/Core/Utl/ErrorHandler.php

Indentation +141 added lines, -141 removed lines

@@ -3,145 +3,145 @@
 class ErrorHandler
 {
 
-    /**
-     * Array of error messags.
-     */
-    private $messages = [
-        "en" => [
-            "unAuthorized"           => "Please login before any action",
-            "tokenExpired"           => "Login token expired",
-            "noPermissions"          => "No permissions",
-            "loginFailed"            => "Wrong mail or password",
-            "redisNotRunning"        => "Your redis notification server isn't running",
-            "dbQueryError"           => "Please check the given inputes",
-            "cannotCreateSetting"    => "Can't create setting",
-            "cannotUpdateSettingKey" => "Can't update setting key",
-            "userIsBlocked"          => "You have been blocked",
-            "invalidResetToken"      => "Reset password token is invalid",
-            "invalidResetPassword"   => "Reset password is invalid",
-            "notFound"               => "The requested {replace} not found",
-            "generalError"           => "Something went wrong",
-        ],
-        "ar" => [
-            "unAuthorized"           => "من فضلك قم بتسجيل الدخول",
-            "tokenExpired"           => "انتهت صلاحية الدخول",
-            "noPermissions"          => "لا توجد صلاحية",
-            "loginFailed"            => "خطأ في البريد لاكتروني او كلمة المرور",
-            "redisNotRunning"        => "سيرفير الاشعارات لايعمل",
-            "dbQueryError"           => "خطا في البيانات",
-            "cannotCreateSetting"    => "لا يمكن اضافة اعدادات",
-            "cannotUpdateSettingKey" => "لا يمكن تعديل اعدادات",
-            "userIsBlocked"          => "لقد تم حظرك",
-            "invalidResetToken"      => "رمز تعديل كلمة المرور خطا",
-            "invalidResetPassword"   => "خطا في نعديل كلمة المرور",
-            "notFound"               => "ال {replace} المطلوب غير موجود",
-            "generalError"           => "حدث خطا ما",
-        ]
-    ];
-
-    /**
-     * The locale language.
-     */
-    private $locale;
-
-    public function __construct()
-    {
-        $locale = \Session::get('locale');
-        switch ($locale) 
-        {
-            case 'en':
-            $this->locale = 'en';
-            break;
-
-            case 'ar':
-            $this->locale = 'ar';
-            break;
-
-            case 'all':
-            $this->locale = 'en';
-            break;
-
-            default:
-            $this->locale = 'en';
-            break;
-        }
-    }
-
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => $this->messages[$this->locale]['unAuthorized']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function tokenExpired()
-    {
-        $error = ['status' => 403, 'message' => $this->messages[$this->locale]['tokenExpired']];
-        abort($error['status'], $error['message']);
-    }
-
-     public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => $this->messages[$this->locale]['noPermissions']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => $this->messages[$this->locale]['loginFailed']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => $this->messages[$this->locale]['redisNotRunning']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => $this->messages[$this->locale]['dbQueryError']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => $this->messages[$this->locale]['cannotCreateSetting']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => $this->messages[$this->locale]['cannotUpdateSettingKey']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => $this->messages[$this->locale]['userIsBlocked']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => $this->messages[$this->locale]['invalidResetToken']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => $this->messages[$this->locale]['invalidResetPassword']];
-        abort($error['status'], $error['message']);
-    }
-
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => str_replace($this->messages[$this->locale]['notFound'], '{replace}', $text)];
-        abort($error['status'], $error['message']);
-    }
-
-    public function generalError()
-    {
-        $error = ['status' => 404, 'message' => $this->messages[$this->locale]['generalError']];
-        abort($error['status'], $error['message']);
-    }
+	/**
+	 * Array of error messags.
+	 */
+	private $messages = [
+		"en" => [
+			"unAuthorized"           => "Please login before any action",
+			"tokenExpired"           => "Login token expired",
+			"noPermissions"          => "No permissions",
+			"loginFailed"            => "Wrong mail or password",
+			"redisNotRunning"        => "Your redis notification server isn't running",
+			"dbQueryError"           => "Please check the given inputes",
+			"cannotCreateSetting"    => "Can't create setting",
+			"cannotUpdateSettingKey" => "Can't update setting key",
+			"userIsBlocked"          => "You have been blocked",
+			"invalidResetToken"      => "Reset password token is invalid",
+			"invalidResetPassword"   => "Reset password is invalid",
+			"notFound"               => "The requested {replace} not found",
+			"generalError"           => "Something went wrong",
+		],
+		"ar" => [
+			"unAuthorized"           => "من فضلك قم بتسجيل الدخول",
+			"tokenExpired"           => "انتهت صلاحية الدخول",
+			"noPermissions"          => "لا توجد صلاحية",
+			"loginFailed"            => "خطأ في البريد لاكتروني او كلمة المرور",
+			"redisNotRunning"        => "سيرفير الاشعارات لايعمل",
+			"dbQueryError"           => "خطا في البيانات",
+			"cannotCreateSetting"    => "لا يمكن اضافة اعدادات",
+			"cannotUpdateSettingKey" => "لا يمكن تعديل اعدادات",
+			"userIsBlocked"          => "لقد تم حظرك",
+			"invalidResetToken"      => "رمز تعديل كلمة المرور خطا",
+			"invalidResetPassword"   => "خطا في نعديل كلمة المرور",
+			"notFound"               => "ال {replace} المطلوب غير موجود",
+			"generalError"           => "حدث خطا ما",
+		]
+	];
+
+	/**
+	 * The locale language.
+	 */
+	private $locale;
+
+	public function __construct()
+	{
+		$locale = \Session::get('locale');
+		switch ($locale) 
+		{
+			case 'en':
+			$this->locale = 'en';
+			break;
+
+			case 'ar':
+			$this->locale = 'ar';
+			break;
+
+			case 'all':
+			$this->locale = 'en';
+			break;
+
+			default:
+			$this->locale = 'en';
+			break;
+		}
+	}
+
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => $this->messages[$this->locale]['unAuthorized']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function tokenExpired()
+	{
+		$error = ['status' => 403, 'message' => $this->messages[$this->locale]['tokenExpired']];
+		abort($error['status'], $error['message']);
+	}
+
+	 public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => $this->messages[$this->locale]['noPermissions']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => $this->messages[$this->locale]['loginFailed']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => $this->messages[$this->locale]['redisNotRunning']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => $this->messages[$this->locale]['dbQueryError']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => $this->messages[$this->locale]['cannotCreateSetting']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => $this->messages[$this->locale]['cannotUpdateSettingKey']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => $this->messages[$this->locale]['userIsBlocked']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => $this->messages[$this->locale]['invalidResetToken']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => $this->messages[$this->locale]['invalidResetPassword']];
+		abort($error['status'], $error['message']);
+	}
+
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => str_replace($this->messages[$this->locale]['notFound'], '{replace}', $text)];
+		abort($error['status'], $error['message']);
+	}
+
+	public function generalError()
+	{
+		$error = ['status' => 404, 'message' => $this->messages[$this->locale]['generalError']];
+		abort($error['status'], $error['message']);
+	}
 }
\ No newline at end of file