SherifElfadaly / Laravel-Api-Skeleton

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

Indentation +13 added lines, -13 removed lines

@@ -2,17 +2,17 @@
 
 class Logging
 {
-    public function saveLog($action, $item_name, $item_type, $item_id)
-    {
-    	if (\Core::logs() && $item_name !== 'Log')
-    	{
-    		\Core::logs()->save([
-	    		'action'      => $action,
-	    		'item_name'   => $item_name,
-	    		'item_type'   => $item_type,
-	    		'item_id'     => $item_id,
-	    		'user_id'     => \JWTAuth::parseToken()->authenticate()->id,
-	    		], false, false);
-    	}
-    }
+	public function saveLog($action, $item_name, $item_type, $item_id)
+	{
+		if (\Core::logs() && $item_name !== 'Log')
+		{
+			\Core::logs()->save([
+				'action'      => $action,
+				'item_name'   => $item_name,
+				'item_type'   => $item_type,
+				'item_id'     => $item_id,
+				'user_id'     => \JWTAuth::parseToken()->authenticate()->id,
+				], false, false);
+		}
+	}
 }
\ No newline at end of file

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

Braces +1 added lines, -2 removed lines

@@ -170,8 +170,7 @@
             if ($request->has('id')) 
             {
                 $rule = str_replace('{id}', $request->get('id'), $rule);
-            }
-            else
+            } else
             {
                 $rule = str_replace(',{id}', '', $rule);
             }

Doc Comments +16 added lines, -16 removed lines

