From c7cc2c75967a8d5daf6315951ce2fe0c7365111d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 17 Aug 2021 20:01:29 +0000 Subject: [PATCH 1/9] Fixtures/fix loading people --- .gitlab-ci.yml | 6 + .../ORM/LoadAbstractNotificationsTrait.php | 1 + .../ORM/LoadAccompanyingPeriod.php | 88 ---- .../LoadAccompanyingPeriodNotifications.php | 10 +- .../DataFixtures/ORM/LoadHousehold.php | 5 +- .../DataFixtures/ORM/LoadPeople.php | 492 ++++++++++-------- .../Repository/MaritalStatusRepository.php | 43 ++ .../Controller/PersonControllerCreateTest.php | 97 ++-- .../Tests/Search/PersonSearchTest.php | 125 +++-- .../TimelineAccompanyingPeriodTest.php | 18 +- tests/app | 2 +- 11 files changed, 453 insertions(+), 434 deletions(-) delete mode 100644 src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86e65c390..295eb3e0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,11 +5,13 @@ image: registry.gitlab.com/chill-projet/chill-app/php-base-image:7.4 cache: paths: - tests/app/vendor/ + - .composer before_script: # add extensions to postgres - PGPASSWORD=$POSTGRES_PASSWORD psql -U $POSTGRES_USER -h db -c "CREATE EXTENSION IF NOT EXISTS unaccent; CREATE EXTENSION IF NOT EXISTS pg_trgm;" # Install and run Composer + - mkdir -p $COMPOSER_HOME - curl -sS https://getcomposer.org/installer | php - php -d memory_limit=2G composer.phar install - php tests/app/bin/console doctrine:migrations:migrate -n @@ -34,6 +36,10 @@ variables: REDIS_HOST: redis REDIS_PORT: 6379 REDIS_URL: redis://redis:6379 + # change vendor dir to make the app install into tests/apps + COMPOSER_VENDOR_DIR: tests/app/vendor + # cache some composer data + COMPOSER_HOME: .composer # Run our tests diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php index 071f67497..629b6657e 100644 --- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php +++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAbstractNotificationsTrait.php @@ -15,6 +15,7 @@ trait LoadAbstractNotificationsTrait { public function load(ObjectManager $manager) { + return; foreach ($this->notifs as $notif) { $entityId = $this->getReference($notif['entityRef'])->getId(); diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php deleted file mode 100644 index a30943bcb..000000000 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriod.php +++ /dev/null @@ -1,88 +0,0 @@ -, - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -namespace Chill\PersonBundle\DataFixtures\ORM; - -use Doctrine\Common\DataFixtures\AbstractFixture; -use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Doctrine\Persistence\ObjectManager; -use Symfony\Component\DependencyInjection\ContainerAwareInterface; - -use Chill\PersonBundle\Entity\AccompanyingPeriod; -use Chill\PersonBundle\Entity\Person; - -/** - * Description of LoadAccompanyingPeriod - * - * @author Champs-Libres Coop - */ -class LoadAccompanyingPeriod extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface -{ - use \Symfony\Component\DependencyInjection\ContainerAwareTrait; - - - public const ACCOMPANYING_PERIOD = 'parcours 1'; - - public function getOrder() - { - return 10004; - } - - public static $references = array(); - - public function load(ObjectManager $manager) - { - - $centerA = $this->getReference('centerA'); - $centerAId = $centerA->getId(); - - $personIds = $this->container->get('doctrine.orm.entity_manager') - ->createQueryBuilder() - ->select('p.id') - ->from('ChillPersonBundle:Person', 'p') - ->where('p.center = :centerAId') - ->orderBy('p.id', 'ASC') - ->setParameter('centerAId', $centerAId) - ->getQuery() - ->getScalarResult(); - - $openingDate = new \DateTime('2020-04-01'); - - $person1 = $manager->getRepository(Person::class)->find($personIds[0]); - $person2 = $manager->getRepository(Person::class)->find($personIds[1]); - - $socialScope = $this->getReference('scope_social'); - - $a = new AccompanyingPeriod($openingDate); - $a->addPerson($person1); - $a->addPerson($person2); - $a->addScope($socialScope); - $a->setStep(AccompanyingPeriod::STEP_CONFIRMED); - - $manager->persist($a); - - $this->addReference(self::ACCOMPANYING_PERIOD, $a); - echo "Adding one AccompanyingPeriod\n"; - - $manager->flush(); - } -} diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php index d1c6f4da7..e96bf44e6 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php @@ -6,7 +6,6 @@ use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\MainBundle\DataFixtures\ORM\LoadAbstractNotificationsTrait; -use Chill\PersonBundle\DataFixtures\ORM\LoadAccompanyingPeriod; /** * Load notififications into database @@ -19,7 +18,7 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep [ 'message' => 'Hello !', 'entityClass' => AccompanyingPeriod::class, - 'entityRef' => LoadAccompanyingPeriod::ACCOMPANYING_PERIOD, + 'entityRef' => null, 'sender' => 'center a_social', 'addressees' => [ 'center a_social', @@ -30,10 +29,15 @@ class LoadAccompanyingPeriodNotifications extends AbstractFixture implements Dep ] ]; + protected function getEntityRef() + { + return null; + } + public function getDependencies() { return [ - LoadAccompanyingPeriod::class, + LoadPeople::class, ]; } } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php index 812f2bb07..24a5bbb7f 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadHousehold.php @@ -33,7 +33,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface public function load(ObjectManager $manager) { - // generate two times the participation. This will lead to + // generate two times the participation. This will lead to // some movement in participation (same people in two differents // households) @@ -110,7 +110,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface $i = 0; while ($i < $nb) { $address = $this->createAddress(); - $address->setValidFrom(\DateTime::createFromImmutable($date)); + $address->setValidFrom(\DateTime::createFromImmutable($date)); if (\random_int(0, 20) < 1) { $date = $date->add(new \DateInterval('P'.\random_int(8, 52).'W')); @@ -157,6 +157,7 @@ class LoadHousehold extends Fixture implements DependentFixtureInterface ->setParameter('center', 'Center A') ->getScalarResult() ; + \shuffle($this->personIds); } diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php index 474cd1216..d6bdce233 100644 --- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php +++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php @@ -21,9 +21,15 @@ namespace Chill\PersonBundle\DataFixtures\ORM; +use Chill\MainBundle\Entity\Center; +use Chill\MainBundle\Entity\Country; use Chill\MainBundle\Entity\PostalCode; +use Chill\MainBundle\Repository\CenterRepository; +use Chill\MainBundle\Repository\CountryRepository; use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\MaritalStatus; use Chill\PersonBundle\Entity\SocialWork\SocialIssue; +use Chill\PersonBundle\Repository\MaritalStatusRepository; use Chill\ThirdPartyBundle\Entity\ThirdParty; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; @@ -31,6 +37,7 @@ use Doctrine\Persistence\ObjectManager; use Chill\PersonBundle\Entity\Person; use Faker\Factory; use Faker\Generator; +use Nelmio\Alice\Faker\GeneratorFactory; use Nelmio\Alice\Loader\NativeLoader; use Nelmio\Alice\ObjectSet; use Symfony\Component\DependencyInjection\ContainerAwareInterface; @@ -44,8 +51,6 @@ use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository; /** * Load people into database * - * @author Julien Fastré - * @author Marc Ducobu */ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface { @@ -57,35 +62,50 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con protected SocialIssueRepository $socialIssueRepository; - protected array $cacheSocialIssues = array(); + protected CountryRepository $countryRepository; - public function __construct(Registry $workflowRegistry, SocialIssueRepository $socialIssueRepository) - { + protected NativeLoader $loader; + + /** + * @var array|SocialIssue[] + */ + protected array $cacheSocialIssues = []; + + /** + * @var array|Country[] + */ + protected array $cacheCountries = []; + + /** + * @var array|Center[] + */ + protected array $cacheCenters = []; + + protected CenterRepository $centerRepository; + + /** + * @var array|MaritalStatus[] + */ + protected array $cacheMaritalStatuses = []; + + protected MaritalStatusRepository $maritalStatusRepository; + + public function __construct( + Registry $workflowRegistry, + SocialIssueRepository $socialIssueRepository, + CenterRepository $centerRepository, + CountryRepository $countryRepository, + MaritalStatusRepository $maritalStatusRepository + ) { $this->faker = Factory::create('fr_FR'); + $this->faker->addProvider($this); $this->workflowRegistry = $workflowRegistry; $this->socialIssueRepository = $socialIssueRepository; - } + $this->centerRepository = $centerRepository; + $this->countryRepository = $countryRepository; + $this->maritalStatusRepository = $maritalStatusRepository; + $this->loader = new NativeLoader($this->faker); - public function prepare() - { - //prepare days, month, years - $y = 1950; - do { - $this->years[] = $y; - $y = $y +1; - } while ($y >= 1990); - - $m = 1; - do { - $this->month[] = $m; - $m = $m +1; - } while ($m >= 12); - - $d = 1; - do { - $this->day[] = $d; - $d = $d + 1; - } while ($d <= 28); } public function getOrder() @@ -95,8 +115,8 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con public function load(ObjectManager $manager) { - $this->loadRandPeople($manager); $this->loadExpectedPeople($manager); + $this->loadRandPeople($manager); $manager->flush(); } @@ -105,117 +125,102 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con { echo "loading expected people...\n"; - foreach ($this->peoples as $person) { - $this->addAPerson($this->fillWithDefault($person), $manager); + + foreach ($this->peoples as $personDef) { + $person = $this->createExpectedPerson($personDef); + $this->addAPerson($person, $manager); } } - public function loadRandPeople(ObjectManager $manager) + protected function loadRandPeople(ObjectManager $manager) { echo "loading rand people...\n"; + $persons = $this->createRandPerson()->getObjects(); - $this->prepare(); - - $chooseLastNameOrTri = array('tri', 'tri', 'name', 'tri'); - - $i = 0; - - do { - $i++; - - $sex = $this->genders[array_rand($this->genders)]; - - if ($chooseLastNameOrTri[array_rand($chooseLastNameOrTri)] === 'tri' ) { - $length = rand(2, 3); - $lastName = ''; - for ($j = 0; $j <= $length; $j++) { - $lastName .= $this->lastNamesTrigrams[array_rand($this->lastNamesTrigrams)]; - } - $lastName = ucfirst($lastName); - } else { - $lastName = $this->lastNames[array_rand($this->lastNames)]; - } - - if ($sex === Person::MALE_GENDER) { - $firstName = $this->firstNamesMale[array_rand($this->firstNamesMale)]; - } else { - $firstName = $this->firstNamesFemale[array_rand($this->firstNamesFemale)]; - } - - // add an address on 80% of the created people - if (rand(0,100) < 80) { - $address = $this->getRandomAddress(); - // on 30% of those person, add multiple addresses - if (rand(0,10) < 4) { - $address = array( - $address, - $this->getRandomAddress() - ); - } - } else { - $address = null; - } - - $person = array( - 'FirstName' => $firstName, - 'LastName' => $lastName, - 'Gender' => $sex, - 'Nationality' => (rand(0,100) > 50) ? NULL: 'BE', - 'center' => (rand(0,1) == 0) ? 'centerA': 'centerB', - 'Address' => $address, - 'maritalStatus' => $this->maritalStatusRef[array_rand($this->maritalStatusRef)] - ); - - $this->addAPerson($this->fillWithDefault($person), $manager); - - } while ($i <= 100); + foreach ($persons as $person) { + $this->addAPerson($person, $manager); + } } - /** - * fill a person array with default value - * - * @param string[] $specific - */ - private function fillWithDefault(array $specific) + private function createRandPerson(): ObjectSet { - return array_merge(array( - 'Birthdate' => "1960-10-12", - 'PlaceOfBirth' => "Ottignies Louvain-La-Neuve", - 'Gender' => Person::MALE_GENDER, - 'Email' => "roger@yopmail.com", - 'CountryOfBirth' => 'BE', - 'Nationality' => 'BE', - 'CFData' => array(), - 'Address' => null - ), $specific); + return $this->loader->loadData([ + Person::class => [ + 'persons{1..300}' => [ + 'firstName' => '', + 'lastName' => '', + 'gender' => '', + 'nationality' => '', + 'center' => '', + 'maritalStatus' => '', + 'birthdate' => '', + 'placeOfBirth' => '', + 'email' => '', + 'countryOfBirth' => '', + ] + ] + ]); } - private function getRandomSocialIssue(): SocialIssue + private function createExpectedPerson($default): Person { - if (0 === count($this->cacheSocialIssues)) { - $this->cacheSocialIssues = $this->socialIssueRepository->findAll(); + $person = $this->loader->loadData([ + Person::class => [ + "person" => [ + 'firstName' => $default['firstName'] ?? '', + 'lastName' => $default['lastName'] ?? '', + 'gender' => '', + 'nationality' => '', + 'center' => '', + 'maritalStatus' => '', + 'birthdate' => '', + 'placeOfBirth' => '', + 'email' => '', + 'countryOfBirth' => '', + ], + ] + ])->getObjects()['person']; + + // force some values + foreach ($default as $key => $value) { + switch ($key) { + case 'birthdate': + $person->setBirthdate(new \DateTime($value)); + break; + case 'center': + $person->setCenter($this->centerRepository + ->findOneBy(['name' => $value])); + break; + case 'countryOfBirth': + case 'nationality': + $country = $this->countryRepository + ->findOneBy(['countryCode' => $value]); + $person->{'set'.\ucfirst($key)}($country); + break; + case 'maritalStatus': + $person->setMaritalStatus($this->maritalStatusRepository + ->find($value)); + break; + } } - return $this->cacheSocialIssues[\array_rand($this->cacheSocialIssues)]; + return $person; } /** * create a new person from array data * - * @param array $person - * @param ObjectManager $manager * @throws \Exception */ - private function addAPerson(array $person, ObjectManager $manager) + private function addAPerson(Person $person, ObjectManager $manager) { - $p = new Person(); $accompanyingPeriod = new AccompanyingPeriod( (new \DateTime()) ->sub( new \DateInterval('P' . \random_int(0, 180) . 'D') ) ); - $p->addAccompanyingPeriod($accompanyingPeriod); + $person->addAccompanyingPeriod($accompanyingPeriod); $accompanyingPeriod->addSocialIssue($this->getRandomSocialIssue()); if (\random_int(0, 10) > 3) { @@ -225,53 +230,13 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con $workflow->apply($accompanyingPeriod, 'confirm'); } - foreach ($person as $key => $value) { - switch ($key) { - case 'CountryOfBirth': - case 'Nationality': - $value = $this->getCountry($value); - break; - case 'Birthdate': - $value = new \DateTime($value); - break; - case 'center': - case 'maritalStatus': - $value = $this->getReference($value); - break; - case 'accompanyingPeriods': - $this->addAccompanyingPeriods($p, $value, $manager); - break; - } - - //try to add the data using the setSomething function, - // if not possible, fallback to addSomething function - if (method_exists($p, 'set'.$key)) { - call_user_func(array($p, 'set'.$key), $value); - } elseif (method_exists($p, 'add'.$key)) { - // if we have a "addSomething", we may have multiple items to add - // so, we set the value in an array if it is not an array, and - // will call the function addSomething multiple times - if (!is_array($value)) { - $value = array($value); - } - - foreach($value as $v) { - if ($v !== NULL) { - call_user_func(array($p, 'add'.$key), $v); - } - } - - } - } - - $manager->persist($p); - echo "add person'".$p->__toString()."'\n"; + $manager->persist($person); + echo "add person'".$person->__toString()."'\n"; } private function createAddress(): Address { - $loader = new NativeLoader(); - $objectSet = $loader->loadData([ + $objectSet = $this->loader->loadData([ Address::class => [ 'address' => [ 'street' => '', @@ -285,6 +250,17 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con return $objectSet->getObjects()['address']; } + + + private function getRandomSocialIssue(): SocialIssue + { + if (0 === count($this->cacheSocialIssues)) { + $this->cacheSocialIssues = $this->socialIssueRepository->findAll(); + } + + return $this->cacheSocialIssues[\array_rand($this->cacheSocialIssues)]; + } + private function getPostalCode(): PostalCode { $ref = LoadPostalCodes::$refs[\array_rand(LoadPostalCodes::$refs)]; @@ -306,7 +282,6 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con return Point::fromLonLat($lon, $lat); } - /** * Create a random address * @@ -329,53 +304,77 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con ; } - private function getCountry($countryCode) + /** + * @internal This method is public and called by faker as a custom generator + * @return Center + */ + public function getRandomCenter(): Center { - if ($countryCode === NULL) { - return NULL; + if (0 === count($this->cacheCenters)) { + $this->cacheCenters = $this->centerRepository->findAll(); } - return $this->container->get('doctrine.orm.entity_manager') - ->getRepository('ChillMainBundle:Country') - ->findOneByCountryCode($countryCode); + + return $this->cacheCenters[\array_rand($this->cacheCenters)]; } - private $maritalStatusRef = ['ms_single', 'ms_married', 'ms_widow', 'ms_separat', - 'ms_divorce', 'ms_legalco', 'ms_unknown']; + /** + * @internal This method is public and called by faker as a custom generator + * @param int $nullPercentage + * @return Country|null + * @throws \Exception + */ + public function getRandomCountry(int $nullPercentage = 20): ?Country + { + if (0 === count($this->cacheCountries)) { + $this->cacheCountries = $this->countryRepository->findAll(); + } - private $firstNamesMale = array("Jean", "Mohamed", "Alfred", "Robert", "Justin", "Brian", - "Compère", "Jean-de-Dieu", "Charles", "Pierre", "Luc", "Mathieu", "Alain", "Etienne", "Eric", - "Corentin", "Gaston", "Spirou", "Fantasio", "Mahmadou", "Mohamidou", "Vursuv", "Youssef" ); + if ($nullPercentage < \random_int(0, 100)) { + return NULL; + } - private $firstNamesFemale = array("Svedana", "Sevlatina", "Irène", "Marcelle", - "Corentine", "Alfonsine", "Caroline", "Solange", "Gostine", "Fatoumata", "Nicole", - "Groseille", "Chana", "Oxana", "Ivana", "Julie", "Tina", "Adèle" ); + return $this->cacheCountries [\array_rand($this->cacheCountries)]; + } - private $lastNames = array("Diallo", "Bah", "Gaillot", "Martin"); + /** + * @internal This method is public and called by faker as a custom generator + * @return string + */ + public function getRandomGender(): string + { + return $this->genders[array_rand($this->genders)]; + } - private $lastNamesTrigrams = array("fas", "tré", "hu", 'blart', 'van', 'der', 'lin', 'den', - 'ta', 'mi', 'net', 'gna', 'bol', 'sac', 'ré', 'jo', 'du', 'pont', 'cas', 'tor', 'rob', 'al', - 'ma', 'gone', 'car',"fu", "ka", "lot", "no", "va", "du", "bu", "su", "jau", "tte", 'sir', - "lo", 'to', "cho", "car", 'mo','zu', 'qi', 'mu'); + /** + * @internal This method is public and called by faker as a custom generator + * @param int $nullPercentage + * @return MaritalStatus|null + * @throws \Exception + */ + public function getRandomMaritalStatus(int $nullPercentage = 50): ?MaritalStatus + { + if (0 === count($this->cacheMaritalStatuses)) { + $this->cacheMaritalStatuses = $this->maritalStatusRepository->findAll(); + } - private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER); + if ($nullPercentage < \random_int(0, 100)) { + return NULL; + } - private $years = array(); + return $this->cacheMaritalStatuses[array_rand($this->cacheMaritalStatuses)]; + } - private $month = array(); - - private $day = array(); + private $genders = array(Person::MALE_GENDER, Person::FEMALE_GENDER, Person::BOTH_GENDER); private $peoples = array( array( - 'LastName' => "Depardieu", - 'FirstName' => "Gérard", - 'Birthdate' => "1948-12-27", - 'PlaceOfBirth' => "Châteauroux", - 'Gender' => Person::MALE_GENDER, - 'CountryOfBirth' => 'FR', - 'Nationality' => 'RU', - 'center' => 'centerA', - 'maritalStatus' => 'ms_divorce', + 'lastName' => "Depardieu", + 'firstName' => "Gérard", + 'birthdate' => "1948-12-27", + 'placeOfBirth' => "Châteauroux", + 'nationality' => 'RU', + 'gender' => Person::MALE_GENDER, + 'center' => 'Center A', 'accompanyingPeriods' => [ [ 'from' => '2015-02-01', @@ -394,67 +393,123 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con ), array( //to have a person with same firstname as Gérard Depardieu - 'LastName' => "Depardieu", - 'FirstName' => "Jean", - 'Birthdate' => "1960-10-12", - 'CountryOfBirth' => 'FR', - 'Nationality' => 'FR', - 'center' => 'centerA', + 'lastName' => "Depardieu", + 'firstName' => "Jean", + 'birthdate' => "1960-10-12", + 'countryOfBirth' => 'FR', + 'nationality' => 'FR', + 'center' => 'Center A', 'maritalStatus' => 'ms_divorce' ), array( //to have a person with same birthdate of Gérard Depardieu - 'LastName' => 'Van Snick', - 'FirstName' => 'Bart', - 'Birthdate' => '1948-12-27', - 'center' => 'centerA', + 'lastName' => 'Van Snick', + 'firstName' => 'Bart', + 'birthdate' => '1948-12-27', + 'center' => 'Center A', 'maritalStatus' => 'ms_legalco' ), array( //to have a woman with Depardieu as FirstName - 'LastName' => 'Depardieu', - 'FirstName' => 'Charline', - 'Gender' => Person::FEMALE_GENDER, - 'center' => 'centerA', + 'lastName' => 'Depardieu', + 'firstName' => 'Charline', + 'gender' => Person::FEMALE_GENDER, + 'center' => 'Center A', 'maritalStatus' => 'ms_legalco' ), array( //to have a special character in lastName - 'LastName' => 'Manço', - 'FirstName' => 'Étienne', - 'center' => 'centerA', + 'lastName' => 'Manço', + 'firstName' => 'Étienne', + 'center' => 'Center A', 'maritalStatus' => 'ms_unknown' ), array( //to have true duplicate person - 'LastName' => "Depardieu", - 'FirstName' => "Jean", - 'Birthdate' => "1960-10-12", - 'CountryOfBirth' => 'FR', - 'Nationality' => 'FR', - 'center' => 'centerA', + 'lastName' => "Depardieu", + 'firstName' => "Jean", + 'birthdate' => "1960-10-12", + 'countryOfBirth' => 'FR', + 'nationality' => 'FR', + 'center' => 'Center A', 'maritalStatus' => 'ms_divorce' ), array( //to have false duplicate person - 'LastName' => "Depardieu", - 'FirstName' => "Jeanne", - 'Birthdate' => "1966-11-13", - 'CountryOfBirth' => 'FR', - 'Nationality' => 'FR', - 'center' => 'centerA', + 'lastName' => "Depardieu", + 'firstName' => "Jeanne", + 'birthdate' => "1966-11-13", + 'countryOfBirth' => 'FR', + 'nationality' => 'FR', + 'center' => 'Center A', 'maritalStatus' => 'ms_legalco' ), + [ + 'lastName' => 'Diallo', + 'firstName' => "Fatoumata Binta" + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Abdoulaye', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Diakite', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Mohamed', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Fatou', + ], + [ + 'lastName' => 'Diallo', + 'firstName' => 'Fanta', + ], + [ + 'lastName' => 'Bah', + 'firstName' => "Fatoumata Binta" + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Abdoulaye', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Diakite', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Mohamed', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Fatou', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Fanta', + ], + [ + 'lastName' => 'Bah', + 'firstName' => 'Gaston', + ], + [ + 'lastName' => 'Gaillot', + 'firstName' => 'Adèle', + ], ); - +/* private function addAccompanyingPeriods(Person $person, array $periods, ObjectManager $manager) { foreach ($periods as $period) { echo "adding new past Accompanying Period..\n"; - /** @var AccompanyingPeriod $accompanyingPeriod */ + /** @var AccompanyingPeriod $accompanyingPeriod $accompanyingPeriod = new AccompanyingPeriod(new \DateTime($period['from'])); $accompanyingPeriod ->setClosingDate(new \DateTime($period['to'])) @@ -464,4 +519,5 @@ class LoadPeople extends AbstractFixture implements OrderedFixtureInterface, Con $person->addAccompanyingPeriod($accompanyingPeriod); } } + */ } diff --git a/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php new file mode 100644 index 000000000..1a69d1319 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/MaritalStatusRepository.php @@ -0,0 +1,43 @@ +repository = $entityManager->getRepository(MaritalStatus::class); + } + public function find($id): ?MaritalStatus + { + return $this->repository->find($id); + } + + public function findAll(): array + { + return $this->repository->findAll(); + } + + public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array + { + return $this->repository->findBy($criteria, $orderBy, $limit, $offset); + } + + public function findOneBy(array $criteria): ?MaritalStatus + { + return $this->findOneBy($criteria); + } + + public function getClassName(): string + { + return MaritalStatus::class; + } +} diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php index f7dd055c6..75d7ad1e0 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php @@ -3,7 +3,7 @@ /* * Chill is a software for social workers * - * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, + * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, * , * * This program is free software: you can redistribute it and/or modify @@ -42,7 +42,7 @@ class PersonControllerCreateTest extends WebTestCase const BIRTHDATE_INPUT = "chill_personbundle_person_creation[birthdate]"; const CREATEDATE_INPUT = "chill_personbundle_person_creation[creation_date]"; const CENTER_INPUT = "chill_personbundle_person_creation[center]"; - + const LONG_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta. Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosq. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer nec odio. Praesent libero. Sed cursus ante dapibus diam. Sed nisi. Nulla quis sem at nibh elementum imperdiet. Duis sagittis ipsum. Praesent mauris. Fusce nec tellus sed augue semper porta.Mauris massa. Vestibulum lacinia arcu eget nulla. Class aptent taciti sociosq."; public function setUp(): void @@ -51,7 +51,7 @@ class PersonControllerCreateTest extends WebTestCase } /** - * + * * @param Form $creationForm */ private function fillAValidCreationForm( @@ -64,26 +64,26 @@ class PersonControllerCreateTest extends WebTestCase $creationForm->get(self::GENDER_INPUT)->select("man"); $date = new \DateTime('1947-02-01'); $creationForm->get(self::BIRTHDATE_INPUT)->setValue($date->format('d-m-Y')); - + return $creationForm; } - + /** * Test the "add a person" page : test that required elements are present - * + * * see https://redmine.champs-libres.coop/projects/chillperson/wiki/Test_plan_for_page_%22add_a_person%22 */ public function testAddAPersonPage() { - + $client = $this->client; $crawler = $client->request('GET', '/fr/person/new'); - - $this->assertTrue($client->getResponse()->isSuccessful(), + + $this->assertTrue($client->getResponse()->isSuccessful(), "The page is accessible at the URL /{_locale}/person/new"); $form = $crawler->selectButton("Ajouter la personne")->form(); - - $this->assertInstanceOf('Symfony\Component\DomCrawler\Form', $form, + + $this->assertInstanceOf('Symfony\Component\DomCrawler\Form', $form, 'The page contains a butto '); $this->assertTrue($form->has(self::FIRSTNAME_INPUT), 'The page contains a "firstname" input'); @@ -91,27 +91,27 @@ class PersonControllerCreateTest extends WebTestCase 'The page contains a "lastname" input'); $this->assertTrue($form->has(self::GENDER_INPUT), 'The page contains a "gender" input'); - $this->assertTrue($form->has(self::BIRTHDATE_INPUT), + $this->assertTrue($form->has(self::BIRTHDATE_INPUT), 'The page has a "date of birth" input'); - + $genderType = $form->get(self::GENDER_INPUT); - $this->assertEquals('radio', $genderType->getType(), + $this->assertEquals('radio', $genderType->getType(), 'The gender input has radio buttons'); $this->assertEquals(3, count($genderType->availableOptionValues()), 'The gender input has three options: man, women and undefined'); - $this->assertTrue(in_array('man', $genderType->availableOptionValues()), + $this->assertTrue(in_array('man', $genderType->availableOptionValues()), 'gender has "homme" option'); - $this->assertTrue(in_array('woman', $genderType->availableOptionValues()), + $this->assertTrue(in_array('woman', $genderType->availableOptionValues()), 'gender has "femme" option'); $this->assertFalse($genderType->hasValue(), 'The gender input is not checked'); - + return $form; } - - + + /** * Test the creation of a valid person. - * + * * @param Form $form * @return string The id of the created person * @depends testAddAPersonPage @@ -125,9 +125,9 @@ class PersonControllerCreateTest extends WebTestCase $this->assertTrue((bool)$client->getResponse()->isRedirect(), "a valid form redirect to url /{_locale}/person/{personId}/general/edit"); $client->followRedirect(); - + // visualize regexp here : http://jex.im/regulex/#!embed=false&flags=&re=%2Ffr%2Fperson%2F[1-9][0-9]*%2Fgeneral%2Fedit%24 - $this->assertRegExp('|/fr/person/[1-9][0-9]*/general/edit$|', + $this->assertRegExp('|/fr/person/[1-9][0-9]*/general/edit$|', $client->getHistory()->current()->getUri(), "a valid form redirect to url /{_locale}/person/{personId}/general/edit"); @@ -149,11 +149,11 @@ class PersonControllerCreateTest extends WebTestCase $client = $this->client; $client->request('GET', '/fr/person/'.$personId.'/general'); - $this->assertTrue($client->getResponse()->isSuccessful(), + $this->assertTrue($client->getResponse()->isSuccessful(), "The person view page is accessible at the URL" . "/{_locale}/person/{personID}/general"); } - + /** * test adding a person with a user with multi center * is valid @@ -161,70 +161,71 @@ class PersonControllerCreateTest extends WebTestCase public function testValidFormWithMultiCenterUser() { $client = $this->getClientAuthenticated('multi_center'); - + $crawler = $client->request('GET', '/fr/person/new'); - - $this->assertTrue($client->getResponse()->isSuccessful(), + + $this->assertTrue($client->getResponse()->isSuccessful(), "The page is accessible at the URL /{_locale}/person/new"); $form = $crawler->selectButton("Ajouter la personne")->form(); - - $this->fillAValidCreationForm($form, 'roger', 'rabbit'); - + + // create a very long name to avoid collision + $this->fillAValidCreationForm($form, 'Carmela Girdana Assuntamente Castalle', 'rabbit'); + $this->assertTrue($form->has(self::CENTER_INPUT), 'The page contains a "center" input'); $centerInput = $form->get(self::CENTER_INPUT); $availableValues = $centerInput->availableOptionValues(); $lastCenterInputValue = end($availableValues); $centerInput->setValue($lastCenterInputValue); - + $client->submit($form); - - $this->assertTrue($client->getResponse()->isRedirect(), + + $this->assertTrue($client->getResponse()->isRedirect(), "a valid form redirect to url /{_locale}/person/{personId}/general/edit"); $client->followRedirect(); - $this->assertRegExp('|/fr/person/[1-9][0-9]*/general/edit$|', - $client->getHistory()->current()->getUri(), + $this->assertRegExp('|/fr/person/[1-9][0-9]*/general/edit$|', + $client->getHistory()->current()->getUri(), "a valid form redirect to url /{_locale}/person/{personId}/general/edit"); - + } - + public function testReviewExistingDetectionInversedLastNameWithFirstName() { $client = $this->client; - + $crawler = $client->request('GET', '/fr/person/new'); - + //test the page is loaded before continuing $this->assertTrue($client->getResponse()->isSuccessful()); - + $form = $crawler->selectButton("Ajouter la personne")->form(); $form = $this->fillAValidCreationForm($form, 'Charline', 'dd'); $client->submit($form); - - $this->assertContains('Depardieu', $client->getCrawler()->text(), + + $this->assertContains('Depardieu', $client->getCrawler()->text(), "check that the page has detected the lastname of a person existing in database"); - + //inversion $form = $crawler->selectButton("Ajouter la personne")->form(); $form = $this->fillAValidCreationForm($form, 'dd', 'Charline'); $client->submit($form); - - $this->assertContains('Depardieu', $client->getCrawler()->text(), + + $this->assertContains('Depardieu', $client->getCrawler()->text(), "check that the page has detected the lastname of a person existing in database"); } - + public static function tearDownAfterClass() { static::bootKernel(); $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager'); - + //remove two people created during test $jesus = $em->getRepository('ChillPersonBundle:Person') ->findOneBy(array('firstName' => 'God')); if ($jesus !== NULL) { $em->remove($jesus); } - + $jesus2 = $em->getRepository('ChillPersonBundle:Person') ->findOneBy(array('firstName' => 'roger')); if ($jesus2 !== NULL) { diff --git a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php index 73a20ece7..214deefa2 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Search/PersonSearchTest.php @@ -33,165 +33,165 @@ class PersonSearchTest extends WebTestCase public function testExpected() { $client = $this->getAuthenticatedClient(); - + $crawler = $client->request('GET', '/fr/search', array( 'q' => '@person Depardieu' )); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testExpectedNamed() { $client = $this->getAuthenticatedClient(); - + $crawler = $client->request('GET', '/fr/search', array( 'q' => '@person Depardieu', 'name' => 'person_regular' )); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchByLastName() { $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu'); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchByFirstNameLower() { $crawler = $this->generateCrawlerForSearch('@person firstname:Gérard'); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchByFirstNamePartim() { $crawler = $this->generateCrawlerForSearch('@person firstname:Ger'); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testLastNameAccentued() { $crawlerSpecial = $this->generateCrawlerForSearch('@person lastname:manço'); - + $this->assertRegExp('/Manço/', $crawlerSpecial->filter('.list-with-period')->text()); - - + + $crawlerNoSpecial = $this->generateCrawlerForSearch('@person lastname:manco'); - + $this->assertRegExp('/Manço/', $crawlerNoSpecial->filter('.list-with-period')->text()); } - + public function testSearchByFirstName() { $crawler = $this->generateCrawlerForSearch('@person firstname:Jean'); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchByFirstNameLower2() { $crawler = $this->generateCrawlerForSearch('@person firstname:jean'); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchByFirstNamePartim2() { $crawler = $this->generateCrawlerForSearch('@person firstname:ean'); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchByFirstNameAccented() { $crawlerSpecial = $this->generateCrawlerForSearch('@person firstname:Gérard'); - + $this->assertRegExp('/Gérard/', $crawlerSpecial->filter('.list-with-period')->text()); - - + + $crawlerNoSpecial = $this->generateCrawlerForSearch('@person firstname:Gerard'); - + $this->assertRegExp('/Gérard/', $crawlerNoSpecial->filter('.list-with-period')->text()); } - + public function testSearchCombineLastnameAndNationality() { $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu nationality:RU'); - + $this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text()); //if this is a AND clause, Jean Depardieu should not appears $this->assertNotRegExp('/Jean/', $crawler->filter('.list-with-period')->text(), "assert clause firstname and nationality are AND"); } - + public function testSearchCombineLastnameAndFirstName() { $crawler = $this->generateCrawlerForSearch('@person lastname:Depardieu firstname:Jean'); - + $this->assertRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); //if this is a AND clause, Jean Depardieu should not appears $this->assertNotRegExp('/Gérard/', $crawler->filter('.list-with-period')->text(), "assert clause firstname and nationality are AND"); } - + public function testSearchBirthdate() { $crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27'); - + $this->assertRegExp('/Gérard/', $crawler->filter('.list-with-period')->text()); $this->assertRegExp('/Bart/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchCombineBirthdateAndLastName() { $crawler = $this->generateCrawlerForSearch('@person birthdate:1948-12-27 lastname:(Van Snick)'); - + $this->assertRegExp('/Bart/', $crawler->filter('.list-with-period')->text()); $this->assertNotRegExp('/Depardieu/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchCombineGenderAndLastName() { $crawler = $this->generateCrawlerForSearch('@person gender:woman lastname:(Depardieu)'); - + $this->assertRegExp('/Charline/', $crawler->filter('.list-with-period')->text()); $this->assertNotRegExp('/Gérard/', $crawler->filter('.list-with-period')->text()); } - + public function testSearchMultipleTrigramUseAndClauseInDefault() { $crawler = $this->generateCrawlerForSearch('@person cha dep'); - + $this->assertRegExp('/Charline/', $crawler->filter('.list-with-period')->text()); $this->assertNotRegExp('/Gérard/', $crawler->filter('.list-with-period')->text()); $this->assertNotRegExp('/Jean/', $crawler->filter('.list-with-period')->text()); } - + public function testDefaultAccented() { $crawlerSpecial = $this->generateCrawlerForSearch('@person manço'); - + $this->assertRegExp('/Manço/', $crawlerSpecial->filter('.list-with-period')->text()); - - + + $crawlerNoSpecial = $this->generateCrawlerForSearch('@person manco'); - + $this->assertRegExp('/Manço/', $crawlerNoSpecial->filter('.list-with-period')->text()); - + $crawlerSpecial = $this->generateCrawlerForSearch('@person Étienne'); - + $this->assertRegExp('/Étienne/', $crawlerSpecial->filter('.list-with-period')->text()); - - + + $crawlerNoSpecial = $this->generateCrawlerForSearch('@person etienne'); - + $this->assertRegExp('/Étienne/', $crawlerNoSpecial->filter('.list-with-period')->text()); } - + /** * test that person which a user cannot see are not displayed in results */ @@ -199,30 +199,29 @@ class PersonSearchTest extends WebTestCase { $crawlerCanSee = $this->generateCrawlerForSearch('Gérard', 'center a_social'); $crawlerCannotSee = $this->generateCrawlerForSearch('Gérard', 'center b_social'); - - $this->assertRegExp('/Gérard/', $crawlerCanSee->text(), - 'center a_social may see "Gérard" in center a'); - $this->assertRegExp('/Aucune personne ne correspond aux termes de recherche/', - $crawlerCannotSee->text(), - 'center b_social may not see any "Gérard" associated to center b'); - + + $this->assertRegExp('/Depardieu/', $crawlerCanSee->text(), + 'center a_social may see "Depardieu" in center a'); + $this->assertNotRegExp('/Depardieu/', $crawlerCannotSee->text(), + 'center b_social may see "Depardieu" in center b'); + } - + private function generateCrawlerForSearch($pattern, $username = 'center a_social') { $client = $this->getAuthenticatedClient($username); - + $crawler = $client->request('GET', '/fr/search', array( 'q' => $pattern, )); - + $this->assertTrue($client->getResponse()->isSuccessful()); - + return $crawler; } - + /** - * + * * @return \Symfony\Component\BrowserKit\Client */ private function getAuthenticatedClient($username = 'center a_social') diff --git a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php index 9b2a32c85..92be039be 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Timeline/TimelineAccompanyingPeriodTest.php @@ -27,7 +27,7 @@ use Doctrine\ORM\EntityManagerInterface; use Chill\MainBundle\Test\PrepareClientTrait; /** - * This class tests entries are shown for closing and opening + * This class tests entries are shown for closing and opening * periods in timeline. * * @author Julien Fastré @@ -40,22 +40,19 @@ class TimelineAccompanyingPeriodTest extends WebTestCase /** * @dataProvider provideDataPersonWithAccompanyingPeriod */ - public function testEntriesAreShown($personId) + public function testEntriesAreShown($personId) { $client = $this->getClientAuthenticated(); $crawler = $client->request('GET', "/en/person/{$personId}/timeline"); - + $this->assertTrue($client->getResponse()->isSuccessful(), "the timeline page loads sucessfully"); $this->assertGreaterThan(0, $crawler->filter('.timeline div')->count(), "the timeline page contains multiple div inside a .timeline element"); - $this->assertContains(" Une période d'accompagnement est ouverte", + $this->assertContains("est ouvert", $crawler->filter('.timeline')->text(), - "the text 'une période d'accompagnement a été ouverte' is present"); - $this->assertContains("Une periode d'accompagnement se clôture", - $crawler->Filter('.timeline')->text(), - "the text 'Une période d'accompagnement a été fermée' is present"); + "the text 'est ouvert' is present"); } public function provideDataPersonWithAccompanyingPeriod() @@ -71,8 +68,7 @@ class TimelineAccompanyingPeriodTest extends WebTestCase ->join('part.accompanyingPeriod', 'period') ->join('p.center', 'center') ->select('p.id') - ->where($qb->expr()->isNotNull('period.closingDate')) - ->andWhere($qb->expr()->eq('center.name', ':center')) + ->where($qb->expr()->eq('center.name', ':center')) ->setParameter('center', 'Center A') ->setMaxResults(1000) ->getQuery() @@ -86,5 +82,5 @@ class TimelineAccompanyingPeriodTest extends WebTestCase yield [ \array_pop($personIds)['id'] ]; } - + } diff --git a/tests/app b/tests/app index 614c9de4c..8839b431f 160000 --- a/tests/app +++ b/tests/app @@ -1 +1 @@ -Subproject commit 614c9de4c7e606e1f89f02b6236f605767f110cb +Subproject commit 8839b431f296733b792c788f2ef58e5ecd6419d3 From 097ad3a364efbb3db2113b89642b84cd532c7e59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Wed, 18 Aug 2021 09:56:48 +0200 Subject: [PATCH 2/9] fix return type of class --- .../AccompanyingPeriodWorkEvaluationDocument.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php index 2c7ca1099..f61955e1d 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php @@ -167,7 +167,7 @@ class AccompanyingPeriodWorkEvaluationDocument implements \Chill\MainBundle\Doct /** * @return DateTimeImmutable|null */ - public function getUpdatedAt(): ?DateTimeInterface + public function getUpdatedAt(): ?\DateTimeInterface { return $this->updatedAt; } From 28435940f1944053f92024585c5cc9a6cffdf553 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Tue, 17 Aug 2021 20:44:15 +0200 Subject: [PATCH 3/9] AccompanyingCourse api errorMsg --- .../public/vuejs/AccompanyingCourse/App.vue | 19 ++++++++++++++- .../public/vuejs/AccompanyingCourse/api.js | 23 ++++++++++--------- .../vuejs/AccompanyingCourse/js/i18n.js | 15 ++++++++++-- .../vuejs/AccompanyingCourse/store/index.js | 1 + 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index c2d7d3946..0297f2c8b 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -15,6 +15,12 @@ +
+

