fix csv file validation after import

coderflexx · Sep 17, 2022 · f8cc424 · f8cc424
1 parent 5cd3761
commit f8cc424
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/Concerns/HasCsvProperties.php b/src/Concerns/HasCsvProperties.php
@@ -54,8 +54,8 @@ public function handleCsvProperties(): array|MessageBag
             Log::warning($exception->getMessage());
 
             return $this->addError(
-                'file_error',
-                __('Your CSV file has error/errors, or is empty. Please check, and try again')
+                'file',
+                __('The file has error/errors, Please check, and try again')
             );
         }
     }

diff --git a/src/Http/Livewire/CsvImporter.php b/src/Http/Livewire/CsvImporter.php
@@ -114,17 +114,20 @@ protected function rules()
 
     protected function setCsvProperties()
     {
+        if (! $this->handleCsvProperties() instanceof MessageBag) {
+            return [
+                $this->fileHeaders,
+                $this->fileRowCount
+            ] = $this->handleCsvProperties();
+        }
+
         $this->withValidator(function (Validator $validator) {
             $validator->after(function ($validator) {
-                if ($this->handleCsvProperties() instanceof MessageBag) {
-                    $validator->errors()->merge(
-                        $this->handleCsvProperties()->getMessages()
-                    );
-                }
+                $validator->errors()->merge(
+                    $this->handleCsvProperties()->getMessages()
+                );
             });
         })->validate();
-
-        [$this->fileHeaders, $this->fileRowCount] = $this->handleCsvProperties();
     }
 
     protected function importCsv()

diff --git a/tests/CsvImporterTest.php b/tests/CsvImporterTest.php
@@ -53,7 +53,7 @@
     ])
         ->set('file', $file)
         ->assertSet('model', $model)
-        ->assertHasErrors(['file_error']);
+        ->assertHasErrors(['file']);
 });
 
 it('throws a validation error if the csv file has duplicate headers', function () {
@@ -70,7 +70,7 @@
     ])
         ->set('file', $file)
         ->assertSet('model', $model)
-        ->assertHasErrors(['file_error']);
+        ->assertHasErrors(['file']);
 });
 
 it('transfers columnsToMap into an associative array', function () {