wip

app/Concerns/CompanyOwned.php

@@ -2,6 +2,7 @@
 
 namespace App\Concerns;
 
+use App\Models\Notification;
 use App\Models\User;
 use App\Scopes\CurrentCompanyScope;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -18,17 +19,15 @@ trait CompanyOwned
             if (empty($model->company_id)) {
                 $companyId = session('current_company_id');
 
-                if (! $companyId && Auth::check()) {
-                    $companyId = Auth::user()->currentCompany->id;
+                if (! $companyId && ($user = Auth::user()) && ($companyId = $user->current_company_id)) {
                     session(['current_company_id' => $companyId]);
                 }
 
-                // Special handling for notifications in job context
-                if (! $companyId && $model->getTable() === 'notifications' && isset($model->notifiable_id)) {
-                    // Get company_id from the notifiable user's current_company_id
-                    $user = User::find($model->notifiable_id);
-                    if ($user?->current_company_id) {
-                        $companyId = $user->current_company_id;
+                // For notifications in job context, get company_id from the notifiable user
+                if (! $companyId && $model instanceof Notification && $model->notifiable_type === User::class) {
+                    $notifiable = $model->notifiable;
+                    if ($notifiable instanceof User) {
+                        $companyId = $notifiable->current_company_id;
                     }
                 }
 

app/Scopes/CurrentCompanyScope.php

@@ -16,19 +16,14 @@ class CurrentCompanyScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $companyId = session('current_company_id');
-
-        if (! $companyId && app()->runningInConsole()) {
+        if (app()->runningInConsole()) {
             return;
         }
 
-        if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
-            $companyId = Auth::user()->currentCompany->id;
-            session(['current_company_id' => $companyId]);
-        }
+        $companyId = session('current_company_id');
 
-        if (! $companyId) {
-            $companyId = Auth::user()->currentCompany->id;
+        if (! $companyId && ($user = Auth::user()) && ($companyId = $user->current_company_id)) {
+            session(['current_company_id' => $companyId]);
         }
 
         if ($companyId) {