+ {{ error.sta }} {{ error.txt }}
+ {{ $t(error.msg) }} +

+
@@ -89,6 +96,16 @@ export default { } table { } + + &.errors { + //display: flex; + //position: sticky; + //bottom: 0.3em; + //z-index: 1000; + margin: 1em 0; + padding: 1em; + border-radius: 0; + } } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js index 676bbf7b7..52e253ac1 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js @@ -9,7 +9,7 @@ const getAccompanyingCourse = (id) => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -32,7 +32,8 @@ const patchAccompanyingCourse = (id, body) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + console.log(response); + throw { msg: 'Error while updating AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -47,7 +48,7 @@ const confirmAccompanyingCourse = (id) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while confirming AccompanyingPeriod Course.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -59,7 +60,7 @@ const getSocialIssues = () => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving Social Issues.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -83,7 +84,7 @@ const postParticipation = (id, payload, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while sending AccompanyingPeriod Course participation.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -109,7 +110,7 @@ const postRequestor = (id, payload, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while sending AccompanyingPeriod Course requestor', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -142,7 +143,7 @@ const postResource = (id, payload, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while sending AccompanyingPeriod Course resource.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -161,7 +162,7 @@ const postSocialIssue = (id, body, method) => { }) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while updating SocialIssue.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -170,7 +171,7 @@ const getUsers = () => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving users.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -179,7 +180,7 @@ const whoami = () => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while getting whoami.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); }; @@ -188,7 +189,7 @@ const getListOrigins = () => { return fetch(url) .then(response => { if (response.ok) { return response.json(); } - throw Error('Error with request resource response'); + throw { msg: 'Error while retriving origin\'s list.', sta: response.status, txt: response.statusText, err: new Error(), body: response.body }; }); } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index c690534ba..a620a384f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -70,7 +70,7 @@ const appMessages = { edit_temporary_address: "Modifier l'adresse temporaire", assign_course_address: "Désigner comme l'adresse du parcours", remove_button: "Enlever l'adresse", - temporary_address_must_be_changed: "Cette addresse est temporaire et doit être remplacée par celle d'un usager de référence.", + temporary_address_must_be_changed: "Cette addresse est temporaire et devrait être remplacée par celle d'un usager de référence.", sure: "Êtes-vous sûr ?", sure_description: "Voulez-vous faire de cette adresse l'adresse du parcours ?", ok: "Désigner comme adresse du parcours", @@ -103,7 +103,18 @@ const appMessages = { sure_description: "Une fois le changement confirmé, il n'est plus possible de le remettre à l'état de brouillon !", ok: "Confirmer le parcours" }, - + // catch errors + 'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.", + 'Error while retriving AccompanyingPeriod Course.': "Erreur du serveur lors du chargement du parcours d'accompagnement.", + 'Error while confirming AccompanyingPeriod Course.': "Erreur du serveur lors de la confirmation du parcours d'accompagnement.", + 'Error while retriving Social Issues.': "Erreur du serveur lors du chargement des problématique sociales.", + 'Error while sending AccompanyingPeriod Course participation.': "Erreur du serveur lors de l'envoi des infos d'un usager.", + 'Error while sending AccompanyingPeriod Course requestor': "Erreur du serveur lors de l'envoi des infos du demandeur.", + 'Error while sending AccompanyingPeriod Course resource.': "Erreur du serveur lors de l'envoi des infos d'un interlocuteur privilégié.", + 'Error while updating SocialIssue.': "Erreur du serveur lors de la mise à jour d'une problématique sociale.", + 'Error while retriving users.': "Erreur du serveur lors du chargement de la liste des travailleurs.", + 'Error while getting whoami.': "Erreur du serveur lors de la requête 'qui suis-je ?'", + 'Error while retriving origin\'s list.': "Erreur du serveur lors du chargement de la liste des origines de la demande.", } }; diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index ec2048f31..499b40439 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -28,6 +28,7 @@ let initPromise = getAccompanyingCourse(id) }, mutations: { catchError(state, error) { + console.log('### mutation: a new error have been catched and pushed in store !', error); state.errorMsg.push(error); }, removeParticipation(state, participation) { From 41fe95c80f1b049749a5c7c736d87d448c98f174 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 18 Aug 2021 10:03:12 +0200 Subject: [PATCH 4/9] fix display styles bugs --- .../ChillMainBundle/Resources/public/chill/scss/buttons.scss | 5 +++++ .../Resources/public/chill/scss/flex_table.scss | 1 + 2 files changed, 6 insertions(+) diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss index c2995e57d..fde222a23 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss @@ -111,3 +111,8 @@ $chill-theme-buttons: ( } } } + +// fix min-width on small pictos buttons +.btn-sm, .btn-group-sm > .btn { + min-width: 36px; +} diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss index c942bb709..259a23055 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/flex_table.scss @@ -51,6 +51,7 @@ div.flex-bloc { flex-grow: 0; flex-shrink: 1; flex-basis: auto; flex-direction: column; margin: 0; + hyphens: auto; div.item-row { flex-grow: 1; flex-shrink: 1; flex-basis: auto; From 53fe90adc38895bdcc3ad367ee9226c4454d08c1 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 18 Aug 2021 13:43:56 +0200 Subject: [PATCH 5/9] AccompanyingCourse: check if conditions of confirmation are met, or display alert --- .../AccompanyingCourse/components/Confirm.vue | 85 +++++++++++++------ .../vuejs/AccompanyingCourse/js/i18n.js | 10 ++- .../vuejs/AccompanyingCourse/store/index.js | 23 +++++ 3 files changed, 90 insertions(+), 28 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue index 13752f383..eaef2c875 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue @@ -3,24 +3,43 @@

{{ $t('confirm.title') }}

-
-

- {{ $t('confirm.text_draft') }} - {{ $t('course.step.draft') }} -

-

- {{ $t('confirm.text_active') }} - {{ $t('course.step.active') }} -

+

+ +
+
+ {{ $t('confirm.alert_validation') }} +
    +
  • + {{ $t(notValidMessages[k].msg) }} + + + +
    • +
+
+
    +
  • + +
    • +
+
+ +
+

+
    +
  • + +
    • +
+
-
    -
  • - -
    • -
@@ -43,6 +62,7 @@ - - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js index a620a384f..0a90fda47 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js @@ -97,10 +97,14 @@ const appMessages = { }, confirm: { title: "Confirmation", - text_draft: "Le parcours est actuellement à l'état de ", - text_active: "En validant cette étape, vous lui donnez le statut ", + text_draft: "Le parcours est actuellement à l'état de {0}.", + text_active: "En validant cette étape, vous lui donnez le statut {0}.", + alert_validation: "Certaines conditions ne sont pas remplies pour pouvoir confirmer le parcours :", + participation_not_valid: "sélectionnez au minimum 1 usager", + socialIssue_not_valid: "sélectionnez au minimum une problématique sociale", + location_not_valid: "indiquez au minimum une localisation temporaire du parcours", sure: "Êtes-vous sûr ?", - sure_description: "Une fois le changement confirmé, il n'est plus possible de le remettre à l'état de brouillon !", + sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !", ok: "Confirmer le parcours" }, // catch errors diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js index 499b40439..054a147a5 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js @@ -25,6 +25,29 @@ let initPromise = getAccompanyingCourse(id) errorMsg: [] }, getters: { + isParticipationValid(state) { + return state.accompanyingCourse.participations.length > 0; + }, + isSocialIssueValid(state) { + return state.accompanyingCourse.socialIssues.length > 0; + }, + isLocationValid(state) { + return state.accompanyingCourse.location !== null; + }, + validationKeys(state, getters) { + let keys = []; + if (!getters.isParticipationValid) { keys.push('participation'); } + if (!getters.isSocialIssueValid) { keys.push('socialIssue'); } + if (!getters.isLocationValid) { keys.push('location'); } + //console.log('getter keys', keys); + return keys; + }, + isValidToBeConfirmed(state, getters) { + if (getters.validationKeys.length === 0) { + return true; + } + return false; + } }, mutations: { catchError(state, error) { From 403922c6312989cc0d6ead4955590169281a7680 Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 18 Aug 2021 17:10:37 +0200 Subject: [PATCH 6/9] AccompanyingCourse, change blocs order (location in second position) --- .../Resources/public/vuejs/AccompanyingCourse/App.vue | 2 +- .../vuejs/AccompanyingCourse/components/Confirm.vue | 8 ++++---- .../AccompanyingCourse/components/CourseLocation.vue | 2 +- .../vuejs/AccompanyingCourse/components/OriginDemand.vue | 2 +- .../vuejs/AccompanyingCourse/components/Requestor.vue | 2 +- .../vuejs/AccompanyingCourse/components/SocialIssue.vue | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue index 0297f2c8b..e8d7dd192 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue @@ -6,10 +6,10 @@

{{ $t('course.title.active') }}

+ - diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue index eaef2c875..44479831c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue @@ -81,12 +81,12 @@ export default { msg: 'confirm.participation_not_valid', anchor: '#section-10' }, - socialIssue: { - msg: 'confirm.socialIssue_not_valid', - anchor: '#section-40' - }, location: { msg: 'confirm.location_not_valid', + anchor: '#section-20' // + }, + socialIssue: { + msg: 'confirm.socialIssue_not_valid', anchor: '#section-50' } } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue index b9a4e111d..2297f8e5a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue @@ -1,6 +1,6 @@