@@ -61,7 +61,7 @@ 
     /**
      * Fetch all records with relations from model repository.
      * 
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function index() 
     {
@@ -76,7 +76,7 @@ 
      * Fetch the single object with relations from model repository.
      * 
      * @param  integer $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function find($id) 
     {
@@ -94,8 +94,8 @@ 
      * @param  string  $query
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
     {
@@ -112,8 +112,8 @@ 
      * 
      * @param  \Illuminate\Http\Request  $request
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
     {
@@ -129,7 +129,7 @@ 
      * condition.
      * 
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function first(Request $request) 
     {
@@ -145,8 +145,8 @@ 
      * 
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
     {
@@ -164,8 +164,8 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
     {
@@ -180,7 +180,7 @@ 
      * Save the given model to repository.
      * 
      * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function save(Request $request) 
     {
@@ -213,7 +213,7 @@ 
      * Delete by the given id from model repository.
      * 
      * @param  integer  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function delete($id) 
     {
@@ -229,8 +229,8 @@ 
      * @param  \Illuminate\Http\Request  $request
      * @param  integer $perPage
      * @param  string  $sortBy
-     * @param  boolean $desc
-     * @return \Illuminate\Http\Response
+     * @param  integer $desc
+     * @return \Illuminate\Http\JsonResponse
      */
     public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
     {
@@ -241,7 +241,7 @@ 
      * Restore the deleted model.
      * 
      * @param  integer  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse|null
      */
     public function restore($id) 
     {

Indentation +245 added lines, -245 removed lines

@@ -6,272 +6,272 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The model implementation.
-     * 
-     * @var model
-     */
-    protected $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var model
+	 */
+	protected $model;
 
-    /**
-     * The config implementation.
-     * 
-     * @var config
-     */
-    protected $config;
+	/**
+	 * The config implementation.
+	 * 
+	 * @var config
+	 */
+	protected $config;
 
-    public function __construct()
-    {
-        \Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
+	public function __construct()
+	{
+		\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;
+		}
         
-        $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 : [];
-        $this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $route                     = explode('@',\Route::currentRouteAction())[1];
-        $this->checkPermission($route);
-    }
+		$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 : [];
+		$this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
+		$route                     = explode('@',\Route::currentRouteAction())[1];
+		$this->checkPermission($route);
+	}
 
-    /**
-     * Fetch all records with relations from model repository.
-     * 
-     * @return \Illuminate\Http\Response
-     */
-    public function index() 
-    {
-        if ($this->model)
-        {
-            $relations = $this->relations && $this->relations['all'] ? $this->relations['all'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($relations), 200);
-        }
-    }
+	/**
+	 * Fetch all records with relations from model repository.
+	 * 
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index() 
+	{
+		if ($this->model)
+		{
+			$relations = $this->relations && $this->relations['all'] ? $this->relations['all'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($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) 
-        {
-            $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $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) 
+		{
+			$relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $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) 
-        {
-            $relations = $this->relations && $this->relations['search'] ? $this->relations['search'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $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) 
+		{
+			$relations = $this->relations && $this->relations['search'] ? $this->relations['search'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $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) 
-        {
-            $relations = $this->relations && $this->relations['findBy'] ? $this->relations['findBy'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $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) 
+		{
+			$relations = $this->relations && $this->relations['findBy'] ? $this->relations['findBy'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $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) 
-        {
-            $relations = $this->relations && $this->relations['first'] ? $this->relations['first'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $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) 
+		{
+			$relations = $this->relations && $this->relations['first'] ? $this->relations['first'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $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) 
-        {
-            $relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $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) 
+		{
+			$relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $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) 
-        {
-            $relations = $this->relations && $this->relations['paginateBy'] ? $this->relations['paginateBy'] : [];
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $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) 
+		{
+			$relations = $this->relations && $this->relations['paginateBy'] ? $this->relations['paginateBy'] : [];
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $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();
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
         $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
         $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
         $this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $route                     = explode('@',\Route::currentRouteAction())[1];
+        $route                     = explode('@', \Route::currentRouteAction())[1];
         $this->checkPermission($route);
     }
 

src/Modules/V1/Notifications/Http/Controllers/PushNotificationsDevicesController.php

Indentation +17 added lines, -17 removed lines

@@ -7,22 +7,22 @@
 
 class PushNotificationsDevicesController 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            = 'pushNotificationDevices';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model            = 'pushNotificationDevices';
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'device_token' => 'required|string|max:255',
-    'device_type'  => 'required|in:android,ios',
-    'user_id'      => 'required|exists:users,id',
-    'active'       => 'boolean'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'device_token' => 'required|string|max:255',
+	'device_type'  => 'required|in:android,ios',
+	'user_id'      => 'required|exists:users,id',
+	'active'       => 'boolean'
+	];
 }

Spacing +2 added lines, -2 removed lines

@@ -12,14 +12,14 @@
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model            = 'pushNotificationDevices';
+    protected $model = 'pushNotificationDevices';
 
     /**
      * The validations rules used by the base api controller
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
     'device_token' => 'required|string|max:255',
     'device_type'  => 'required|in:android,ios',
     'user_id'      => 'required|exists:users,id',

src/Modules/V1/Notifications/PushNotificationDevice.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class PushNotificationDevice extends Model{
+class PushNotificationDevice extends Model {
 
     use SoftDeletes;
     protected $table    = 'push_notifications_devices';

Indentation +28 added lines, -28 removed lines

@@ -5,37 +5,37 @@
 
 class PushNotificationDevice extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'push_notifications_devices';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['device_token', 'device_type', 'user_id', 'active'];
-    public $searchable  = ['device_token', 'device_type'];
+	use SoftDeletes;
+	protected $table    = 'push_notifications_devices';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['device_token', 'device_type', 'user_id', 'active'];
+	public $searchable  = ['device_token', 'device_type'];
 
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
     
-    public function user()
-    {
-        return $this->belongsTo('App\Modules\V1\Acl\AclUser');
-    }
+	public function user()
+	{
+		return $this->belongsTo('App\Modules\V1\Acl\AclUser');
+	}
 
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\PushNotificationDeviceObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\PushNotificationDeviceObserver'));
+	}
 }

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

Indentation +65 added lines, -65 removed lines

@@ -4,75 +4,75 @@
 
 class PushNotificationDeviceRepository extends AbstractRepository
 {
-      /**
-      * Return the model full namespace.
-      * 
-      * @return string
-      */
-      protected function getModel()
-      {
-          return 'App\Modules\V1\Notifications\PushNotificationDevice';
-      }
+	  /**
+	   * Return the model full namespace.
+	   * 
+	   * @return string
+	   */
+	  protected function getModel()
+	  {
+		  return 'App\Modules\V1\Notifications\PushNotificationDevice';
+	  }
 
-    /**
-     * Set the notification notified to all.
-     *
-     * @param  array  $users_ids
-     * @param  string $messageText
-     * @return void
-     */
-    public function broadcast($users_ids, $messageText)
-    {
-        $devicesArray = [];
-        $devices      = $this->model->whereIn('user_id', $users_ids)->get();
-        foreach ($devices as $device) 
-        {
-            $devicesArray[$device->device_type][] = \PushNotification::Device($device->device_token);
-        }
+	/**
+	 * Set the notification notified to all.
+	 *
+	 * @param  array  $users_ids
+	 * @param  string $messageText
+	 * @return void
+	 */
+	public function broadcast($users_ids, $messageText)
+	{
+		$devicesArray = [];
+		$devices      = $this->model->whereIn('user_id', $users_ids)->get();
+		foreach ($devices as $device) 
+		{
+			$devicesArray[$device->device_type][] = \PushNotification::Device($device->device_token);
+		}
         
-        if (array_key_exists('ios', $devicesArray)) 
-        {
-            $message = $this->constructMessage($messageText, [ 'badge' => 15, 'sound' => 'default', 'content-available' => 1 ]);
-            $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']);
-            $this->push('ios', $iosDevices, $message);
-        }
+		if (array_key_exists('ios', $devicesArray)) 
+		{
+			$message = $this->constructMessage($messageText, [ 'badge' => 15, 'sound' => 'default', 'content-available' => 1 ]);
+			$iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']);
+			$this->push('ios', $iosDevices, $message);
+		}
 
-        if (array_key_exists('android', $devicesArray)) 
-        {
-            $message = $this->constructMessage($messageText);
-            $androidDevices = \PushNotification::DeviceCollection($devicesArray['android']);
-            $this->push('android', $androidDevices, $message);
-        }
-    }
+		if (array_key_exists('android', $devicesArray)) 
+		{
+			$message = $this->constructMessage($messageText);
+			$androidDevices = \PushNotification::DeviceCollection($devicesArray['android']);
+			$this->push('android', $androidDevices, $message);
+		}
+	}
 
 
-    /**
-     * Set the notification notified to true.
-     *
-     * @param  string    $type
-     * @param  colletion $devices
-     * @param  string    $message
-     * @return object
-     */
-    public function push($type, $devices, $message)
-    {
-        $collection = \PushNotification::app($type)->to($devices)->send($message);
-        foreach ($collection->pushManager as $push) 
-        {
-            $response[] = $push->getAdapter()->getResponse();
-        }
-        dd($response);
-    }
+	/**
+	 * Set the notification notified to true.
+	 *
+	 * @param  string    $type
+	 * @param  colletion $devices
+	 * @param  string    $message
+	 * @return object
+	 */
+	public function push($type, $devices, $message)
+	{
+		$collection = \PushNotification::app($type)->to($devices)->send($message);
+		foreach ($collection->pushManager as $push) 
+		{
+			$response[] = $push->getAdapter()->getResponse();
+		}
+		dd($response);
+	}
 
-    /**
-     * Construct the notification message.
-     *
-     * @param  string $messageText
-     * @param  array  $options
-     * @return object
-     */
-    protected function constructMessage($messageText, $options = [])
-    {
-        return \PushNotification::Message($messageText, $options);
-    }
+	/**
+	 * Construct the notification message.
+	 *
+	 * @param  string $messageText
+	 * @param  array  $options
+	 * @return object
+	 */
+	protected function constructMessage($messageText, $options = [])
+	{
+		return \PushNotification::Message($messageText, $options);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         
         if (array_key_exists('ios', $devicesArray)) 
         {
-            $message = $this->constructMessage($messageText, [ 'badge' => 15, 'sound' => 'default', 'content-available' => 1 ]);
+            $message = $this->constructMessage($messageText, ['badge' => 15, 'sound' => 'default', 'content-available' => 1]);
             $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']);
             $this->push('ios', $iosDevices, $message);
         }

src/Modules/V1/Reporting/Report.php

Indentation +18 added lines, -18 removed lines

@@ -5,32 +5,32 @@
 
 class Report extends Model{
 
-    use SoftDeletes;
+	use SoftDeletes;
 	protected $table    = 'reports';
 	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
 	protected $hidden   = ['deleted_at'];
 	protected $guarded  = ['id'];
 	protected $fillable = ['report_name', 'view_name'];
-    public $searchable  = ['report_name', 'view_name'];
+	public $searchable  = ['report_name', 'view_name'];
 
 	public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Reporting\ModelObservers\ReprotObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Reporting\ModelObservers\ReprotObserver'));
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Report extends Model{
+class Report extends Model {
 
     use SoftDeletes;
 	protected $table    = 'reports';
@@ -11,7 +11,7 @@ 
 	protected $hidden   = ['deleted_at'];
 	protected $guarded  = ['id'];
 	protected $fillable = ['report_name', 'view_name'];
-    public $searchable  = ['report_name', 'view_name'];
+    public $searchable = ['report_name', 'view_name'];
 
 	public function getCreatedAtAttribute($value)
     {

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

Indentation +106 added lines, -106 removed lines

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

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

Indentation +18 added lines, -18 removed lines

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

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

Braces +2 added lines, -4 removed lines

@@ -38,8 +38,7 @@ 
         if ( ! $report) 
         {
             \ErrorHandler::notFound('report');
-        }
-        else if ( ! \Core::users()->can($report->view_name, 'reports'))
+        } else if ( ! \Core::users()->can($report->view_name, 'reports'))
         {
             \ErrorHandler::noPermissions();
         }
@@ -60,8 +59,7 @@ 
         if ($perPage) 
         {
             return $report->paginate($perPage);
-        }
-        else
+        } else
         {
             return $report->get();  
         }

Indentation +59 added lines, -59 removed lines

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