Refactor

serenysoft · May 21, 2024 · c8a42c3 · c8a42c3
1 parent fa5bd0f
commit c8a42c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/InteractsWithCompany.php b/src/InteractsWithCompany.php
@@ -42,14 +42,15 @@ public function company(): BelongsTo
      */
     public function applyCompany()
     {
-        $company = company()->current();
         $foreignKeyName =  $this->company()->getForeignKeyName();
 
-        if (! $company) {
-            throw new CompanyCouldNotBeIdentifiedException();
-        }
-
         if ($this->{$foreignKeyName} === null) {
+            $company = company()->current();
+
+            if (! $company) {
+                throw new CompanyCouldNotBeIdentifiedException();
+            }
+
             $this->{$foreignKeyName} = $company->id;
         }
     }

diff --git a/src/Middleware/InitializeCompanyByRequestData.php b/src/Middleware/InitializeCompanyByRequestData.php
@@ -51,13 +51,13 @@ public function handle($request, Closure $next)
 
     protected function getPayload(Request $request): ?string
     {
-        $tenant = null;
+        $company = null;
         if (static::$header && $request->hasHeader(static::$header)) {
-            $tenant = $request->header(static::$header);
+            $company = $request->header(static::$header);
         } elseif (static::$queryParameter && $request->has(static::$queryParameter)) {
-            $tenant = $request->get(static::$queryParameter);
+            $company = $request->get(static::$queryParameter);
         }
 
-        return $tenant;
+        return $company;
     }
 }