SherifElfadaly / Laravel-Api-Skeleton

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

Indentation +32 added lines, -32 removed lines

@@ -4,39 +4,39 @@
 
 abstract class AbstractRepositoryContainer implements RepositoryContainerInterface
 {
-    /**
-     * Construct the repository class name based on
-     * the method name called, search in the 
-     * given namespaces for the class and 
-     * return an instance.
-     * 
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        foreach ($this->getRepoNameSpace() as $repoNameSpace) 
-        {
-            $class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository';
-            if (class_exists($class)) 
-            {
-                \App::singleton($class, function ($app) use ($class) {
+	/**
+	 * Construct the repository class name based on
+	 * the method name called, search in the 
+	 * given namespaces for the class and 
+	 * return an instance.
+	 * 
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		foreach ($this->getRepoNameSpace() as $repoNameSpace) 
+		{
+			$class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository';
+			if (class_exists($class)) 
+			{
+				\App::singleton($class, function ($app) use ($class) {
 
-                    return new \App\Modules\V1\Core\Decorators\CachingDecorator(new $class, $app['cache.store']);
-                });
+					return new \App\Modules\V1\Core\Decorators\CachingDecorator(new $class, $app['cache.store']);
+				});
 
-                return \App::make($class);
-            }
-        }
-    }
+				return \App::make($class);
+			}
+		}
+	}
 
-     /**
-     * Abstract methods that return the necessary 
-     * information (repositories namespaces)
-     * needed to preform the previous actions.
-     * 
-     * @return array
-     */
-    abstract protected function getRepoNameSpace();
+	 /**
+	  * Abstract methods that return the necessary 
+	  * information (repositories namespaces)
+	  * needed to preform the previous actions.
+	  * 
+	  * @return array
+	  */
+	abstract protected function getRepoNameSpace();
 }
\ No newline at end of file

src/Modules/V1/Core/Database/Migrations/2016_01_24_123630_settings.php

Indentation +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@
 	public function up()
 	{
 		Schema::create('settings', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100);
-            $table->string('key',100)->unique();
-            $table->text('value')->nullable();
-            $table->softDeletes();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100);
+			$table->string('key',100)->unique();
+			$table->text('value')->nullable();
+			$table->softDeletes();
+			$table->timestamps();
+		});
 	}
 
 	/**

src/Modules/V1/Core/Http/Controllers/SettingsController.php

Indentation +15 added lines, -15 removed lines

@@ -8,20 +8,20 @@
 
 class SettingsController 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               = 'settings';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model               = 'settings';
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'name'  => 'required|string|max:100',
-    'value' => 'required|string'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'name'  => 'required|string|max:100',
+	'value' => 'required|string'
+	];
 }

src/Modules/V1/Core/Decorators/CachingDecorator.php

Indentation +79 added lines, -79 removed lines

@@ -2,92 +2,92 @@
 
 class CachingDecorator
 {
-    /**
-     * The repo implementation.
-     * 
-     * @var string
-     */
-    protected $repo;
+	/**
+	 * The repo implementation.
+	 * 
+	 * @var string
+	 */
+	protected $repo;
 
-    /**
-     * The cache implementation.
-     * 
-     * @var object
-     */
-    protected $cache;
+	/**
+	 * The cache implementation.
+	 * 
+	 * @var object
+	 */
+	protected $cache;
 
-    /**
-     * The model implementation.
-     * 
-     * @var string
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var string
+	 */
+	public $model;
 
-    /**
-     * The cacheConfig implementation.
-     * 
-     * @var array
-     */
-    public $cacheConfig;
+	/**
+	 * The cacheConfig implementation.
+	 * 
+	 * @var array
+	 */
+	public $cacheConfig;
     
-    /**
-     * Create new CachingDecorator instance.
-     */
-    public function __construct($repo, $cache)
-    {   
-        $this->repo  = $repo;
-        $this->cache = $cache;
-        $this->model = get_class($this->repo->model);
-    }
+	/**
+	 * Create new CachingDecorator instance.
+	 */
+	public function __construct($repo, $cache)
+	{   
+		$this->repo  = $repo;
+		$this->cache = $cache;
+		$this->model = get_class($this->repo->model);
+	}
 
