refactoring

Author: ousid

database/migrations/create_csv_imports_table.php.stub

@@ -10,8 +10,8 @@ return new class extends Migration
     {
         Schema::create('csv_imports', function (Blueprint $table) {
             $table->id();
-            $table->nullableMorphs('importable');
-            $table->foreignId('user_id')->nullable();
+            $table->foreignId('user_id')->constrained();
+            $table->string('model');
             $table->string('file_path');
             $table->string('file_name');
             $table->unsignedBigInteger('total_rows');

src/Concerns/HasCsvImports.php

@@ -3,17 +3,17 @@
 namespace Coderflex\LaravelCsv\Concerns;
 
 use Coderflex\LaravelCsv\Models\Import;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 trait HasCsvImports
 {
     /**
      * Has imports relationship
      *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany<Import>
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany<Import>
      */
-    public function imports(): MorphMany
+    public function imports(): HasMany
     {
-        return $this->morphMany(Import::class, 'importable');
+        return $this->hasMany(Import::class, 'user_id');
     }
 }

src/Http/Livewire/CsvImporter.php

@@ -5,6 +5,7 @@
 use Coderflex\LaravelCsv\Concerns;
 use Coderflex\LaravelCsv\Jobs\ImportCsv;
 use Coderflex\LaravelCsv\Utilities\ChunkIterator;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\MessageBag;
 use Illuminate\Validation\Validator;
@@ -108,16 +109,6 @@ protected function setCsvProperties()
         [$this->fileHeaders, $this->fileRowCount] = $this->handleCsvProperties();
     }
 
-    protected function createNewImport()
-    {
-        return (new $this->model)->imports()->create([
-            'user_id' => auth()->id() ?? null,
-            'file_path' => $this->file->getRealPath(),
-            'file_name' => $this->file->getClientOriginalName(),
-            'total_rows' => $this->fileRowCount,
-        ]);
-    }
-
     protected function importCsv()
     {
         $import = $this->createNewImport();
@@ -139,4 +130,17 @@ protected function importCsv()
                         fn () => $import->touch('compoleted_at')
                     )->dispatch();
     }
+
+    protected function createNewImport()
+    {
+        /** @var \Illuminate\Foundation\Auth\User */
+        $user = auth()->user();
+
+        return $user->imports()->create([
+            'model' => $this->model,
+            'file_path' => $this->file->getRealPath(),
+            'file_name' => $this->file->getClientOriginalName(),
+            'total_rows' => $this->fileRowCount,
+        ]);
+    }
 }

src/Scopes/ImportScope.php

@@ -35,7 +35,7 @@ public function scopeNotCompleted(Builder $builder): Builder
      */
     public function scopeForModel(Builder $builder, string $model): Builder
     {
-        return $builder->where('importable_type', $model);
+        return $builder->where('model', $model);
     }
 
     /**

tests/CsvImporterTest.php

@@ -3,6 +3,7 @@
 use Coderflex\LaravelCsv\Http\Livewire\CsvImporter;
 use Coderflex\LaravelCsv\Models\Import;
 use Coderflex\LaravelCsv\Tests\Models\Customer;
+use Coderflex\LaravelCsv\Tests\Models\User;
 use Illuminate\Bus\PendingBatch;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Bus;
@@ -223,6 +224,8 @@
 });
 
 it('ensures the imports is batched', function () {
+    $this->actingAs(User::factory()->create());
+
     Storage::fake('documents');
     Bus::fake();
 
@@ -258,6 +261,8 @@
 });
 
 it('creates customers records on top of csv file', function () {
+    $this->actingAs(User::factory()->create());
+    
     $file = UploadedFile::fake()
         ->createWithContent(
             'customers.csv',

tests/Database/Factories/UserFactory.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Coderflex\LaravelCsv\Tests\Database\Factories;
+
+use Coderflex\LaravelCsv\Tests\Models\User;
+
+class UserFactory extends \Orchestra\Testbench\Factories\UserFactory
+{
+    protected $model = User::class;
+}

tests/Database/Migrations/create_users_table.php

@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class() extends Migration
+{
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('email')->unique();
+            $table->timestamp('email_verified_at')->nullable();
+            $table->string('password');
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+};

tests/Models/Customer.php

@@ -10,7 +10,6 @@
 class Customer extends Model
 {
     use HasFactory;
-    use HasCsvImports;
 
     protected $guarded = [];
 

tests/Models/User.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Coderflex\LaravelCsv\Tests\Models;
+
+use Coderflex\LaravelCsv\Concerns\HasCsvImports;
+use Coderflex\LaravelCsv\Tests\Database\Factories\UserFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+
+class User extends \Illuminate\Foundation\Auth\User
+{
+    use HasFactory;
+    use HasCsvImports;
+
+    protected $guarded = [];
+
+    protected static function newFactory()
+    {
+        return UserFactory::new();
+    }
+}

tests/TestCase.php

@@ -37,14 +37,14 @@ public function getEnvironmentSetUp($app)
     {
         config()->set('database.default', 'testing');
 
-        $migration = include __DIR__.'/../database/migrations/create_csv_imports_table.php.stub';
-        $migration->up();
-
-        $migration = include __DIR__.'/Database/Migrations/create_customers_table.php';
-        $migration->up();
+        $migrations = [
+            include __DIR__ . '/../database/migrations/create_csv_imports_table.php.stub',
+            include __DIR__ . '/Database/Migrations/create_customers_table.php',
+            include __DIR__ . '/Database/Migrations/create_users_table.php',
+            include __DIR__ . '/Database/Migrations/create_job_batches_table.php',
+        ];
 
-        $migration = include __DIR__.'/Database/Migrations/create_job_batches_table.php';
-        $migration->up();
+        collect($migrations)->each(fn ($path) => $path->up());
     }
 
     public function registerLivewireComponents()