soucasne mazani lidi... problem s constrainty

skaut · Dec 15, 2022 · a27325a · a27325a
1 parent 24d5fc5
commit a27325a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/app/Model/User/Commands/Handlers/DeletePatrolHandler.php b/app/Model/User/Commands/Handlers/DeletePatrolHandler.php
@@ -8,6 +8,7 @@
 use App\Model\User\Queries\PatrolByIdQuery;
 use App\Model\User\Repositories\PatrolRepository;
 use App\Model\User\Repositories\UserGroupRoleRepository;
+use App\Model\User\Repositories\UserRepository;
 use App\Services\QueryBus;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
@@ -18,7 +19,8 @@ public function __construct(
         private QueryBus $queryBus,
         private EntityManagerInterface $em,
         private PatrolRepository $patrolRepository,
-        private UserGroupRoleRepository $userGroupRoleRepository
+        private UserGroupRoleRepository $userGroupRoleRepository,
+        private UserRepository $userRepository
     ) {
     }
 
@@ -28,6 +30,11 @@ public function __invoke(DeletePatrol $command): void
             $patrol = $this->queryBus->handle(new PatrolByIdQuery($command->id));
             foreach ($patrol->getUsersRoles() as $usersRole) {
                 $this->userGroupRoleRepository->remove($usersRole);
+                $u = $usersRole->getUser();
+//                $r = $u->getRoles();
+                if ($u->getRolesText() == '') {
+                    $this->userRepository->remove($u);
+                }
             }
 
             $this->patrolRepository->remove($patrol);

diff --git a/app/Model/User/Commands/Handlers/DeleteTroopHandler.php b/app/Model/User/Commands/Handlers/DeleteTroopHandler.php
@@ -9,6 +9,7 @@
 use App\Model\User\Queries\TroopByIdQuery;
 use App\Model\User\Repositories\TroopRepository;
 use App\Model\User\Repositories\UserGroupRoleRepository;
+use App\Model\User\Repositories\UserRepository;
 use App\Services\CommandBus;
 use App\Services\QueryBus;
 use Doctrine\ORM\EntityManagerInterface;
@@ -21,7 +22,8 @@ public function __construct(
         private CommandBus $commandBus,
         private EntityManagerInterface $em,
         private TroopRepository $troopRepository,
-        private UserGroupRoleRepository $userGroupRoleRepository
+        private UserGroupRoleRepository $userGroupRoleRepository,
+        private UserRepository $userRepository
     ) {
     }
 
@@ -35,6 +37,11 @@ public function __invoke(DeleteTroop $command): void
 
             foreach ($troop->getUsersRoles() as $usersRole) {
                 $this->userGroupRoleRepository->remove($usersRole);
+                $u = $usersRole->getUser();
+
+                if ($u->getRolesText() == '') {
+                    $this->userRepository->remove($usersRole->getUser());
+                }
             }
 
             $this->troopRepository->remove($troop);