fixed tests

akaunting · May 15, 2021 · 43c32b7 · 43c32b7
1 parent 93a23d9
commit 43c32b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/app/Jobs/Auth/CreateUser.php b/app/Jobs/Auth/CreateUser.php
@@ -52,7 +52,9 @@ public function handle()
             }
 
             if ($this->request->has('companies')) {
-                if (request()->isNotInstall()) {
+                if (app()->runningInConsole() || request()->isInstall()) {
+                    $this->user->companies()->attach($this->request->get('companies'));
+                } else {
                     $user = user();
 
                     $companies = $user->withoutEvents(function () use ($user) {
@@ -62,8 +64,6 @@ public function handle()
                     if ($companies->isNotEmpty()) {
                         $this->user->companies()->attach($companies->toArray());
                     }
-                } else {
-                    $this->user->companies()->attach($this->request->get('companies'));
                 }
             }
 

diff --git a/app/Jobs/Auth/UpdateUser.php b/app/Jobs/Auth/UpdateUser.php
@@ -53,14 +53,18 @@ public function handle()
             }
 
             if ($this->request->has('companies')) {
-                $user = user();
-
-                $companies = $user->withoutEvents(function () use ($user) {
-                    return $user->companies()->whereIn('id', $this->request->get('companies'))->pluck('id');
-                });
-
-                if ($companies->isNotEmpty()) {
-                    $this->user->companies()->sync($companies->toArray());
+                if (app()->runningInConsole() || request()->isInstall()) {
+                    $this->user->companies()->attach($this->request->get('companies'));
+                } else {
+                    $user = user();
+
+                    $companies = $user->withoutEvents(function () use ($user) {
+                        return $user->companies()->whereIn('id', $this->request->get('companies'))->pluck('id');
+                    });
+
+                    if ($companies->isNotEmpty()) {
+                        $this->user->companies()->sync($companies->toArray());
+                    }
                 }
             }