Skip empty rows (#33)

* Skip empty rows * WIP
EscolaLMS · Feb 5, 2024 · 2c52b8b · 2c52b8b
1 parent 3010828
commit 2c52b8b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/src/EscolaLmsCsvUsersServiceProvider.php b/src/EscolaLmsCsvUsersServiceProvider.php
@@ -7,7 +7,6 @@
 use EscolaLms\CsvUsers\Services\CsvUserGroupService;
 use EscolaLms\CsvUsers\Services\CsvUserService;
 use Illuminate\Support\ServiceProvider;
-use Maatwebsite\Excel\Imports\HeadingRowFormatter;
 
 /**
  * SWAGGER_VERSION
@@ -23,8 +22,6 @@ public function boot()
     {
         $this->loadRoutesFrom(__DIR__.'/routes.php');
         $this->loadTranslationsFrom(__DIR__ . '/../resources/lang', 'csv-users');
-
-        HeadingRowFormatter::default('none');
     }
 
     public function register()

diff --git a/src/Import/AbstractUserImport.php b/src/Import/AbstractUserImport.php
@@ -5,13 +5,15 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
+use Maatwebsite\Excel\Imports\HeadingRowFormatter;
 
 abstract class AbstractUserImport
 {
     protected string $returnUrl;
 
     public function __construct(string $returnUrl)
     {
+        HeadingRowFormatter::default('none');
         $this->returnUrl = $returnUrl;
     }
 

diff --git a/src/Import/UsersImport.php b/src/Import/UsersImport.php
@@ -4,12 +4,11 @@
 
 use EscolaLms\CsvUsers\Services\Contracts\CsvUserServiceContract;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\Validator;
+use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
 use Maatwebsite\Excel\Concerns\ToCollection;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 
-class UsersImport extends AbstractUserImport implements ToCollection, WithHeadingRow
+class UsersImport extends AbstractUserImport implements ToCollection, WithHeadingRow, SkipsEmptyRows
 {
     public function __construct(string $returnUrl)
     {

diff --git a/src/Services/CsvUserGroupService.php b/src/Services/CsvUserGroupService.php
@@ -2,14 +2,10 @@
 
 namespace EscolaLms\CsvUsers\Services;
 
-use EscolaLms\Auth\Dtos\UserFilterCriteriaDto;
-use EscolaLms\Auth\EscolaLmsAuthServiceProvider;
 use EscolaLms\Auth\Repositories\Contracts\UserGroupRepositoryContract;
-use EscolaLms\Auth\Repositories\Contracts\UserRepositoryContract;
 use EscolaLms\CsvUsers\Services\Contracts\CsvUserGroupServiceContract;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Config;
 
 class CsvUserGroupService implements CsvUserGroupServiceContract
 {

diff --git a/src/Services/CsvUserService.php b/src/Services/CsvUserService.php
@@ -28,15 +28,14 @@ public function getDataToExport(UserFilterCriteriaDto $userFilterCriteriaDto): C
 
     public function saveUserFromImport(Collection $data, string $returnUrl): Model
     {
+        if ($data->get('password')) {
+            $data->put('password', Hash::make($data->get('password')));
+        }
+
         if ($user = $this->userRepository->findByEmail($data->get('email'))) {
             $user = $this->userRepository->update($data->toArray(), $user->getKey());
         } else {
             $data->put('is_active', true);
-
-            if ($data->get('password')) {
-                $data->put('password', Hash::make($data->get('password')));
-            }
-
             $user = $this->userRepository->create($data->toArray());
             $user->markEmailAsVerified();
             event(new EscolaLmsImportedNewUserTemplateEvent($user, $returnUrl));