diff --git a/app/Http/Controllers/MembershipController.php b/app/Http/Controllers/MembershipController.php index be70847..5f1e1a9 100644 --- a/app/Http/Controllers/MembershipController.php +++ b/app/Http/Controllers/MembershipController.php @@ -83,9 +83,9 @@ public function destroy(Membership $membership) $membership->delete(); - $admins = User::activeAdmins()->select('id', 'email')->get(); +/* $admins = User::activeAdmins()->select('id', 'email')->get(); Notification::send($operators, new MembershipRejected($entity, $federation)); - Notification::send($admins, new MembershipRejected($entity, $federation)); + Notification::send($admins, new MembershipRejected($entity, $federation));*/ return redirect() ->back() diff --git a/app/Jobs/FolderDeleteMembership.php b/app/Jobs/FolderDeleteMembership.php index edb5a82..4509f84 100644 --- a/app/Jobs/FolderDeleteMembership.php +++ b/app/Jobs/FolderDeleteMembership.php @@ -8,6 +8,7 @@ use App\Models\Membership; use App\Notifications\EntityDeletedFromHfd; use App\Notifications\EntityStateChanged; +use App\Notifications\MembershipRejected; use App\Services\NotificationService; use App\Traits\HandlesJobsFailuresTrait; use Illuminate\Bus\Queueable; @@ -58,6 +59,9 @@ public function handle(): void $lock->block(61); EntityFacade::deleteEntityMetadataFromFolder($entity->file, $federation->xml_id); + + NotificationService::sendEntityNotification($entity,new MembershipRejected($entity->entityid,$federation->name)); + RunMdaScript::dispatch($federation, $lock->owner()); } catch (Exception $e) { $this->fail($e);