From 4370349f10ba10d7ba0a9511b5d978332ce77781 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 17 Feb 2023 13:05:05 +0100 Subject: [PATCH 1/4] fix LoadCalendarRange fixture --- .../ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php index a1226ca6a..805386669 100644 --- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCalendarRange.php @@ -61,7 +61,7 @@ class LoadCalendarRange extends Fixture implements FixtureGroupInterface, Ordere ->setEmail('centreA@test.chill.social') ->setLocationType($type = new LocationType()) ->setPhonenumber1(PhoneNumberUtil::getInstance()->parse('+3287653812')); - $type->setTitle('Service'); + $type->setTitle(['fr' => 'Service']); $address->setStreet('Rue des Épaules')->setStreetNumber('14') ->setPostcode($postCode = new PostalCode()); $postCode->setCode('4145')->setName('Houte-Si-Plout')->setCountry( From 5ee0ab5ab85944ab038828942f0b4e3a275dbee4 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 17 Feb 2023 13:30:34 +0100 Subject: [PATCH 2/4] fix LoadInvite fixture (CalendarBundle) --- .../DataFixtures/ORM/LoadInvite.php | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php index 25b8ae8a8..2e021fc2b 100644 --- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php @@ -12,6 +12,8 @@ declare(strict_types=1); namespace Chill\CalendarBundle\DataFixtures\ORM; use Chill\CalendarBundle\Entity\Invite; +use Chill\MainBundle\DataFixtures\ORM\LoadUsers; +use Chill\MainBundle\Entity\User; use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface; use Doctrine\Persistence\ObjectManager; @@ -33,14 +35,21 @@ class LoadInvite extends Fixture implements FixtureGroupInterface public function load(ObjectManager $manager): void { $arr = [ - ['name' => ['fr' => 'Rendez-vous décliné']], - ['name' => ['fr' => 'Rendez-vous accepté']], + [ + 'name' => ['fr' => 'Rendez-vous décliné'], + 'status' => 'declined' + ], + [ + 'name' => ['fr' => 'Rendez-vous accepté'], + 'status' => 'accepted' + ], ]; foreach ($arr as $a) { echo 'Creating calendar invite : ' . $a['name']['fr'] . "\n"; $invite = (new Invite()) - ->setStatus($a['name']); + ->setStatus($a['status']) + ->setUser($this->getRandomUser()); $manager->persist($invite); $reference = 'Invite_' . $a['name']['fr']; $this->addReference($reference, $invite); @@ -49,4 +58,11 @@ class LoadInvite extends Fixture implements FixtureGroupInterface $manager->flush(); } + + private function getRandomUser(): User + { + $userRef = array_rand(LoadUsers::$refs); + + return $this->getReference($userRef); + } } From 744b62184a7b37ca8d0f2d911b359a3f293e4534 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 17 Feb 2023 14:48:02 +0100 Subject: [PATCH 3/4] fix LoadHousehold fixture --- .../DataFixtures/ORM/LoadHousehold.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php index 8b1a1b8ec..342dfb020 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php @@ -11,11 +11,13 @@ declare(strict_types=1); namespace Chill\PersonBundle\DataFixtures\ORM; +use Chill\MainBundle\DataFixtures\ORM\LoadCenters; use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes; use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\PostalCode; use Chill\PersonBundle\Entity\Household\Household; use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Entity\Person\PersonCenterHistory; use Chill\PersonBundle\Household\MembersEditorFactory; use DateInterval; use DateTime; @@ -192,14 +194,20 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface private function preparePersonIds() { + $centers = LoadCenters::$centers; + // @TODO: Remove this and make this service stateless $this->personIds = $this->em ->createQuery( 'SELECT p.id FROM ' . Person::class . ' p ' . - 'JOIN p.center c ' . - 'WHERE c.name = :center ' + 'WHERE EXISTS( ' . + 'SELECT 1 FROM ' . PersonCenterHistory::class . ' pch ' . + 'JOIN pch.center c ' . + 'WHERE pch.person = p.id ' . + 'AND c.name IN (:authorized_centers)' . + ')' ) - ->setParameter('center', 'Center A') + ->setParameter('authorized_centers', $centers) ->getScalarResult(); shuffle($this->personIds); From 95984eff6d9857916f64480ec1225fa6af774a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 1 Mar 2023 13:55:35 +0000 Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s) --- .../ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php index 2e021fc2b..ba325e296 100644 --- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php +++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadInvite.php @@ -37,11 +37,11 @@ class LoadInvite extends Fixture implements FixtureGroupInterface $arr = [ [ 'name' => ['fr' => 'Rendez-vous décliné'], - 'status' => 'declined' + 'status' => Invite::DECLINED, ], [ 'name' => ['fr' => 'Rendez-vous accepté'], - 'status' => 'accepted' + 'status' => Invite::ACCEPTED, ], ];