refactoring

Author: ousid

src/Concerns/InteractsWithColumns.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace Coderflex\LaravelCsv\Concerns;
+
+trait InteractsWithColumns
+{
+    /** 
+     * Converts the columnsToMap property into an associative array.
+     * @param array $columnsToMap
+     * @return array
+     */
+    protected function mapThroughColumns(): array
+    {
+        if (!$this->columnsToMap) {
+            return [];
+        }
+
+        return collect($this->columnsToMap)
+                ->mapWithKeys(fn ($column): array => [$column => ''])
+                ->toArray();
+    }
+
+    /**
+     * Maps requiredColumns property into columnsToMap required state.
+     * @param array $requiredColumns
+     * @return array
+     */
+    protected function mapThroughRequiredColumns(): array
+    {
+        if (!$this->requiredColumns) {
+            return [];
+        }
+
+        $this->requiredColumns = collect($this->requiredColumns)
+            ->mapWithKeys(function ($column): array {
+                return ['columnsToMap.' . $column => 'required'];
+            })->toArray();
+
+        return $this->requiredColumns;
+    }
+
+    /**
+     * Maps columnLabels property into columnsToMap label state.
+     * @param array $columnLabels
+     * @return array
+     */
+    protected function mapThroughColumnLabels(): array
+    {
+
+        if (!$this->columnLabels) {
+            return [];
+        }
+
+        return collect($this->requiredColumns)
+                ->mapWithKeys(function ($column): array {
+                    return [
+                        'columnsToMap.' . $column => strtolower($this->columnLabels[$column]),
+                    ];
+                })->toArray();
+    }
+}

src/Http/Livewire/ImportCsv.php

@@ -2,12 +2,15 @@
 
 namespace Coderflex\LaravelCsv\Http\Livewire;
 
+use Coderflex\LaravelCsv\Concerns\InteractsWithColumns;
 use Livewire\Component;
 use Livewire\WithFileUploads;
+use Termwind\Components\Dd;
 
 class ImportCsv extends Component
 {
     use WithFileUploads;
+    use InteractsWithColumns;
 
     /** @var string  $model*/
     public string $model;
@@ -26,39 +29,27 @@ class ImportCsv extends Component
 
     public function mount()
     {
-        $this->columnsToMap = collect($this->columnsToMap)
-                ->mapWithKeys(fn ($column): array => [$column => ''])
-                ->toArray();
+        $this->columnsToMap = $this->mapThroughColumns();
 
-        if ($this->columnLabels) {
-            $this->columnLabels = collect($this->requiredColumns)
-                ->mapWithKeys(function ($column): array {
-                    return [
-                        'columnsToMap.' . $column => strtolower($this->columnLabels[$column]),
-                    ];
-                })->toArray();
-        }
+        $this->columnLabels = $this->mapThroughColumnLabels();
 
-        $this->requiredColumns = collect($this->requiredColumns)
-            ->mapWithKeys(function ($column): array {
-                return ['columnsToMap.' . $column => 'required'];
-            })->toArray();
+        $this->requiredColumns = $this->mapThroughRequiredColumns();
     }
 
     public function render()
     {
         return view('laravel-csv::livewire.import-csv');
     }
 
+    protected function validationAttributes()
+    {
+        return $this->columnLabels;
+    }
+
     protected function rules()
     {
         return [
             'file' => 'required|file|mimes:csv,txt',
         ] + $this->requiredColumns;
     }
-
-    protected function validationAttributes()
-    {
-        return $this->columnLabels;
-    }
 }

tests/ImportCsvTest.php

@@ -58,6 +58,13 @@
 });
 
 it('maps requiredColumns property into columnsToMap required state', function () {
+
+    $columnsToMap = [
+        'name',
+        'email',
+        'phone',
+    ];
+
     $requiredColumns = [
         'name',
         'email',
@@ -69,6 +76,7 @@
     livewire(ImportCsv::class, [
         'model' => $model,
         'file' => $file,
+        'columnsToMap' => $columnsToMap,
         'requiredColumns' => $requiredColumns,
     ])
     ->assertSet('model', $model)
@@ -80,7 +88,7 @@
     ]);
 });
 
-it('maps through columnsLabels to validate attributes', function () {
+it('maps through columnsLabels for validate attributes', function () {
     $columnsToMap = [
         'name', 'email', 'phone',
     ];