wip

app/Concerns/CompanyOwned.php

@@ -2,6 +2,7 @@
 
 namespace App\Concerns;
 
+use App\Models\User;
 use App\Scopes\CurrentCompanyScope;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -22,6 +23,15 @@ trait CompanyOwned
                     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;
+                    }
+                }
+
                 if ($companyId) {
                     $model->company_id = $companyId;
                 } else {

app/Models/Export.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use App\Concerns\CompanyOwned;
+use Filament\Actions\Exports\Models\Export as BaseExport;
+
+class Export extends BaseExport
+{
+    use CompanyOwned;
+}

app/Models/Import.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use App\Concerns\CompanyOwned;
+use Filament\Actions\Imports\Models\Import as BaseImport;
+
+class Import extends BaseImport
+{
+    use CompanyOwned;
+}

app/Models/Notification.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use App\Concerns\CompanyOwned;
+use Illuminate\Notifications\DatabaseNotification;
+
+class Notification extends DatabaseNotification
+{
+    use CompanyOwned;
+}

app/Models/User.php

@@ -124,4 +124,9 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
 
         return true;
     }
+
+    public function notifications(): MorphMany
+    {
+        return $this->morphMany(Notification::class, 'notifiable')->latest();
+    }
 }

app/Providers/AppServiceProvider.php

@@ -3,12 +3,18 @@
 namespace App\Providers;
 
 use App\Http\Responses\LoginRedirectResponse;
+use App\Models\Export;
+use App\Models\Import;
+use App\Models\Notification;
 use App\Services\DateRangeService;
+use Filament\Actions\Exports\Models\Export as BaseExport;
+use Filament\Actions\Imports\Models\Import as BaseImport;
 use Filament\Http\Responses\Auth\Contracts\LoginResponse;
 use Filament\Notifications\Livewire\Notifications;
 use Filament\Support\Assets\Js;
 use Filament\Support\Enums\Alignment;
 use Filament\Support\Facades\FilamentAsset;
+use Illuminate\Notifications\DatabaseNotification;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -27,6 +33,13 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
+        // Bind custom Import and Export models
+        $this->app->bind(BaseImport::class, Import::class);
+        $this->app->bind(BaseExport::class, Export::class);
+
+        // Bind custom Notification model
+        $this->app->bind(DatabaseNotification::class, Notification::class);
+
         Notifications::alignment(Alignment::Center);
 
         FilamentAsset::register([

database/migrations/2025_07_13_042000_add_company_id_to_notifications_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Clear existing notifications since we're adding company scoping
+        DB::table('notifications')->truncate();
+
+        Schema::table('notifications', function (Blueprint $table) {
+            $table->foreignId('company_id')
+                ->after('notifiable_id')
+                ->nullable()
+                ->constrained()
+                ->cascadeOnDelete();
+
+            $table->index(['company_id', 'created_at']);
+            $table->index(['company_id', 'notifiable_type', 'notifiable_id']);
+        });
+    }
+};

database/migrations/2025_07_13_043000_add_company_id_to_imports_exports_tables.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Disable foreign key checks and clear existing data
+        DB::statement('SET FOREIGN_KEY_CHECKS=0;');
+        DB::table('failed_import_rows')->truncate();
+        DB::table('exports')->truncate();
+        DB::table('imports')->truncate();
+        DB::statement('SET FOREIGN_KEY_CHECKS=1;');
+
+        Schema::table('imports', function (Blueprint $table) {
+            $table->foreignId('company_id')
+                ->after('id')
+                ->nullable()
+                ->constrained()
+                ->cascadeOnDelete();
+
+            $table->index(['company_id', 'created_at']);
+        });
+
+        Schema::table('exports', function (Blueprint $table) {
+            $table->foreignId('company_id')
+                ->after('id')
+                ->nullable()
+                ->constrained()
+                ->cascadeOnDelete();
+
+            $table->index(['company_id', 'created_at']);
+        });
+    }
+};