-    /**
-     * Handle the cache mechanism for the called method
-     * based the configurations.
-     * 
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        $this->setCacheConfig($name);
+	/**
+	 * Handle the cache mechanism for the called method
+	 * based the configurations.
+	 * 
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		$this->setCacheConfig($name);
 
-        if ($this->cacheConfig && $this->cacheConfig == 'cache') 
-        {
-            $page     = \Request::get('page') ?? '1';
-            $cacheKey = $name . $page . serialize($arguments);
-            return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($arguments, $name) {
-                return call_user_func_array([$this->repo, $name], $arguments);
-            });
-        }
-        else if ($this->cacheConfig)
-        {
-            $this->cache->tags($this->cacheConfig)->flush();
-            return call_user_func_array([$this->repo, $name], $arguments);
-        }
+		if ($this->cacheConfig && $this->cacheConfig == 'cache') 
+		{
+			$page     = \Request::get('page') ?? '1';
+			$cacheKey = $name . $page . serialize($arguments);
+			return $this->cache->tags([$this->model])->rememberForever($cacheKey, function() use ($arguments, $name) {
+				return call_user_func_array([$this->repo, $name], $arguments);
+			});
+		}
+		else if ($this->cacheConfig)
+		{
+			$this->cache->tags($this->cacheConfig)->flush();
+			return call_user_func_array([$this->repo, $name], $arguments);
+		}
 
-        return call_user_func_array([$this->repo, $name], $arguments);
-    }
+		return call_user_func_array([$this->repo, $name], $arguments);
+	}
 
-    /**
-     * Set cache config based on the called method.
-     * 
-     * @param  string $name
-     * @return void
-     */
-    private function setCacheConfig($name)
-    {
-        $config            = \CoreConfig::getConfig();
-        $cacheConfig       = array_key_exists($this->model, $config['cacheConfig']) ? $config['cacheConfig'][$this->model] : false;
-        $this->cacheConfig = false;
+	/**
+	 * Set cache config based on the called method.
+	 * 
+	 * @param  string $name
+	 * @return void
+	 */
+	private function setCacheConfig($name)
+	{
+		$config            = \CoreConfig::getConfig();
+		$cacheConfig       = array_key_exists($this->model, $config['cacheConfig']) ? $config['cacheConfig'][$this->model] : false;
+		$this->cacheConfig = false;
 
-        if (in_array($cacheConfig['cache'], $name))
-        {
-            $this->cacheConfig = 'cache';
-        }
-        else if (in_array($cacheConfig['clear'], $name))
-        {
-            $this->cacheConfig = $cacheConfig['clear'][$name];
-        }
-    }
+		if (in_array($cacheConfig['cache'], $name))
+		{
+			$this->cacheConfig = 'cache';
+		}
+		else if (in_array($cacheConfig['clear'], $name))
+		{
+			$this->cacheConfig = $cacheConfig['clear'][$name];
+		}
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Http/Controllers/BaseApiController.php

Indentation +267 added lines, -267 removed lines

@@ -6,297 +6,297 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The model implementation.
-     * 
-     * @var string
-     */
-    protected $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var string
+	 */
+	protected $model;
 
-    /**
-     * The config implementation.
-     * 
-     * @var array
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 * 
+	 * @var array
+	 */
+	protected $config;
 
-    /**
-     * The relations implementation.
-     * 
-     * @var array
-     */
-    protected $relations;
+	/**
+	 * The relations implementation.
+	 * 
+	 * @var array
+	 */
+	protected $relations;
 
-    public function __construct()
-    {        
-        $this->config              = \CoreConfig::getConfig();
-        $this->model               = property_exists($this, 'model') ? $this->model : false;
-        $this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
-        $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-        $route                     = explode('@',\Route::currentRouteAction())[1];
+	public function __construct()
+	{        
+		$this->config              = \CoreConfig::getConfig();
+		$this->model               = property_exists($this, 'model') ? $this->model : false;
+		$this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
+		$this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
+		$route                     = explode('@',\Route::currentRouteAction())[1];
 
-        $this->checkPermission($route);
-        $this->setRelations($route);
-        $this->setSessions();
-    }
+		$this->checkPermission($route);
+		$this->setRelations($route);
+		$this->setSessions();
+	}
 
-    /**
-     * Fetch all records with relations from model repository.
-     * 
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function index($sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model)
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($this->relations, $sortBy, $desc), 200);
-        }
-    }
+	/**
+	 * Fetch all records with relations from model repository.
+	 * 
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index($sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model)
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($this->relations, $sortBy, $desc), 200);
+		}
+	}
 
-    /**
-     * Fetch the single object with relations from model repository.
-     * 
-     * @param  integer $id
-     * @return \Illuminate\Http\Response
-     */
-    public function find($id) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $this->relations), 200);
-        }
-    }
+	/**
+	 * Fetch the single object with relations from model repository.
+	 * 
+	 * @param  integer $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find($id) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $this->relations), 200);
+		}
+	}
 
-    /**
-     * Paginate all records with relations from model repository
-     * that matche the given query.
-     * 
-     * @param  string  $query
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
-        }
-    }
+	/**
+	 * Paginate all records with relations from model repository
+	 * that matche the given query.
+	 * 
+	 * @param  string  $query
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $this->relations, $sortBy, $desc), 200);
+		}
+	}
 
-    /**
-     * Fetch records from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
-        }
-    }
+	/**
+	 * Fetch records from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $this->relations, $sortBy, $desc), 200);
+		}
+	}
 
-    /**
-     * Fetch the first record from the storage based on the given
-     * condition.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function first(Request $request) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $this->relations), 200);
-        }
-    }
+	/**
+	 * Fetch the first record from the storage based on the given
+	 * condition.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function first(Request $request) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $this->relations), 200);
+		}
+	}
 
-    /**
-     * Paginate all records with relations from model repository.
-     * 
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $this->relations, $sortBy, $desc), 200);
-        }
-    }
+	/**
+	 * Paginate all records with relations from model repository.
+	 * 
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $this->relations, $sortBy, $desc), 200);
+		}
+	}
 
-    /**
-     * Fetch all records with relations based on
-     * the given condition from storage in pages.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
-        }
-    }
+	/**
+	 * Fetch all records with relations based on
+	 * the given condition from storage in pages.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $this->relations, $sortBy, $desc), 200);
+		}
+	}
 
-    /**
-     * Save the given model to repository.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function save(Request $request) 
-    {
-        foreach ($this->validationRules as &$rule) 
-        {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
-            {
-                $rule .= ',deleted_at,NULL';
-            }
+	/**
+	 * Save the given model to repository.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function save(Request $request) 
+	{
+		foreach ($this->validationRules as &$rule) 
+		{
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
+			{
+				$rule .= ',deleted_at,NULL';
+			}
 
-            if ($request->has('id')) 
-            {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
-            {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+			if ($request->has('id')) 
+			{
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			}
+			else
+			{
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
         
-        $this->validate($request, $this->validationRules);
+		$this->validate($request, $this->validationRules);
 
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->save($request->all()), 200);
-        }
-    }
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->save($request->all()), 200);
+		}
+	}
 
-    /**
-     * Delete by the given id from model repository.
-     * 
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->delete($id), 200);
-        }
-    }
+	/**
+	 * Delete by the given id from model repository.
+	 * 
+	 * @param  integer  $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->delete($id), 200);
+		}
+	}
 
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
-    {
-        return \Response::json(call_user_func_array("\Core::{$this->model}", [])->deleted($request->all(), $perPage, $sortBy, $desc), 200);
-    }
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
+	{
+		return \Response::json(call_user_func_array("\Core::{$this->model}", [])->deleted($request->all(), $perPage, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Restore the deleted model.
-     * 
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id) 
-    {
-        if ($this->model) 
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->restore($id), 200);
-        }
-    }
+	/**
+	 * Restore the deleted model.
+	 * 
+	 * @param  integer  $id
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id) 
+	{
+		if ($this->model) 
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->restore($id), 200);
+		}
+	}
 
-    /**
-     * Check if the logged in user can do the given permission.
-     * 
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        $permission = $permission !== 'index' ? $permission : 'list';
-        if ( ! in_array($permission, $this->skipLoginCheck)) 
-        {
-            $user = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id);
-            if ($user->blocked)
-            {
-                \ErrorHandler::userIsBlocked();
-            }
+	/**
+	 * Check if the logged in user can do the given permission.
+	 * 
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		$permission = $permission !== 'index' ? $permission : 'list';
+		if ( ! in_array($permission, $this->skipLoginCheck)) 
+		{
+			$user = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id);
+			if ($user->blocked)
+			{
+				\ErrorHandler::userIsBlocked();
+			}
             
-            if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
-            {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
+			if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
+			{
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
 
-    /**
-     * Set sessions based on the given headers in the request.
-     * 
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
+	/**
+	 * Set sessions based on the given headers in the request.
+	 * 
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
 
-        $locale = \Request::header('locale');
-        switch ($locale) 
-        {
-            case 'en':
-            \App::setLocale('en');
-            \Session::put('locale', 'en');
-            break;
+		$locale = \Request::header('locale');
+		switch ($locale) 
+		{
+			case 'en':
+			\App::setLocale('en');
+			\Session::put('locale', 'en');
+			break;
 
-            case 'ar':
-            \App::setLocale('ar');
-            \Session::put('locale', 'ar');
-            break;
+			case 'ar':
+			\App::setLocale('ar');
+			\Session::put('locale', 'ar');
+			break;
 
-            case 'all':
-            \App::setLocale('en');
-            \Session::put('locale', 'all');
-            break;
+			case 'all':
+			\App::setLocale('en');
+			\Session::put('locale', 'all');
+			break;
 
-            default:
-            \App::setLocale('en');
-            \Session::put('locale', 'en');
-            break;
-        }
-    }
+			default:
+			\App::setLocale('en');
+			\Session::put('locale', 'en');
+			break;
+		}
+	}
 
-    /**
-     * Set relation based on the called api.
-     * 
-     * @param  string $route
-     * @return void
-     */
-    private function setRelations($route)
-    {
-        $route           = $route !== 'index' ? $route : 'list';
-        $relations       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $this->relations = $relations && $relations[$route] ? $relations[$route] : [];
-    }
+	/**
+	 * Set relation based on the called api.
+	 * 
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
+		$this->relations = $relations && $relations[$route] ? $relations[$route] : [];
+	}
 }

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

Indentation +219 added lines, -219 removed lines

@@ -7,250 +7,250 @@
 
 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';
+	/**
+	 * 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', 'changePassword'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['account', 'logout', 'sendreset', 'changePassword'];
 
-    /**
-     * 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'];
+	/**
+	 * 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     = [
-        'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
-        'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
-        'password' => 'nullable|min:6'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules     = [
+		'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
+		'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
+		'password' => 'nullable|min:6'
+	];
 
-    /**
-     * Return the logged in user account.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function account()
-    {
-        return \Response::json(\Core::users()->account($this->relations), 200);
-    }
+	/**
+	 * Return the logged in user account.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function account()
+	{
+		return \Response::json(\Core::users()->account($this->relations), 200);
+	}
 
-    /**
-     * Block the user.
-     *
-     * @param  integer  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function block($id)
-    {
-        return \Response::json(\Core::users()->block($id), 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);
-    }
+	/**
+	 * 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);
-    }
+	/**
+	 * 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, [
-            'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
-            'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
-            'password' => 'required|min:6'
-            ]);
+	/**
+	 * Handle a registration request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function register(Request $request)
+	{
+		$this->validate($request, [
+			'name'     => 'nullable|string|unique:users,name,{id},id,name,NOT_NULL', 
+			'email'    => 'required|email|unique:users,email,{id},id,email,NOT_NULL', 
+			'password' => 'required|min:6'
+			]);
 
-        return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
-    }
+		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'
-            ]);
+	/**
+	 * 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);
-    }
+		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'
-            ]);
+	/**
+	 * 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);
-    }
+		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'
-            ]);
+	/**
+	 * 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);
-    }
+		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']);
+	/**
+	 * 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']);
 
-        return \Response::json(\Core::users()->sendReset($request->only('email')), 200);
-    }
+		return \Response::json(\Core::users()->sendReset($request->only('email')), 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',
-        ]);
+	/**
+	 * 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);
-    }
+		return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
+	}
 
-    /**
-     * Change the logged in user password.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function changePassword(Request $request)
-    {
-        $this->validate($request, [
-            'old_password'          => 'required',
-            'password'              => 'required|confirmed|min:6',
-            'password_confirmation' => 'required',
-        ]);
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function changePassword(Request $request)
+	{
+		$this->validate($request, [
+			'old_password'          => 'required',
+			'password'              => 'required|confirmed|min:6',
+			'password_confirmation' => 'required',
+		]);
 
-        return \Response::json(\Core::users()->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
-    }
+		return \Response::json(\Core::users()->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
+	}
 
-    /**
-     * Refresh the expired login token.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function refreshtoken()
-    {
-        return \Response::json(\Core::users()->refreshtoken(), 200);
-    }
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function refreshtoken()
+	{
+		return \Response::json(\Core::users()->refreshtoken(), 200);
+	}
 
-    /**
-     * Paginate all users with inthe given group.
-     * 
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string $groupName
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
-    {
-        return \Response::json(\Core::users()->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
-    }
+	/**
+	 * Paginate all users with inthe given group.
+	 * 
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  string $groupName
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group(Request $request, $groupName, $perPage = false, $sortBy = 'created_at', $desc = 1)
+	{
+		return \Response::json(\Core::users()->group($request->all(), $groupName, $this->relations, $perPage, $sortBy, $desc), 200);
+	}
 
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function saveProfile(Request $request) 
-    {
-        foreach ($this->validationRules as &$rule) 
-        {
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
-            {
-                $rule .= ',deleted_at,NULL';
-            }
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function saveProfile(Request $request) 
+	{
+		foreach ($this->validationRules as &$rule) 
+		{
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
+			{
+				$rule .= ',deleted_at,NULL';
+			}
 
-            if ($request->has('id')) 
-            {
-                $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
-            {
-                $rule = str_replace(',{id}', '', $rule);
-            }
-        }
+			if ($request->has('id')) 
+			{
+				$rule = str_replace('{id}', $request->get('id'), $rule);
+			}
+			else
+			{
+				$rule = str_replace(',{id}', '', $rule);
+			}
+		}
 
-        $this->validate($request, $this->validationRules);
+		$this->validate($request, $this->validationRules);
 
-        if ($this->model)
-        {
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->saveProfile($request->all()), 200);
-        }
-    }
+		if ($this->model)
+		{
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->saveProfile($request->all()), 200);
+		}
+	}
 }

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

Indentation +351 added lines, -351 removed lines

@@ -4,362 +4,362 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * Return the logged in user account.
-     *
-     * @param  array   $relations
-     * @return boolean
-     */
-    public function account($relations = [])
-    {
-        $permissions = [];
-        $user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations);
-        foreach ($user->groups()->get() as $group)
-        {
-            $group->permissions->each(function ($permission) use (&$permissions){
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
-        $user->permissions = $permissions;
-
-       return $user;
-    }
-
-    /**
-     * Check if the logged in user or the given user 
-     * has the given permissions on the given model.
-     * 
-     * @param  string  $nameOfPermission
-     * @param  string  $model            
-     * @param  boolean $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false )
-    {      
-        $user        = $user ?: \JWTAuth::parseToken()->authenticate();
-        $permissions = [];
-
-        if ( ! $user = $this->find($user->id, ['groups.permissions'])) 
-        {
-            \ErrorHandler::tokenExpired();
-        }
-
-        $user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
-            $permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
-        });
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\AclUser';
+	}
+
+	/**
+	 * Return the logged in user account.
+	 *
+	 * @param  array   $relations
+	 * @return boolean
+	 */
+	public function account($relations = [])
+	{
+		$permissions = [];
+		$user        = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id, $relations);
+		foreach ($user->groups()->get() as $group)
+		{
+			$group->permissions->each(function ($permission) use (&$permissions){
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
+		$user->permissions = $permissions;
+
+	   return $user;
+	}
+
+	/**
+	 * Check if the logged in user or the given user 
+	 * has the given permissions on the given model.
+	 * 
+	 * @param  string  $nameOfPermission
+	 * @param  string  $model            
+	 * @param  boolean $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false )
+	{      
+		$user        = $user ?: \JWTAuth::parseToken()->authenticate();
+		$permissions = [];
+
+		if ( ! $user = $this->find($user->id, ['groups.permissions'])) 
+		{
+			\ErrorHandler::tokenExpired();
+		}
+
+		$user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     * 
-     * @param  string  $groupName
-     * @return boolean
-     */
-    public function hasGroup($groupName)
-    {
-        $groups = $this->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
-        return $groups->pluck('name')->search($groupName, true) === false ? false : true;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     * 
-     * @param  integer $user_id    
-     * @param  array   $group_ids
-     * @return object
-     */
-    public function assignGroups($user_id, $group_ids)
-    {
-        \DB::transaction(function () use ($user_id, $group_ids) {
-            $user = $this->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return $this->find($user_id);
-    }
-
-    /**
-     * Handle a login request to the application.
-     * 
-     * @param  array   $credentials    
-     * @param  boolean $adminLogin
-     * @return array
-     */
-    public function login($credentials, $adminLogin = false)
-    {
-        if ( ! $user = $this->first(['email' => $credentials['email']])) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::loginFailed();
-        }
-        else if ($user->blocked)
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
-        {
-            return ['token' => $token];
-        }
-        else
-        {
-            \ErrorHandler::loginFailed();
-        }
-    }
-
-    /**
-     * Handle a social login request of the none admin to the application.
-     * 
-     * @param  array   $credentials
-     * @return array
-     */
-    public function loginSocial($credentials)
-    {
-        $access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
-        $user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
-
-        if ( ! $user->email)
-        {
-            \ErrorHandler::noSocialEmail();
-        }
-
-        if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
-        {
-            $data = ['email' => $user->email, 'password' => ''];
-            return $this->register($data);
-        }
-        else
-        {
-            if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
-            {
-                \ErrorHandler::userAlreadyRegistered();
-            }
-            return $this->login(['email' => $registeredUser->email, 'password' => ''], false);
-        }
-    }
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @return boolean
+	 */
+	public function hasGroup($groupName)
+	{
+		$groups = $this->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
+		return $groups->pluck('name')->search($groupName, true) === false ? false : true;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 * 
+	 * @param  integer $user_id    
+	 * @param  array   $group_ids
+	 * @return object
+	 */
+	public function assignGroups($user_id, $group_ids)
+	{
+		\DB::transaction(function () use ($user_id, $group_ids) {
+			$user = $this->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return $this->find($user_id);
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 * 
+	 * @param  array   $credentials    
+	 * @param  boolean $adminLogin
+	 * @return array
+	 */
+	public function login($credentials, $adminLogin = false)
+	{
+		if ( ! $user = $this->first(['email' => $credentials['email']])) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($adminLogin && $user->groups->pluck('name')->search('Admin', true) === false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ( ! $adminLogin && $user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::loginFailed();
+		}
+		else if ($user->blocked)
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+		else if ($token = \JWTAuth::attempt($credentials))
+		{
+			return ['token' => $token];
+		}
+		else
+		{
+			\ErrorHandler::loginFailed();
+		}
+	}
+
+	/**
+	 * Handle a social login request of the none admin to the application.
+	 * 
+	 * @param  array   $credentials
+	 * @return array
+	 */
+	public function loginSocial($credentials)
+	{
+		$access_token = $credentials['auth_code'] ? \Socialite::driver($credentials['type'])->getAccessToken($credentials['auth_code']) : $credentials['access_token'];
+		$user         = \Socialite::driver($credentials['type'])->userFromToken($access_token);
+
+		if ( ! $user->email)
+		{
+			\ErrorHandler::noSocialEmail();
+		}
+
+		if ( ! $registeredUser = $this->model->where('email', $user->email)->first()) 
+		{
+			$data = ['email' => $user->email, 'password' => ''];
+			return $this->register($data);
+		}
+		else
+		{
+			if ( ! \Auth::attempt(['email' => $registeredUser->email, 'password' => '']))
+			{
+				\ErrorHandler::userAlreadyRegistered();
+			}
+			return $this->login(['email' => $registeredUser->email, 'password' => ''], false);
+		}
+	}
     
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return array
-     */
-    public function register($credentials)
-    {
-        return ['token' => \JWTAuth::fromUser($this->model->create($credentials))];
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return boolean
-     */
-    public function logout()
-    {
-        return \JWTAuth::invalidate(\JWTAuth::getToken());
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function block($user_id)
-    {
-        if ( ! $user = $this->find($user_id)) 
-        {
-            \ErrorHandler::notFound('user');
-        }
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
-        {
-            \ErrorHandler::noPermissions();
-        }
-        else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user->blocked = 1;
-        $user->save();
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return array
+	 */
+	public function register($credentials)
+	{
+		return ['token' => \JWTAuth::fromUser($this->model->create($credentials))];
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return boolean
+	 */
+	public function logout()
+	{
+		return \JWTAuth::invalidate(\JWTAuth::getToken());
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function block($user_id)
+	{
+		if ( ! $user = $this->find($user_id)) 
+		{
+			\ErrorHandler::notFound('user');
+		}
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if (\JWTAuth::parseToken()->authenticate()->id == $user_id)
+		{
+			\ErrorHandler::noPermissions();
+		}
+		else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function unblock($user_id)
-    {
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = $this->find($user_id);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        if ( ! $user = $this->model->where('email', $email)->first())
-        {
-            \ErrorHandler::notFound('email');
-        }
-
-        $url   = $this->config['resetLink'];
-        $token = \Password::getRepository()->create($user);
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = $this->find($user_id);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		if ( ! $user = $this->model->where('email', $email)->first())
+		{
+			\ErrorHandler::notFound('email');
+		}
+
+		$url   = $this->config['resetLink'];
+		$token = \Password::getRepository()->create($user);
         
-        \Mail::send('auth.emails.password', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
-            $m->to($user->email, $user->name)->subject('Your Password Reset Link');
-        });
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return array
-     */
-    public function resetPassword($credentials)
-    {
-        $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
-            $user->password = bcrypt($password);
-            $user->save();
-
-            $token = \JWTAuth::fromUser($user);
-        });
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return ['token' => $token];
+		\Mail::send('auth.emails.password', ['user' => $user, 'url' => $url, 'token' => $token], function ($m) use ($user) {
+			$m->to($user->email, $user->name)->subject('Your Password Reset Link');
+		});
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return array
+	 */
+	public function resetPassword($credentials)
+	{
+		$token    = false;
+		$response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+			$user->password = bcrypt($password);
+			$user->save();
+
+			$token = \JWTAuth::fromUser($user);
+		});
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return ['token' => $token];
                 
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
-
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
-
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
-
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
-
-    /**
-     * Change the logged in user password.
-     *
-     * @param  array  $credentials
-     * @return void
-     */
-    public function changePassword($credentials)
-    {
-        $user = $this->find(\JWTAuth::parseToken()->authenticate()->id);
-        if ( ! \Hash::check($credentials['old_password'], $user->password)) 
-        {
-            \ErrorHandler::invalidOldPassword();
-        }
-
-        $user->password = $credentials['password'];
-        $user->save();
-    }
-
-    /**
-     * Refresh the expired login token.
-     *
-     * @return array
-     */
-    public function refreshtoken()
-    {
-        $token = \JWTAuth::parseToken()->refresh();
-
-        return ['token' => $token];
-    }
-
-    /**
-     * Paginate all users in the given group based on the given conditions.
-     * 
-     * @param  string  $groupName
-     * @param  array   $relations
-     * @param  integer $perPage
-     * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
-     */
-    public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
-    {   
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = call_user_func_array("{$this->getModel()}::with", array($relations));
-
-        $model->whereHas('groups', function($q) use ($groupName){
-            $q->where('name', $groupName);
-        });
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
+
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
+
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
+
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
+
+	/**
+	 * Change the logged in user password.
+	 *
+	 * @param  array  $credentials
+	 * @return void
+	 */
+	public function changePassword($credentials)
+	{
+		$user = $this->find(\JWTAuth::parseToken()->authenticate()->id);
+		if ( ! \Hash::check($credentials['old_password'], $user->password)) 
+		{
+			\ErrorHandler::invalidOldPassword();
+		}
+
+		$user->password = $credentials['password'];
+		$user->save();
+	}
+
+	/**
+	 * Refresh the expired login token.
+	 *
+	 * @return array
+	 */
+	public function refreshtoken()
+	{
+		$token = \JWTAuth::parseToken()->refresh();
+
+		return ['token' => $token];
+	}
+
+	/**
+	 * Paginate all users in the given group based on the given conditions.
+	 * 
+	 * @param  string  $groupName
+	 * @param  array   $relations
+	 * @param  integer $perPage
+	 * @param  string  $sortBy
+	 * @param  boolean $desc
+	 * @return \Illuminate\Http\Response
+	 */
+	public function group($conditions, $groupName, $relations, $perPage, $sortBy, $desc)
+	{   
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = call_user_func_array("{$this->getModel()}::with", array($relations));
+
+		$model->whereHas('groups', function($q) use ($groupName){
+			$q->where('name', $groupName);
+		});
 
         
-        if (count($conditions['conditionValues']))
-        {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        if ($perPage) 
-        {
-            return $model->orderBy($sortBy, $sort)->paginate($perPage);
-        }
-
-        return $model->orderBy($sortBy, $sort)->get();
-    }
-
-    /**
-     * Save the given data to the logged in user.
-     *
-     * @param  array $credentials
-     * @return object
-     */
-    public function saveProfile($credentials) 
-    {
-        $user = \JWTAuth::parseToken()->authenticate();
-        $user->save($credentials);
-
-        return $user;
-    }
+		if (count($conditions['conditionValues']))
+		{
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		if ($perPage) 
+		{
+			return $model->orderBy($sortBy, $sort)->paginate($perPage);
+		}
+
+		return $model->orderBy($sortBy, $sort)->get();
+	}
+
+	/**
+	 * Save the given data to the logged in user.
+	 *
+	 * @param  array $credentials
+	 * @return object
+	 */
+	public function saveProfile($credentials) 
+	{
+		$user = \JWTAuth::parseToken()->authenticate();
+		$user->save($credentials);
+
+		return $user;
+	}
 }

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

Indentation +9 added lines, -9 removed lines

@@ -3,15 +3,15 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-    	$customSettings = [];
-    	Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
-    		$customSettings[$setting['key']] = $setting['value'];
-    	});
+	public function getConfig()
+	{
+		$customSettings = [];
+		Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
+			$customSettings[$setting['key']] = $setting['value'];
+		});
 
-        return array_merge($customSettings, [
-        	'resetLink' => '{{link_here}}',
+		return array_merge($customSettings, [
+			'resetLink' => '{{link_here}}',
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -150,5 +150,5 @@ 
 				]
 			]
 		]);
-    }
+	}
 }
\ No newline at end of file

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

Indentation +642 added lines, -642 removed lines

@@ -4,657 +4,657 @@
 
 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, $this->model);
-        $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, $this->model);
+		$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']);
-                                    }
-
-                                    foreach ($value as $relationAttribute => $relationValue) 
-                                    {
-                                        /**
-                                         * Prevent attributes not in the fillable.
-                                         */
-                                        if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) 
-                                        {
-                                            $relationModel->$relationAttribute = $relationValue;
-                                        }
-                                    }
-
-                                    $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       = $model->$key()->getForeignKeyName();
-                                $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 'HasOne':
-                            $foreignKeyName         = $model->$key()->getForeignKeyName();
-                            $value->$foreignKeyName = $model->id;
-                            $value->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']);
+									}
+
+									foreach ($value as $relationAttribute => $relationValue) 
+									{
+										/**
+										 * Prevent attributes not in the fillable.
+										 */
+										if (array_search($relationAttribute, $relationModel->getFillable(), true) !== false) 
+										{
+											$relationModel->$relationAttribute = $relationValue;
+										}
+									}
+
+									$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       = $model->$key()->getForeignKeyName();
+								$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 'HasOne':
+							$foreignKeyName         = $model->$key()->getForeignKeyName();
+							$value->$foreignKeyName = $model->id;
+							$value->save();
+							break;
+					}
+				}
+			}
+
+			$saveLog ? \Logging::saveLog(array_key_exists('id', $data) ? 'update' : 'create', class_basename($modelClass), $this->getModel(), $model->id, $model) : false;
+		});
             
