diff --git a/src/Controller/CapsuleEditorController.php b/src/Controller/CapsuleEditorController.php index 370fb90060781528305e90bbc31380bfd32bc63e..f8678885163fc7a6f86a4d832dfbd53cd1cb3523 100644 --- a/src/Controller/CapsuleEditorController.php +++ b/src/Controller/CapsuleEditorController.php @@ -61,7 +61,8 @@ class CapsuleEditorController extends AbstractController } $current_capsule_editors_users = $capsule->getEditors()->toArray(); - if (! in_array($current_user, $current_capsule_editors_users)) { + if (! $capsule->getEditors()->contains($current_user)) { +// in_array($current_user, $current_capsule_editors_users)) { $this->addFlash( 'warning', $this->translator->trans( diff --git a/src/DataFixtures/CapsuleFixtures.php b/src/DataFixtures/CapsuleFixtures.php index 7f5c90a41ec7a19a8a826ae6060fa9ea95a92b8d..c95b19e2c784c20fc50b2a0ee689f7d4dba9dc05 100644 --- a/src/DataFixtures/CapsuleFixtures.php +++ b/src/DataFixtures/CapsuleFixtures.php @@ -3,7 +3,6 @@ namespace App\DataFixtures; use App\Builder\CapsuleBuilder; -use App\Entity\CapsuleEditor; use App\Entity\User; use DateTime; use Doctrine\Bundle\FixturesBundle\Fixture; @@ -67,11 +66,6 @@ class CapsuleFixtures extends Fixture implements DependentFixtureInterface } ); -// $editor = new CapsuleEditor(); -// $editor->setCapsuleId(1); -// $editor->setUserId(3); -// $manager->persist($editor); - $manager->flush(); } diff --git a/src/Repository/UserRepository.php b/src/Repository/UserRepository.php index c05f501dca9e554be24b21770e2edb8644f387b6..147f8c5c26d5ab001ea4d65733de9cf19b9aebd3 100644 --- a/src/Repository/UserRepository.php +++ b/src/Repository/UserRepository.php @@ -66,16 +66,10 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader */ public function getUsersFromIds(array $user_ids): array { - $users = []; - - foreach ($user_ids as $user_id) { - $user = $this->findOneBy(['id' => $user_id]); - if (null === $user) { - throw new Exception('User was not found'); - } - $users[] = $user; - } - - return $users; + return $this->createQueryBuilder('u') + ->andWhere('u.id in (:ids)') + ->setParameter('ids', $user_ids) + ->getQuery() + ->getResult(); } }