From 80c204f58425d439658841fff6d89f920d0421fc Mon Sep 17 00:00:00 2001
From: Wisdom Ebong <30173059+webong@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:20:14 +0100
Subject: [PATCH 1/2] Update V3 Module ServiceProvider.php

---
 src/Ushahidi/Modules/V3/ServiceProvider.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Ushahidi/Modules/V3/ServiceProvider.php b/src/Ushahidi/Modules/V3/ServiceProvider.php
index 690ec53ce3..49124aae00 100644
--- a/src/Ushahidi/Modules/V3/ServiceProvider.php
+++ b/src/Ushahidi/Modules/V3/ServiceProvider.php
@@ -2,27 +2,27 @@
 
 namespace Ushahidi\Modules\V3;
 
-use Ushahidi\Core\Tool\Verifier;
-use Ushahidi\Modules\V3\Console;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider as BaseServiceProvider;
+use Ushahidi\Modules\V3\Console;
+use Ushahidi\Modules\V3\Factory\UsecaseFactory;
+use Ushahidi\Modules\V3\Http\Middleware\RepositoryBinder;
+use Ushahidi\Core\Tool\Verifier;
 use Ushahidi\Core\Usecase\User\LoginUser;
 use Ushahidi\Core\Usecase\Post\ExportPost;
-use Ushahidi\Core\Usecase\Export\Job\PostCount;
-use Ushahidi\Modules\V3\Factory\UsecaseFactory;
 use Ushahidi\Core\Usecase\Message\ReceiveMessage;
-use Ushahidi\Modules\V3\Repository\TosRepository;
+use Ushahidi\Core\Usecase\Export\Job\PostCount;
+use Ushahidi\Contracts\Repository\Entity\TagRepository;
 use Ushahidi\Contracts\Repository\Entity\SetRepository;
 use Ushahidi\Contracts\Repository\Entity\PostRepository;
 use Ushahidi\Contracts\Repository\Entity\RoleRepository;
 use Ushahidi\Contracts\Repository\Entity\UserRepository;
 use Ushahidi\Contracts\Repository\Entity\MediaRepository;
-use Ushahidi\Modules\V3\Http\Middleware\RepositoryBinder;
 use Ushahidi\Contracts\Repository\Entity\ApiKeyRepository;
 use Ushahidi\Contracts\Repository\Entity\ConfigRepository;
 use Ushahidi\Contracts\Repository\Entity\ContactRepository;
 use Ushahidi\Contracts\Repository\Entity\MessageRepository;
 use Ushahidi\Contracts\Repository\Entity\ExportJobRepository;
-use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 use Ushahidi\Contracts\Repository\Entity\ExportBatchRepository;
 use Ushahidi\Contracts\Repository\Entity\FormAttributeRepository;
 use Ushahidi\Contracts\Repository\Entity\TargetedSurveyStateRepository;

From 46e6e8c27948f775972fa48dbe26a1386da36f37 Mon Sep 17 00:00:00 2001
From: Wisdom Ebong <30173059+webong@users.noreply.github.com>
Date: Thu, 9 Nov 2023 11:56:55 +0100
Subject: [PATCH 2/2] Update UserCreateCommand.php

---
 app/Console/Commands/UserCreateCommand.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/UserCreateCommand.php b/app/Console/Commands/UserCreateCommand.php
index fba00e60d0..b84ba81e34 100644
--- a/app/Console/Commands/UserCreateCommand.php
+++ b/app/Console/Commands/UserCreateCommand.php
@@ -63,7 +63,7 @@ public function handle(UserRepository $userRepo, TosRepository $tosRepo)
             'email' => 'required|email|unique:users',
             'password' => 'required|min:7|max:72',
             'realname' => 'max:150',
-            'role' => ['exists:roles', function ($attribute, $value, $fail) use ($userRepo) {
+            'role' => ['exists:roles,name', function ($attribute, $value, $fail) use ($userRepo) {
                 $limit = Feature::getLimit('admin_users');
                 if ($limit !== INF && $value == 'admin') {
                     $total = $userRepo->getTotalCount(['role' => 'admin']);
@@ -75,8 +75,8 @@ public function handle(UserRepository $userRepo, TosRepository $tosRepo)
             }]
         ]);
 
-        if (!$validator->failed()) {
-            throw new ValidatorException('Failed to validate user', $validator->errors());
+        if ($validator->failed()) {
+            throw new ValidatorException('Failed to validate user', $validator->errors()->toArray());
         }
 
         $entity = $userRepo->getEntity();