fix unrecognized field
This commit is contained in:
parent
a428cf92f3
commit
45e14c47ca
|
|
@ -142,18 +142,12 @@ class OrganizationsService
|
||||||
|
|
||||||
$roleAdmin = $this->entityManager->getRepository(Roles::class)->findOneBy(['name' => 'ADMIN']);
|
$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) {
|
foreach ($adminUOs as $adminUO) {
|
||||||
$uoa = $this->entityManager->getRepository(UsersOrganizations::class)
|
|
||||||
->findOneBy([
|
|
||||||
'userOrganization' => $adminUO,
|
|
||||||
'role' => $roleAdmin,
|
|
||||||
'isActive' => true
|
|
||||||
]);
|
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
case 'USER_ACCEPTED':
|
case 'USER_ACCEPTED':
|
||||||
if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
||||||
$newUser = $data['user'];
|
$newUser = $data['user'];
|
||||||
$this->notificationService->notifyUserAcceptedInvite(
|
$this->notificationService->notifyUserAcceptedInvite(
|
||||||
$adminUO->getUsers(),
|
$adminUO->getUsers(),
|
||||||
|
|
@ -167,7 +161,7 @@ class OrganizationsService
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'USER_INVITED':
|
case 'USER_INVITED':
|
||||||
if ($uoa) {
|
if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
||||||
$invitedUser = $data['user'];
|
$invitedUser = $data['user'];
|
||||||
$this->notificationService->notifyUserInvited(
|
$this->notificationService->notifyUserInvited(
|
||||||
$adminUO->getUsers(),
|
$adminUO->getUsers(),
|
||||||
|
|
@ -182,7 +176,7 @@ class OrganizationsService
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 'USER_DEACTIVATED':
|
case 'USER_DEACTIVATED':
|
||||||
if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
||||||
$removedUser = $data['user'];
|
$removedUser = $data['user'];
|
||||||
$this->notificationService->notifyUserDeactivated(
|
$this->notificationService->notifyUserDeactivated(
|
||||||
$adminUO->getUsers(),
|
$adminUO->getUsers(),
|
||||||
|
|
@ -197,7 +191,7 @@ class OrganizationsService
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 'USER_DELETED':
|
case 'USER_DELETED':
|
||||||
if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
||||||
$removedUser = $data['user'];
|
$removedUser = $data['user'];
|
||||||
$this->notificationService->notifyUserDeleted(
|
$this->notificationService->notifyUserDeleted(
|
||||||
$adminUO->getUsers(),
|
$adminUO->getUsers(),
|
||||||
|
|
@ -211,7 +205,7 @@ class OrganizationsService
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'USER_ACTIVATED':
|
case 'USER_ACTIVATED':
|
||||||
if ($uoa && $adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
if ($adminUO->getUsers()->getId() !== $data['user']->getId() ) {
|
||||||
$activatedUser = $data['user'];
|
$activatedUser = $data['user'];
|
||||||
$this->notificationService->notifyUserActivated(
|
$this->notificationService->notifyUserActivated(
|
||||||
$adminUO->getUsers(),
|
$adminUO->getUsers(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue