From 45befa9bb8ee8253c83bf4dafebf42ebac33ca31 Mon Sep 17 00:00:00 2001
From: marcio1002 <marcioalemao1999@yahoo.com>
Date: Mon, 29 Jan 2024 16:13:04 -0300
Subject: [PATCH 1/2] =?UTF-8?q?Corre=C3=A7=C3=A3o=20nas=20rotas=20para=20t?=
 =?UTF-8?q?ipo=20admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routes/api.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/routes/api.php b/routes/api.php
index 663ca88..d8659e2 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
-Route::prefix('auth')->group(function (){
+Route::prefix('auth')->group(function () {
     Route::post('login', [\App\Http\Controllers\Auth\AuthController::class, 'login']);
     Route::post('/forgot-password', \App\Http\Controllers\Auth\ForgotPasswordController::class);
     Route::post('/reset-password', \App\Http\Controllers\Auth\ResetPasswordController::class);
@@ -22,17 +22,10 @@ Route::prefix('auth')->group(function (){
 
 /* --- Routes verified --- */
 Route::middleware(['auth:sanctum', 'ability:Client', 'verified'])->group(function () {
-    Route::get('notification', [\App\Http\Controllers\NotificationController::class, 'index']);
-    Route::get('notification/{notification}', [\App\Http\Controllers\NotificationController::class, 'show']);
-
-    Route::get('faq', [\App\Http\Controllers\FaqController::class, 'index']);
-    Route::get('faq/{faq}', [\App\Http\Controllers\FaqController::class, 'show']);
-
     Route::post('pld', [\App\Http\Controllers\PldController::class, 'index']);
 
     Route::post('units', [\App\Http\Controllers\ClientController::class, 'index']);
 
-    Route::get('aboutUs', [\App\Http\Controllers\AboutUsController::class, 'index']);
 
     Route::get('download', [\App\Http\Controllers\InfoSectorialController::class, 'download']);
 });
@@ -81,12 +74,19 @@ Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () {
     Route::post('notify', [\App\Http\Controllers\NotificationController::class, 'notify']);
 
     Route::get('news', [\App\Http\Controllers\NewsController::class, 'send']);
-
 });
 
 /* --- Routes Admin and Client --- */
-Route::middleware(['auth:sanctum', 'ability:Admin,Client'])->group(function() {
+Route::middleware(['auth:sanctum', 'ability:Admin,Client'])->group(function () {
+    Route::get('aboutUs', [\App\Http\Controllers\AboutUsController::class, 'index']);
+
+    Route::get('faq', [\App\Http\Controllers\FaqController::class, 'index']);
+    Route::get('faq/{faq}', [\App\Http\Controllers\FaqController::class, 'show']);
+
+    Route::get('notification', [\App\Http\Controllers\NotificationController::class, 'index']);
+    Route::get('notification/{notification}', [\App\Http\Controllers\NotificationController::class, 'show']);
+
     Route::post('auth/logout', [\App\Http\Controllers\Auth\AuthController::class, 'logout']);
 });
 
-Route::post('import', [\App\Http\Controllers\UserController::class, 'importUserControll']);
\ No newline at end of file
+Route::post('import', [\App\Http\Controllers\UserController::class, 'importUserControll']);

From 206140111db3d796541275ca50d041a711b6a451 Mon Sep 17 00:00:00 2001
From: marcio1002 <marcioalemao1999@yahoo.com>
Date: Mon, 29 Jan 2024 16:22:13 -0300
Subject: [PATCH 2/2] =?UTF-8?q?Corre=C3=A7=C3=A3o=20ao=20criar=20usu=C3=A1?=
 =?UTF-8?q?rios=20importado=20do=20excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Imports/UsersWithSmartUsersImport.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/Imports/UsersWithSmartUsersImport.php b/app/Imports/UsersWithSmartUsersImport.php
index f639b00..0a34b4d 100644
--- a/app/Imports/UsersWithSmartUsersImport.php
+++ b/app/Imports/UsersWithSmartUsersImport.php
@@ -72,13 +72,19 @@ class UsersWithSmartUsersImport implements ToCollection
             ? $this->files_paths[$client_id]
             : '';
 
-        User::create(\compact(
+
+        /**
+         * @var ?\App\Models\User $user
+         */
+        $user = User::create(\compact(
             'client_id',
             'name',
             'email',
             'password',
             'profile_picture'
         ));
+
+        $user?->roles()?->sync([2]);
     }
 
     private function createSmartUserAccess(Collection $row, DadosCadastrais $client, string $email): void
@@ -90,13 +96,18 @@ class UsersWithSmartUsersImport implements ToCollection
             ? $this->files_paths[$client_id]
             : '';
 
-        User::create(\compact(
+        /**
+         * @var ?\App\Models\User $user
+         */
+        $user = User::create(\compact(
             'client_id',
             'name',
             'email',
             'password',
             'profile_picture'
         ));
+
+        $user?->roles()?->sync([2]);
     }
 
     private function uploadProfilePictures()