refactoring

Author: ousid

src/Http/Livewire/CsvImporter.php

@@ -39,7 +39,7 @@ class CsvImporter extends Component
     public int $fileRowCount = 0;
 
     /** @var array */
-    protected $exception = [
+    protected $exceptions = [
         'mode', 'columnsToMap', 'open',
         'columnLabels', 'requiredColumns',
     ];
@@ -123,19 +123,19 @@ protected function importCsv()
         $import = $this->createNewImport();
         $chunks = (new ChunkIterator($this->csvRecords->getIterator(), 10))->get();
 
-        $jobs = collect($chunks)
-                    ->map(
-                        fn ($chunk) => new ImportCsv(
-                            $import,
-                            $this->model,
-                            $chunk,
-                            $this->columnsToMap
-                        )
-                    );
-
-        Bus::batch($jobs)
-                    ->finally(
-                        fn () => $import->touch('compoleted_at')
-                    )->dispatch();
+        // $jobs = collect($chunks)
+        //             ->map(
+        //                 fn ($chunk) => new ImportCsv(
+        //                     $import,
+        //                     $this->model,
+        //                     $chunk,
+        //                     $this->columnsToMap
+        //                 )
+        //             );
+
+        // Bus::batch($jobs)
+        //             ->finally(
+        //                 fn () => $import->touch('compoleted_at')
+        //             )->dispatch();
     }
 }

tests/ImportCsvTest.php renamed to tests/CsvImporterTest.php

@@ -1,21 +1,21 @@
 <?php
 
-use Coderflex\LaravelCsv\Http\Livewire\ImportCsv;
+use Coderflex\LaravelCsv\Http\Livewire\CsvImporter;
 use Coderflex\LaravelCsv\Models\Import;
 use Coderflex\LaravelCsv\Tests\Models\Customer;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
 use function Pest\Livewire\livewire;
 
 it('renders import CSV component', function () {
-    livewire(ImportCsv::class)
+    livewire(CsvImporter::class)
         ->assertSuccessful();
 });
 
 it('renders import CSV component with model', function () {
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
     ])
     ->assertSet('model', $model)
@@ -31,7 +31,7 @@
             file_get_contents('stubs/customers.csv', true)
         );
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
     ])
     ->set('file', $file)
@@ -48,7 +48,7 @@
             file_get_contents('stubs/empty.csv', true)
         );
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
     ])
         ->set('file', $file)
@@ -65,7 +65,7 @@
             file_get_contents('stubs/file_with_duplicate_headers.csv', true)
         );
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
     ])
         ->set('file', $file)
@@ -81,7 +81,7 @@
     ];
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
         'columnsToMap' => $columnsToMap,
     ])
@@ -108,7 +108,7 @@
     ];
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
         'columnsToMap' => $columnsToMap,
         'requiredColumns' => $requiredColumns,
@@ -137,7 +137,7 @@
 
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
         'columnsToMap' => $columnsToMap,
         'requiredColumns' => $requiredColumns,
@@ -161,7 +161,7 @@
 
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
     ])
     ->set('file', $file)
@@ -178,7 +178,7 @@
     $file = UploadedFile::fake()->create('image.png');
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
     ])
     ->set('file', $file)
@@ -209,7 +209,7 @@
 
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
         'columnsToMap' => $columnsToMap,
         'requiredColumns' => $requiredColumns,
@@ -231,7 +231,7 @@
 
     $model = Customer::class;
 
-    livewire(ImportCsv::class, [
+    livewire(CsvImporter::class, [
         'model' => $model,
     ])
     ->set('file', $file)

tests/TestCase.php

@@ -2,8 +2,8 @@
 
 namespace Coderflex\LaravelCsv\Tests;
 
+use Coderflex\LaravelCsv\Http\Livewire\CsvImporter;
 use Coderflex\LaravelCsv\Http\Livewire\HandleImports;
-use Coderflex\LaravelCsv\Http\Livewire\ImportCsv;
 use Coderflex\LaravelCsv\LaravelCsvServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Livewire\Livewire;
@@ -46,7 +46,7 @@ public function getEnvironmentSetUp($app)
 
     public function registerLivewireComponents()
     {
-        Livewire::component(ImportCsv::class, 'import-csv');
+        Livewire::component(CsvImporter::class, 'csv-importer');
         Livewire::component(HandleImports::class, 'handle-imports');
     }
 }