Merge pull request #2147 from cgdprojects/analysis-EPDL1x

curtisdelicata · web-flow · commit 02409ff4b9cf · 2022-12-17T14:05:38.000Z
Apply fixes from StyleCI
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -147,7 +147,7 @@ private function loggableUser(Request $request)
                 $c_id = $main_company->id;
             }
             $tenants = Tenant::find($main_company->id);
-            if ($main_company == null&& ! $user->isAdmin()) {
+            if ($main_company == null && ! $user->isAdmin()) {
 //            if (($main_company == null||$tenants=='') && ! $user->isAdmin()) {
 //          if ($main_company == null) {
                 $company_count = Company::count();
@@ -178,29 +178,25 @@ private function loggableUser(Request $request)
                 CreateDBs::dispatch($company);
                 \Log::debug('Migration----------------------'.$company);
                 Migrations::dispatch($company, $user->name, $user->email, $user->password);
-
-            }else{
-
-
-                if($tenants){
+            } else {
+                if ($tenants) {
 //                    $c = DB::connection('tenantdb',$tenants->tenancy_db_name)->table('users')->count();
-                    $company=\App\Models\Company::find($main_company->id);
+                    $company = \App\Models\Company::find($main_company->id);
                     tenancy()->initialize($tenants);
-                    $tenants->run(function () use ($company, $user){
-
+                    $tenants->run(function () use ($company, $user) {
 
 //                        $company->save();
-                        $c= User::count();
-                        if($c==0){
+                        $c = User::count();
+                        if ($c == 0) {
                             \Log::debug('Migration----------------------');
-                           return Migrations::dispatch($company, $user->name, $user->email, $user->password);
 
+                            return Migrations::dispatch($company, $user->name, $user->email, $user->password);
                         }
 //                        \Log::debug($company->id.-'users----------------------'.$c);
                     });
+
                     return $user;
                 }
-
             }
         }
 
diff --git a/app/Http/Controllers/Company/Store.php b/app/Http/Controllers/Company/Store.php
@@ -4,21 +4,22 @@
 
 use App\Jobs\Tenant\CreateDBs;
 use App\Jobs\Tenant\Migrations;
+use App\Models\Company as Company1;
+use App\Traits\TenantConnectionResolver;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
 use LaravelEnso\Api\Models\Log;
 use LaravelEnso\Companies\Http\Requests\ValidateCompany;
 use LaravelEnso\Companies\Models\Company;
-use \App\Traits\TenantConnectionResolver;
-use App\Models\Company as Company1;
+
 class Store extends Controller
 {
     use AuthorizesRequests;
     use TenantConnectionResolver;
+
     public function __invoke(ValidateCompany $request, Company $company)
     {
-
         $company->fill($request->validatedExcept('mandatary'));
         $clone = $request->post();
         $user = \Auth::user();
@@ -27,17 +28,15 @@ public function __invoke(ValidateCompany $request, Company $company)
         $user_email = $user->email;
         $this->authorize('store', $company);
         $company->save();
-        if ($user->role_id!=1){
-
+        if ($user->role_id != 1) {
             $c = new Company1();
 
             $c->fill($clone);
-            $c->created_by=1;
-            $c->updated_by=null;
-            $c->setAttribute('created_by',1);
-            $c->setAttribute('updated_by',null);
+            $c->created_by = 1;
+            $c->updated_by = null;
+            $c->setAttribute('created_by', 1);
+            $c->setAttribute('updated_by', null);
             $c->save();
-
         }
         CreateDBs::dispatch($company, $user_id);
         Migrations::dispatch($company, $user_id, $person_name, $user_email);
diff --git a/app/Http/Middleware/Multitenant.php b/app/Http/Middleware/Multitenant.php
@@ -3,15 +3,16 @@
 namespace App\Http\Middleware;
 
 use App\Models\Family;
+use App\Models\Tenant as T1;
 use App\Models\User;
 use App\Service\MixedConnection;
 use Closure;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
-use LaravelEnso\Companies\Models\Company;
 // use App\Models\enso\companies\Company;
+use LaravelEnso\Companies\Models\Company;
 use LaravelEnso\Multitenancy\Services\Tenant;
-use App\Models\Tenant as T1;
+
 class Multitenant
 {
     /**
@@ -26,32 +27,28 @@ public function handle($request, Closure $next)
 //        $tenatDB=\App\Models\Tenant::where('id',Auth::id())->get();
 //        Log::debug();
 
-
-
         $user = \Auth::user();
         Log::debug($user->role_id.'-roleId');
-            $conn = \Session::get('conn');
-            //$value = \Session::get('db');
-            if ($user->isAdmin()){
-                $key = 'database.connections.mysql.database';
-                $value =env('DB_DATABASE', 'enso');
-            }else{
-                $key = 'database.connections.tenantdb.database';
-                if (session()->get('db')) {
-                    $value = session()->get('db');
-                }else{
-                    $company = $user->person->company();
-                    $value = $company->tenancy_db_name;
-                }
-
+        $conn = \Session::get('conn');
+        //$value = \Session::get('db');
+        if ($user->isAdmin()) {
+            $key = 'database.connections.mysql.database';
+            $value = env('DB_DATABASE', 'enso');
+        } else {
+            $key = 'database.connections.tenantdb.database';
+            if (session()->get('db')) {
+                $value = session()->get('db');
+            } else {
+                $company = $user->person->company();
+                $value = $company->tenancy_db_name;
             }
-            Log::debug($value);
+        }
+        Log::debug($value);
 //            Log::debug($company);
-            session()->put('db', $value);
-            //if ($conn === 'tenant') {
-
-            $x = config([$key => $value]);
+        session()->put('db', $value);
+        //if ($conn === 'tenant') {
 
+        $x = config([$key => $value]);
 
         //Family::setConnection();
         // config(['database.default'=>'tenant']);
diff --git a/app/Jobs/Tenant/Migrations.php b/app/Jobs/Tenant/Migrations.php
@@ -73,7 +73,7 @@ public function handle()
         $em = $this->email;
         $na = $this->name;
         $person = $tenants->run(function () use ($em, $na) {
-           return Person::create([
+            return Person::create([
                 'email'=>$em,
                 'name' => $na,
 
@@ -82,7 +82,7 @@ public function handle()
         \Log::debug($person);
         \Log::debug('person created');
         $user_group = 1;
-        $user_group = $tenants->run(function () use ($em, $na) {
+        $user_group = $tenants->run(function () {
             return UserGroup::create([
                 'name'=>'Administrators',
                 'description' => 'Administrator users group',
@@ -91,7 +91,7 @@ public function handle()
         });
         // get role_id
 //        $role = 1;
-        $role = $tenants->run(function () use ($em, $na) {
+        $role = $tenants->run(function () {
             return Role::create([
                 'name'=>'Admin',
                 'menu_id '=>null,
diff --git a/app/Models/Company.php b/app/Models/Company.php
@@ -2,13 +2,12 @@
 
 namespace App\Models;
 
-use App\Traits\TenantConnectionResolver;
 use App\Traits\CreatedBy;
+use App\Traits\TenantConnectionResolver;
 use Illuminate\Support\Facades\Auth;
 use LaravelEnso\Companies\Models\Company as CoreCompany;
 
 class Company extends CoreCompany
 {
     use TenantConnectionResolver,CreatedBy;
-
 }
diff --git a/app/Models/Person.php b/app/Models/Person.php
@@ -147,9 +147,9 @@ public static function bootUpdatedBy()
 
     public function setUpdatedBy()
     {
-        if (!is_dir(storage_path('app/public'))) {
+        if (! is_dir(storage_path('app/public'))) {
             // dir doesn't exist, make it
-            \File::makeDirectory(storage_path().'/'.'app/public',0777,true);
+            \File::makeDirectory(storage_path().'/'.'app/public', 0777, true);
 
 //            mkdir(storage_path('app/public/'), 0700);
         }
diff --git a/app/Traits/CreatedBy.php b/app/Traits/CreatedBy.php
@@ -21,17 +21,17 @@ public function createdBy(): Relation
         return $this->belongsTo($userModel, 'created_by');
     }
 
-    private function setCreatedBy($value=1)
+    private function setCreatedBy($value = 1)
     {
 //        if($value==''){
 //            if (Auth::check()) {
 //                $this->created_by = Auth::id();
 //            }
 //        }else{
-            $this->created_by = $value;
+        $this->created_by = $value;
 //        }
-
     }
+
     public static function bootUpdatedBy()
     {
         self::creating(fn ($model) => $model->setUpdatedBy());
@@ -44,15 +44,14 @@ public function UpdatedBy(): Relation
         return $this->belongsTo($userModel, 'updated_by');
     }
 
-    private function setUpdatedBy($value=1)
+    private function setUpdatedBy($value = 1)
     {
 //        if($value==''){
 //            if (Auth::check()) {
 //                $this->updated_by = Auth::id();
 //            }
 //        }else{
-            $this->updated_by = $value;
+        $this->updated_by = $value;
 //        }
-
     }
 }
diff --git a/app/Traits/TenantConnectionResolver.php b/app/Traits/TenantConnectionResolver.php
@@ -22,7 +22,6 @@ public function getConnectionName()
             }
         }
 
-
         return $this->connection;
     }
 }
diff --git a/config/cors.php b/config/cors.php
@@ -24,14 +24,14 @@
     'allowed_methods' => ['*'],
 
     'allowed_origins' => [
-	'http://pusher.com',
+        'http://pusher.com',
         'https://pusher.com',
         'http://localhost:8080',
         'http://localhost:3000',
         'http://localhost:8000',
         'https://familytree365.com',
         'https://api.familytree365.com',
-        'https://www.familytree365.com',],
+        'https://www.familytree365.com', ],
 
     'allowed_origins_patterns' => [],
 
diff --git a/database/migrations/tenant/2017_01_01_113000_create_avatars_table.php b/database/migrations/tenant/2017_01_01_113000_create_avatars_table.php
@@ -7,7 +7,6 @@
 class CreateAvatarsTable extends Migration
 {
     public function up()
-
     {
         Schema::create('avatars', function (Blueprint $table) {
             $table->increments('id');
diff --git a/database/migrations/tenant/2018_08_25_100000_create_files_table.php b/database/migrations/tenant/2018_08_25_100000_create_files_table.php
@@ -16,7 +16,7 @@ public function up()
             $table->integer('type_id')->default(0);
             $table->string('original_name')->index();
             $table->string('saved_name')->index();
-           // $table->string('path');
+            // $table->string('path');
 
             $table->integer('size');
             $table->string('mime_type')->nullable();
diff --git a/routes/api.php b/routes/api.php
@@ -1455,7 +1455,6 @@
         Route::get('trees/options', [TreesManage::class, 'getOptions']);
     });
 
-
 //Route::get('test/{cid}', function($cid){
 //    session('current_company_id', $cid);
 //    retrun success;

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,12 @@`
`2`	`2`
`3`	`3`	`namespace App\Models;`
`4`	`4`
`5`		`-use App\Traits\TenantConnectionResolver;`
`6`	`5`	`use App\Traits\CreatedBy;`
	`6`	`+use App\Traits\TenantConnectionResolver;`
`7`	`7`	`use Illuminate\Support\Facades\Auth;`
`8`	`8`	`use LaravelEnso\Companies\Models\Company as CoreCompany;`
`9`	`9`
`10`	`10`	`class Company extends CoreCompany`
`11`	`11`	`{`
`12`	`12`	`use TenantConnectionResolver,CreatedBy;`
`13`		`-`
`14`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,9 +147,9 @@ public static function bootUpdatedBy()`
`147`	`147`
`148`	`148`	`public function setUpdatedBy()`
`149`	`149`	`{`
`150`		`- if (!is_dir(storage_path('app/public'))) {`
	`150`	`+ if (! is_dir(storage_path('app/public'))) {`
`151`	`151`	`// dir doesn't exist, make it`
`152`		`- \File::makeDirectory(storage_path().'/'.'app/public',0777,true);`
	`152`	`+ \File::makeDirectory(storage_path().'/'.'app/public', 0777, true);`
`153`	`153`
`154`	`154`	`// mkdir(storage_path('app/public/'), 0700);`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,17 +21,17 @@ public function createdBy(): Relation`
`21`	`21`	`return $this->belongsTo($userModel, 'created_by');`
`22`	`22`	`}`
`23`	`23`
`24`		`- private function setCreatedBy($value=1)`
	`24`	`+ private function setCreatedBy($value = 1)`
`25`	`25`	`{`
`26`	`26`	`// if($value==''){`
`27`	`27`	`// if (Auth::check()) {`
`28`	`28`	`// $this->created_by = Auth::id();`
`29`	`29`	`// }`
`30`	`30`	`// }else{`
`31`		`- $this->created_by = $value;`
	`31`	`+ $this->created_by = $value;`
`32`	`32`	`// }`
`33`		`-`
`34`	`33`	`}`
	`34`	`+`
`35`	`35`	`public static function bootUpdatedBy()`
`36`	`36`	`{`
`37`	`37`	`self::creating(fn ($model) => $model->setUpdatedBy());`
`@@ -44,15 +44,14 @@ public function UpdatedBy(): Relation`
`44`	`44`	`return $this->belongsTo($userModel, 'updated_by');`
`45`	`45`	`}`
`46`	`46`
`47`		`- private function setUpdatedBy($value=1)`
	`47`	`+ private function setUpdatedBy($value = 1)`
`48`	`48`	`{`
`49`	`49`	`// if($value==''){`
`50`	`50`	`// if (Auth::check()) {`
`51`	`51`	`// $this->updated_by = Auth::id();`
`52`	`52`	`// }`
`53`	`53`	`// }else{`
`54`		`- $this->updated_by = $value;`
	`54`	`+ $this->updated_by = $value;`
`55`	`55`	`// }`
`56`		`-`
`57`	`56`	`}`
`58`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public function getConnectionName()`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-`
`26`	`25`	`return $this->connection;`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`class CreateAvatarsTable extends Migration`
`8`	`8`	`{`
`9`	`9`	`public function up()`
`10`		`-`
`11`	`10`	`{`
`12`	`11`	`Schema::create('avatars', function (Blueprint $table) {`
`13`	`12`	`$table->increments('id');`