-        return $model->id;
-    }
+		return $model->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 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  var $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) use ($saveLog){
-                    $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) use ($saveLog){
+					$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, $this->model);
-        $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, $this->model);
-        return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($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 = array('*'))
-    {
-        unset($conditions['page']);
-        $conditions = $this->constructConditions($conditions, $this->model);
-        $sort       = $desc ? 'desc' : 'asc';
-        $model      = $this->model->onlyTrashed();
-
-        if (count($conditions['conditionValues']))
-        {
-            $model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
-        }
-
-        return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
-    }
-
-    /**
-     * Restore the deleted model.
-     * 
-     * @param  integer $id
-     * @return void
-     */
-    public function restore($id)
-    {
-        $model = $this->model->onlyTrashed()->find($id);
-
-        if ( ! $model) 
-        {
-            \ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
-        }
-
-        $model->restore();
-    }
-
-    /**
-     * Build the conditions recursively for the retrieving methods.
-     * @param  array $conditions
-     * @return array
-     */
-    protected function constructConditions($conditions, $model)
-    {   
-        $conditionString = '';
-        $conditionValues = [];
-        foreach ($conditions as $key => $value) 
-        {
-            if ($key == 'and') 
-            {
-                $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else if ($key == 'or')
-            {
-                $conditions       = $this->constructConditions($value, $model);
-                $conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
-                $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-            }
-            else
-            {
-                if (is_array($value)) 
-                {
-                    $operator = $value['op'];
-                    if (strtolower($operator) == 'between') 
-                    {
-                        $value1 = $value['val1'];
-                        $value2 = $value['val2'];
-                    }
-                    else
-                    {
-                        $value = array_key_exists('val', $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, $this->model);
+		$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, $this->model);
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($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 = array('*'))
+	{
+		unset($conditions['page']);
+		$conditions = $this->constructConditions($conditions, $this->model);
+		$sort       = $desc ? 'desc' : 'asc';
+		$model      = $this->model->onlyTrashed();
+
+		if (count($conditions['conditionValues']))
+		{
+			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
+		}
+
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
+	}
+
+	/**
+	 * Restore the deleted model.
+	 * 
+	 * @param  integer $id
+	 * @return void
+	 */
+	public function restore($id)
+	{
+		$model = $this->model->onlyTrashed()->find($id);
+
+		if ( ! $model) 
+		{
+			\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
+		}
+
+		$model->restore();
+	}
+
+	/**
+	 * Build the conditions recursively for the retrieving methods.
+	 * @param  array $conditions
+	 * @return array
+	 */
+	protected function constructConditions($conditions, $model)
+	{   
+		$conditionString = '';
+		$conditionValues = [];
+		foreach ($conditions as $key => $value) 
+		{
+			if ($key == 'and') 
+			{
+				$conditions       = $this->constructConditions($value, $model);
+				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+			}
+			else if ($key == 'or')
+			{
+				$conditions       = $this->constructConditions($value, $model);
+				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
+				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+			}
+			else
+			{
+				if (is_array($value)) 
+				{
+					$operator = $value['op'];
+					if (strtolower($operator) == 'between') 
+					{
+						$value1 = $value['val1'];
+						$value2 = $value['val2'];
+					}
+					else
+					{
+						$value = array_key_exists('val', $value) ? $value['val'] : '';
+					}
+				}
+				else
+				{
+					$operator = '=';
+				}
                 
-                if (strtolower($operator) == 'between') 
-                {
-                    $conditionString  .= $key . ' >= ? and ';
-                    $conditionValues[] = $value1;
-
-                    $conditionString  .= $key . ' <= ? {op} ';
-                    $conditionValues[] = $value2;
-                }
-                elseif (strtolower($operator) == 'in') 
-                {
-                    $conditionValues  = array_merge($conditionValues, $value);
-                    $inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-                    $conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
-                }
-                elseif (strtolower($operator) == 'null') 
-                {
-                    $conditionString .= $key . ' is null {op} ';
-                }
-                elseif (strtolower($operator) == 'not null') 
-                {
-                    $conditionString .= $key . ' is not null {op} ';
-                }
-                elseif (strtolower($operator) == 'has') 
-                {
-                    $sql              = $model->withTrashed()->has($key)->toSql();
-                    $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                    $conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
-                    $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-                }
-                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;
+				}
+				elseif (strtolower($operator) == 'in') 
+				{
+					$conditionValues  = array_merge($conditionValues, $value);
+					$inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
+					$conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
+				}
+				elseif (strtolower($operator) == 'null') 
+				{
+					$conditionString .= $key . ' is null {op} ';
+				}
+				elseif (strtolower($operator) == 'not null') 
+				{
+					$conditionString .= $key . ' is not null {op} ';
+				}
+				elseif (strtolower($operator) == 'has') 
+				{
+					$sql              = $model->withTrashed()->has($key)->toSql();
+					$conditions       = $this->constructConditions($value, $model->$key()->getRelated());
+					$conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')') . ' and ' . $conditions['conditionString'] . ') {op} ';
+					$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
+				}
+				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