From 45e14c47ca81772f0b24854f4559e20f012cafa7 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 3 Mar 2026 15:52:06 +0100 Subject: [PATCH] fix unrecognized field --- src/Service/OrganizationsService.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Service/OrganizationsService.php b/src/Service/OrganizationsService.php index 888ac83..f92e87c 100644 --- a/src/Service/OrganizationsService.php +++ b/src/Service/OrganizationsService.php @@ -142,18 +142,12 @@ class OrganizationsService $roleAdmin = $this->entityManager->getRepository(Roles::class)->findOneBy(['name' => 'ADMIN']); - $adminUOs = $this->uoRepository->findBy(['organization' => $data['organization'], 'isActive' => true]); + $adminUOs = $this->uoRepository->findBy(['organization' => $data['organization'], 'isActive' => true, 'role' => $roleAdmin]); foreach ($adminUOs as $adminUO) { - $uoa = $this->entityManager->getRepository(UsersOrganizations::class) - ->findOneBy([ - 'userOrganization' => $adminUO, - 'role' => $roleAdmin, - 'isActive' => true - ]); switch ($type) { case 'USER_ACCEPTED': - if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) { + if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) { $newUser = $data['user']; $this->notificationService->notifyUserAcceptedInvite( $adminUO->getUsers(), @@ -167,7 +161,7 @@ class OrganizationsService } break; case 'USER_INVITED': - if ($uoa) { + if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) { $invitedUser = $data['user']; $this->notificationService->notifyUserInvited( $adminUO->getUsers(), @@ -182,7 +176,7 @@ class OrganizationsService break; case 'USER_DEACTIVATED': - if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) { + if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) { $removedUser = $data['user']; $this->notificationService->notifyUserDeactivated( $adminUO->getUsers(), @@ -197,7 +191,7 @@ class OrganizationsService break; case 'USER_DELETED': - if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) { + if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) { $removedUser = $data['user']; $this->notificationService->notifyUserDeleted( $adminUO->getUsers(), @@ -211,7 +205,7 @@ class OrganizationsService } break; case 'USER_ACTIVATED': - if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) { + if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) { $activatedUser = $data['user']; $this->notificationService->notifyUserActivated( $adminUO->getUsers(),