SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/AclUser.php

Indentation +127 added lines, -127 removed lines

@@ -7,133 +7,133 @@
 class AclUser extends User
 {
 
-    use SoftDeletes, HasApiTokens;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
-    public $searchable  = ['name', 'email'];
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token', 'deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['profile_picture', 'name', 'email', 'password', 'locale', 'timezone'];
+	public $searchable  = ['name', 'email'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
-
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
-    public function getProfilePictureAttribute($value)
-    {
-        return url(\Storage::url($value));
-    }
-
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     *
-     * @param string $value
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
-
-    /**
-     * Get the entity's notifications.
-     */
-    public function notifications()
-    {
-        return $this->morphMany('App\Modules\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
-    }
-
-    /**
-     * Get the entity's read notifications.
-     */
-    public function readNotifications()
-    {
-        return $this->notifications()->whereNotNull('read_at');
-    }
-
-    /**
-     * Get the entity's unread notifications.
-     */
-    public function unreadNotifications()
-    {
-        return $this->notifications()->whereNull('read_at');
-    }
-
-    public function roles()
-    {
-        return $this->belongsToMany('App\Modules\Roles\Role', 'users_roles', 'user_id', 'role_id')->whereNull('users_roles.deleted_at')->withTimestamps();
-    }
-
-    public function oauthClients()
-    {
-        return $this->hasMany('App\Modules\OauthClients\OauthClient', 'user_id');
-    }
-
-    /**
-     * Return fcm device tokens that will be used in sending fcm notifications.
-     *
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) {
-            if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.'.$this->id;
-    }
-
-    /**
-     * Custom password validation.
-     *
-     * @param  string $password
-     * @return boolean
-     */
-    public function validateForPassportPasswordGrant($password)
-    {
-        if ($password == config('skeleton.social_pass')) {
-            return true;
-        }
-
-        return \Hash::check($password, $this->password);
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
+
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
+	public function getProfilePictureAttribute($value)
+	{
+		return url(\Storage::url($value));
+	}
+
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 *
+	 * @param string $value
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
+
+	/**
+	 * Get the entity's notifications.
+	 */
+	public function notifications()
+	{
+		return $this->morphMany('App\Modules\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
+	}
+
+	/**
+	 * Get the entity's read notifications.
+	 */
+	public function readNotifications()
+	{
+		return $this->notifications()->whereNotNull('read_at');
+	}
+
+	/**
+	 * Get the entity's unread notifications.
+	 */
+	public function unreadNotifications()
+	{
+		return $this->notifications()->whereNull('read_at');
+	}
+
+	public function roles()
+	{
+		return $this->belongsToMany('App\Modules\Roles\Role', 'users_roles', 'user_id', 'role_id')->whereNull('users_roles.deleted_at')->withTimestamps();
+	}
+
+	public function oauthClients()
+	{
+		return $this->hasMany('App\Modules\OauthClients\OauthClient', 'user_id');
+	}
+
+	/**
+	 * Return fcm device tokens that will be used in sending fcm notifications.
+	 *
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) {
+			if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) {
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.'.$this->id;
+	}
+
+	/**
+	 * Custom password validation.
+	 *
+	 * @param  string $password
+	 * @return boolean
+	 */
+	public function validateForPassportPasswordGrant($password)
+	{
+		if ($password == config('skeleton.social_pass')) {
+			return true;
+		}
+
+		return \Hash::check($password, $this->password);
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        AclUser::observe(\App::make('App\Modules\Users\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		AclUser::observe(\App::make('App\Modules\Users\ModelObservers\AclUserObserver'));
+	}
 }

src/Modules/PushNotificationDevices/Database/Seeds/ClearDataSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class ClearDataSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $permissions = \DB::table('permissions')->whereIn('model', ['pushNotificationDevice']);
-        \DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
-        $permissions->delete();
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$permissions = \DB::table('permissions')->whereIn('model', ['pushNotificationDevice']);
+		\DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
+		$permissions->delete();
+	}
 }

src/Modules/PushNotificationDevices/Database/Seeds/AssignRelationsSeeder.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin role.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function ($permission) use ($adminRoleId) {
-            \DB::table('roles_permissions')->insert(
-                [
-                'permission_id' => $permission->id,
-                'role_id'      => $adminRoleId,
-                'created_at'    => \DB::raw('NOW()'),
-                'updated_at'    => \DB::raw('NOW()')
-                ]
-            );
-        });
-    }
+		/**
+		 * Assign the permissions to the admin role.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function ($permission) use ($adminRoleId) {
+			\DB::table('roles_permissions')->insert(
+				[
+				'permission_id' => $permission->id,
+				'role_id'      => $adminRoleId,
+				'created_at'    => \DB::raw('NOW()'),
+				'updated_at'    => \DB::raw('NOW()')
+				]
+			);
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin role.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function ($permission) use ($adminRoleId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['pushNotificationDevice'])->each(function($permission) use ($adminRoleId) {
             \DB::table('roles_permissions')->insert(
                 [
                 'permission_id' => $permission->id,

src/Modules/Reporting/Database/Seeds/ClearDataSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class ClearDataSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $permissions = \DB::table('permissions')->whereIn('model', ['report']);
-        \DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
-        $permissions->delete();
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$permissions = \DB::table('permissions')->whereIn('model', ['report']);
+		\DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
+		$permissions->delete();
+	}
 }

src/Modules/Reporting/Database/Seeds/AssignRelationsSeeder.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin role.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminRoleId) {
-            \DB::table('roles_permissions')->insert(
-                [
-                'permission_id' => $permission->id,
-                'role_id'      => $adminRoleId,
-                'created_at'    => \DB::raw('NOW()'),
-                'updated_at'    => \DB::raw('NOW()')
-                ]
-            );
-        });
-    }
+		/**
+		 * Assign the permissions to the admin role.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminRoleId) {
+			\DB::table('roles_permissions')->insert(
+				[
+				'permission_id' => $permission->id,
+				'role_id'      => $adminRoleId,
+				'created_at'    => \DB::raw('NOW()'),
+				'updated_at'    => \DB::raw('NOW()')
+				]
+			);
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin role.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function ($permission) use ($adminRoleId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['report'])->each(function($permission) use ($adminRoleId) {
             \DB::table('roles_permissions')->insert(
                 [
                 'permission_id' => $permission->id,

src/Modules/Reporting/Database/Migrations/2016_01_19_112603_sampel_report.php

Indentation +28 added lines, -28 removed lines

@@ -5,14 +5,14 @@ 
 
 class SampelReport extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        DB::statement("CREATE VIEW admin_count AS  
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::statement("CREATE VIEW admin_count AS  
 			select count(u.id)
 			from users u, roles g ,users_roles ug
 			where
@@ -20,25 +20,25 @@ 
 			ug.role_id = g.id 
 			");
         
-        DB::table('reports')->insert(
-            [
-                [
-                'report_name' => 'admin_count',
-                'view_name'   => 'admin_count',
-                'created_at'  => \DB::raw('NOW()'),
-                'updated_at'  => \DB::raw('NOW()')
-                ]
-            ]
-        );
-    }
+		DB::table('reports')->insert(
+			[
+				[
+				'report_name' => 'admin_count',
+				'view_name'   => 'admin_count',
+				'created_at'  => \DB::raw('NOW()'),
+				'updated_at'  => \DB::raw('NOW()')
+				]
+			]
+		);
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        DB::statement("DROP VIEW IF EXISTS admin_count");
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		DB::statement("DROP VIEW IF EXISTS admin_count");
+	}
 }

src/Modules/Permissions/Database/Seeds/ClearDataSeeder.php

Indentation +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 
 class ClearDataSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $permissions = \DB::table('permissions')->whereIn('model', ['permission']);
-        \DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
-        $permissions->delete();
-    }
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$permissions = \DB::table('permissions')->whereIn('model', ['permission']);
+		\DB::table('roles_permissions')->whereIn('permission_id', $permissions->pluck('id'))->delete();
+		$permissions->delete();
+	}
 }

src/Modules/Permissions/Database/Seeds/AssignRelationsSeeder.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class AssignRelationsSeeder extends Seeder
 {
-    /**
-     * Run the database seeds.
-     *
-     * @return void
-     */
-    public function run()
-    {
-        $adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
+	/**
+	 * Run the database seeds.
+	 *
+	 * @return void
+	 */
+	public function run()
+	{
+		$adminRoleId = \DB::table('roles')->where('name', 'admin')->select('id')->first()->id;
 
-        /**
-         * Assign the permissions to the admin role.
-         */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function ($permission) use ($adminRoleId) {
-            \DB::table('roles_permissions')->insert(
-                [
-                'permission_id' => $permission->id,
-                'role_id'      => $adminRoleId,
-                'created_at'    => \DB::raw('NOW()'),
-                'updated_at'    => \DB::raw('NOW()')
-                ]
-            );
-        });
-    }
+		/**
+		 * Assign the permissions to the admin role.
+		 */
+		\DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function ($permission) use ($adminRoleId) {
+			\DB::table('roles_permissions')->insert(
+				[
+				'permission_id' => $permission->id,
+				'role_id'      => $adminRoleId,
+				'created_at'    => \DB::raw('NOW()'),
+				'updated_at'    => \DB::raw('NOW()')
+				]
+			);
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         /**
          * Assign the permissions to the admin role.
          */
-        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function ($permission) use ($adminRoleId) {
+        \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['permission'])->each(function($permission) use ($adminRoleId) {
             \DB::table('roles_permissions')->insert(
                 [
                 'permission_id' => $permission->id,

src/Modules/Permissions/Database/Factories/PermissionFactory.php

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 $factory->define(App\Modules\Permissions\Permission::class, function (Faker\Generator $faker) {
-    return [
-        'name'       => $faker->randomElement(['save', 'delete', 'find', 'paginate']),
-        'model'      => $faker->randomElement(['users', 'roles', 'settings', 'notifications']),
-        'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
-        'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	return [
+		'name'       => $faker->randomElement(['save', 'delete', 'find', 'paginate']),
+		'model'      => $faker->randomElement(['users', 'roles', 'settings', 'notifications']),
+		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
+		'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
+	];
 });

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\Permissions\Permission::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\Permissions\Permission::class, function(Faker\Generator $faker) {
     return [
         'name'       => $faker->randomElement(['save', 'delete', 'find', 'paginate']),
         'model'      => $faker->randomElement(['users', 'roles', 'settings', 'notifications']),