fix: user invitation

backend/src/Api/Console/Controller/UserController.php

@@ -66,6 +66,10 @@ public function createUser(Newsletter $newsletter, #[MapRequestPayload] CreateUs
         $organizationId = $newsletter->getOrganizationId();
         assert($organizationId !== null);
 
+        if ($this->userService->hasAccessToNewsletter($newsletter, $hyvorUser->id)) {
+            throw new BadRequestHttpException('User is already added to the newsletter');
+        }
+
         try {
             $verification = $this->comms->send(
                 new VerifyMember(
@@ -81,10 +85,6 @@ public function createUser(Newsletter $newsletter, #[MapRequestPayload] CreateUs
             throw new BadRequestHttpException('Unable to find the user in the organization');
         }
 
-        if ($this->userService->isAdmin($newsletter, $hyvorUser->id)) {
-            throw new BadRequestHttpException("User is already an admin");
-        }
-
         $newsletterUser = $this->userService->createUser($newsletter, $hyvorUser->id);
 
         return $this->json(

backend/src/Service/User/UserService.php

@@ -52,13 +52,10 @@ public function isAdmin(Newsletter $newsletter, int $hyvorUserId): bool
         $user = $this->em->getRepository(User::class)->findBy([
             'newsletter' => $newsletter,
             'hyvor_user_id' => $hyvorUserId,
-            'role' => UserRole::ADMIN->value
+            'role' => UserRole::ADMIN
         ]);
 
-        if (!$user) {
-            return false;
-        }
-        return true;
+        return !!$user;
     }
 
     public function createUser(Newsletter $newsletter, int $hyvorUserId): User

backend/tests/Api/Console/User/CreateUserTest.php

@@ -62,7 +62,7 @@ public function test_when_already_an_admin(): void
             ]
         );
 
-        $this->assertResponseFailed(400, "User is already an admin");
+        $this->assertResponseFailed(400, "User is already added to the newsletter");
     }
 
     public function test_when_not_an_organization_member(): void
@@ -104,4 +104,4 @@ public function test_when_comms_api_fail(): void
 
         $this->assertResponseFailed(400, 'Unable to verify the user. Please try again later.');
     }
-}
+}

frontend/src/routes/console/(nav)/[subdomain]/settings/users/+page.svelte

@@ -43,10 +43,7 @@
 	</Button>
 
 	{#if inviterOpen}
-		<UserInvitationModal
-			bind:show={inviterOpen}
-			refreshUsers={(u: User) => (users = [...users, u])}
-		/>
+		<UserInvitationModal bind:show={inviterOpen} onadd={(u: User) => (users = [...users, u])} />
 	{/if}
 </TopBar>