From c205bbddd3cca9fc3f37c184bebbf9d82aaad0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 8 Mar 2021 10:26:12 +0100 Subject: [PATCH 01/33] writing test to reproduce bug --- Tests/Entity/PersonTest.php | 44 +++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/Tests/Entity/PersonTest.php b/Tests/Entity/PersonTest.php index 139c2200b..cffa0e731 100644 --- a/Tests/Entity/PersonTest.php +++ b/Tests/Entity/PersonTest.php @@ -24,6 +24,7 @@ namespace Chill\PersonBundle\Tests\Entity; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\MainBundle\Entity\Address; /** * Unit tests for the person Entity @@ -151,4 +152,47 @@ class PersonTest extends \PHPUnit\Framework\TestCase $this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD); } + + public function testGetLastAddress() + { + $date0 = (\DateTime::createFromFormat('Y-m-d', '2021-02-05'))->settime(0,0); + $date1 = (\DateTime::createFromFormat('Y-m-d', '2021-03-05'))->settime(0,0); + $date2 = (\DateTime::createFromFormat('Y-m-d', '2021-04-05'))->settime(0,0); + $date3 = (\DateTime::createFromFormat('Y-m-d', '2021-05-05'))->settime(0,0); + $date4 = (\DateTime::createFromFormat('Y-m-d', '2021-06-05'))->settime(0,0); + $date5 = (\DateTime::createFromFormat('Y-m-d', '2021-07-05'))->settime(0,0); + $date6 = (\DateTime::createFromFormat('Y-m-d', '2021-08-05'))->settime(0,0); + $p = new Person($date1); + + $this->assertNull($p->getLastAddress($date1)); + + // add some address + $add1 = (new Address())->setValidFrom($date1); + // no address with date 2 + $add3 = (new Address())->setValidFrom($date3); + // no address with date 4 + $add5 = (new Address())->setValidFrom($date5); + + $p->addAddress($add1); + + // test that, if only one address, that does work: + $this->assertSame($add1, $p->getLastAddress($date1)); + $this->assertSame($add1, $p->getLastAddress($date2)); + $this->assertSame($add1, $p->getLastAddress()); + + // adress before the date should not work + $this->assertNull($p->getLastAddress($date0)); + + // add addresses + $p->addAddress($add3); + $p->addAddress($add5); + + // test retrieval of address + $this->assertSame($add1, $p->getLastAddress($date2)); + //$this->assertSame($add3, $p->getLastAddress($date3)); + dump($p->getLastAddress($date4), $add3); + $this->assertSame($add3, $p->getLastAddress($date4)); + //$this->assertSame($add5, $p->getLastAddress($date5)); + $this->assertSame($add5, $p->getLastAddress($date6)); + } } From 03601b97070e8ea1b65a01a9889d0119f20560c7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 22 Mar 2021 12:32:29 +0100 Subject: [PATCH 02/33] Update Person::getLastAddress() based on feedback. --- Entity/AccompanyingPeriod.php | 109 ++++++++------------ Entity/Person.php | 52 +++++----- Tests/Entity/PersonTest.php | 183 +++++++++++++++++----------------- 3 files changed, 165 insertions(+), 179 deletions(-) diff --git a/Entity/AccompanyingPeriod.php b/Entity/AccompanyingPeriod.php index debc0a18d..2992ee8e0 100644 --- a/Entity/AccompanyingPeriod.php +++ b/Entity/AccompanyingPeriod.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 @@ -25,6 +25,7 @@ namespace Chill\PersonBundle\Entity; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Chill\MainBundle\Entity\User; +use DateTimeImmutable; /** * AccompanyingPeriod @@ -34,111 +35,89 @@ class AccompanyingPeriod /** @var integer */ private $id; - /** @var \DateTime */ - private $openingDate; + private DateTimeImmutable $openingDate; - /** @var \DateTime */ - private $closingDate; + private ?DateTimeImmutable $closingDate = null; /** @var string */ private $remark = ''; /** @var \Chill\PersonBundle\Entity\Person */ private $person; - + /** @var AccompanyingPeriod\ClosingMotive */ private $closingMotive = null; - + /** * The user making the accompanying * * @var User */ private $user; - + /** - * - * @param \DateTime $dateOpening + * + * @param \DateTimeImmutable $dateOpening * @uses AccompanyingPeriod::setClosingDate() */ - public function __construct(\DateTime $dateOpening) { + public function __construct(\DateTimeImmutable $dateOpening) { $this->setOpeningDate($dateOpening); } /** * Get id * - * @return integer + * @return integer */ public function getId() { return $this->id; } - /** - * Set openingDate - * - * @param \DateTime $dateOpening - * @return AccompanyingPeriod - */ - public function setOpeningDate($openingDate) + public function setOpeningDate(DateTimeImmutable $openingDate): self { $this->openingDate = $openingDate; - + return $this; } - /** - * Get openingDate - * - * @return \DateTime - */ - public function getOpeningDate() + public function getOpeningDate(): DateTimeImmutable { return $this->openingDate; } /** * Set closingDate - * - * For closing a Person file, you should use Person::setClosed instead. * - * @param \DateTime $dateClosing - * @return AccompanyingPeriod - * + * For closing a Person file, you should use Person::setClosed instead. */ - public function setClosingDate($closingDate) + public function setClosingDate(DateTimeImmutable $closingDate): self { $this->closingDate = $closingDate; - + return $this; } - /** - * Get closingDate - * - * @return \DateTime - */ - public function getClosingDate() + public function getClosingDate(): ?DateTimeImmutable { return $this->closingDate; } - + /** - * + * * @return boolean */ - public function isOpen(): bool + public function isOpen(): bool { - if ($this->getOpeningDate() > new \DateTime('now')) { + if ($this->getOpeningDate() > new \DateTimeImmutable('now')) { return false; } if ($this->getClosingDate() === null) { return true; - } else { - return false; } + + return false; } /** @@ -152,16 +131,16 @@ class AccompanyingPeriod if ($remark === null) { $remark = ''; } - + $this->remark = $remark; - + return $this; } /** * Get remark * - * @return string + * @return string */ public function getRemark() { @@ -170,7 +149,7 @@ class AccompanyingPeriod /** * Set person. - * + * * For consistency, you should use Person::addAccompanyingPeriod instead. * * @param \Chill\PersonBundle\Entity\Person $person @@ -180,20 +159,20 @@ class AccompanyingPeriod public function setPerson(\Chill\PersonBundle\Entity\Person $person = null) { $this->person = $person; - + return $this; } /** * Get person * - * @return \Chill\PersonBundle\Entity\Person + * @return \Chill\PersonBundle\Entity\Person */ public function getPerson() { return $this->person; } - + public function getClosingMotive() { return $this->closingMotive; @@ -204,13 +183,13 @@ class AccompanyingPeriod $this->closingMotive = $closingMotive; return $this; } - + /** * If the period can be reopened. - * - * This function test if the period is closed and if the period is the last + * + * This function test if the period is closed and if the period is the last * for the associated person - * + * * @return boolean */ public function canBeReOpened() @@ -218,12 +197,12 @@ class AccompanyingPeriod if ($this->isOpen() === true) { return false; } - + $periods = $this->getPerson()->getAccompanyingPeriodsOrdered(); - + return end($periods) === $this; } - + public function reOpen() { $this->setClosingDate(null); @@ -235,29 +214,29 @@ class AccompanyingPeriod if ($this->isOpen()) { return; } - + if (! $this->isClosingAfterOpening()) { $context->buildViolation('The date of closing is before the date of opening') ->atPath('dateClosing') ->addViolation(); } } - + /** * Returns true if the closing date is after the opening date. - * + * * @return boolean */ public function isClosingAfterOpening() { $diff = $this->getOpeningDate()->diff($this->getClosingDate()); - + if ($diff->invert === 0) { return true; } else { return false; } } - + function getUser(): ?User { return $this->user; @@ -266,7 +245,7 @@ class AccompanyingPeriod function setUser(User $user): self { $this->user = $user; - + return $this; } diff --git a/Entity/Person.php b/Entity/Person.php index 9674d8b76..cc581d12d 100644 --- a/Entity/Person.php +++ b/Entity/Person.php @@ -28,7 +28,10 @@ use Chill\PersonBundle\Entity\MaritalStatus; use Doctrine\Common\Collections\ArrayCollection; use Chill\MainBundle\Entity\HasCenterInterface; use Chill\MainBundle\Entity\Address; +use DateTime; +use DateTimeImmutable; use Doctrine\Common\Collections\Criteria; +use Symfony\Component\VarDumper\VarDumper; /** * Person @@ -42,7 +45,7 @@ class Person implements HasCenterInterface { /** @var string The person's last name */ private $lastName; - + /** * * @var \Doctrine\Common\Collections\Collection @@ -119,20 +122,20 @@ class Person implements HasCenterInterface { * @var \Doctrine\Common\Collections\Collection */ private $addresses; - + /** * @var string */ private $fullnameCanonical; - - public function __construct(\DateTime $opening = null) { + + public function __construct(\DateTimeImmutable $opening = null) { $this->accompanyingPeriods = new ArrayCollection(); $this->spokenLanguages = new ArrayCollection(); $this->addresses = new ArrayCollection(); $this->altNames = new ArrayCollection(); if ($opening === null) { - $opening = new \DateTime(); + $opening = new \DateTimeImmutable(); } $this->open(new AccompanyingPeriod($opening)); @@ -331,7 +334,7 @@ class Person implements HasCenterInterface { { return $this->lastName; } - + public function getAltNames(): \Doctrine\Common\Collections\Collection { return $this->altNames; @@ -340,7 +343,7 @@ class Person implements HasCenterInterface { public function setAltNames(\Doctrine\Common\Collections\Collection $altNames) { $this->altNames = $altNames; - + return $this; } @@ -350,20 +353,20 @@ class Person implements HasCenterInterface { $this->altNames->add($altName); $altName->setPerson($this); } - + return $this; } - - public function removeAltName(PersonAltName $altName) + + public function removeAltName(PersonAltName $altName) { if ($this->altNames->contains($altName)) { $altName->setPerson(null); $this->altNames->removeElement($altName); } - + return $this; } - + /** * Set birthdate * @@ -745,27 +748,28 @@ class Person implements HasCenterInterface { * By default, the addresses are ordered by date, descending (the most * recent first) * - * @return \Chill\MainBundle\Entity\Address[] + * @return ArrayCollection */ - public function getAddresses() + public function getAddresses(): ArrayCollection { return $this->addresses; } - public function getLastAddress(\DateTime $date = null) + public function getLastAddress(?DateTimeImmutable $from = null): ?Address { - if ($date === null) { - $date = new \DateTime('now'); - } + $from ??= new DateTimeImmutable('now'); - $addresses = $this->getAddresses(); + $addressesIterator = $this->getAddresses() + ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $from) + ->getIterator(); - if ($addresses == null) { + $addressesIterator->uasort( + static fn (Address $left, Address $right): int => $right->getValidFrom() <=> $left->getValidFrom() + ); - return null; - } - - return $addresses->first(); + return [] === ($addresses = iterator_to_array($addressesIterator)) ? + null : + current($addresses); } /** diff --git a/Tests/Entity/PersonTest.php b/Tests/Entity/PersonTest.php index cffa0e731..a8623aeaa 100644 --- a/Tests/Entity/PersonTest.php +++ b/Tests/Entity/PersonTest.php @@ -2,8 +2,8 @@ /* * 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 @@ -25,6 +25,10 @@ namespace Chill\PersonBundle\Tests\Entity; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\MainBundle\Entity\Address; +use DateInterval; +use DateTime; +use DateTimeImmutable; +use Generator; /** * Unit tests for the person Entity @@ -32,167 +36,166 @@ use Chill\MainBundle\Entity\Address; class PersonTest extends \PHPUnit\Framework\TestCase { /** - * Test the creation of an accompanying, its closure and the access to + * Test the creation of an accompanying, its closure and the access to * the current accompaniying period via the getCurrentAccompanyingPeriod * function. */ public function testGetCurrentAccompanyingPeriod() { - $d = new \DateTime('yesterday'); + $d = new \DateTimeImmutable('yesterday'); $p = new Person($d); - + $period = $p->getCurrentAccompanyingPeriod(); - + $this->assertInstanceOf('Chill\PersonBundle\Entity\AccompanyingPeriod', $period); $this->assertTrue($period->isOpen()); $this->assertEquals($d, $period->getOpeningDate()); - + //close and test - $period->setClosingDate(new \DateTime('tomorrow')); - + $period->setClosingDate(new \DateTimeImmutable('tomorrow')); + $shouldBeNull = $p->getCurrentAccompanyingPeriod(); $this->assertNull($shouldBeNull); } - + /** * Test if the getAccompanyingPeriodsOrdered function return a list of * periods ordered ascendency. */ public function testAccompanyingPeriodOrderWithUnorderedAccompanyingPeriod() - { - $d = new \DateTime("2013/2/1"); + { + $d = new \DateTimeImmutable("2013/2/1"); $p = new Person($d); - - $e = new \DateTime("2013/3/1"); + + $e = new \DateTimeImmutable("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - - $f = new \DateTime("2013/1/1"); + + $f = new \DateTimeImmutable("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - - $g = new \DateTime("2013/4/1"); + + $g = new \DateTimeImmutable("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); - + $r = $p->getAccompanyingPeriodsOrdered(); - + $date = $r[0]->getOpeningDate()->format('Y-m-d'); - + $this->assertEquals($date, '2013-01-01'); } - + /** * Test if the getAccompanyingPeriodsOrdered function, for periods * starting at the same time order regarding to the closing date. */ public function testAccompanyingPeriodOrderSameDateOpening() { - $d = new \DateTime("2013/2/1"); + $d = new \DateTimeImmutable("2013/2/1"); $p = new Person($d); - - $g = new \DateTime("2013/4/1"); + + $g = new \DateTimeImmutable("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); - - $f = new \DateTime("2013/2/1"); + + $f = new \DateTimeImmutable("2013/2/1"); $p->open(new AccompanyingPeriod($f)); - - $e = new \DateTime("2013/3/1"); + + $e = new \DateTimeImmutable("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); $r = $p->getAccompanyingPeriodsOrdered(); - + $date = $r[0]->getClosingDate()->format('Y-m-d'); - + $this->assertEquals($date, '2013-03-01'); } - + /** * Test if the function checkAccompanyingPeriodIsNotCovering returns * the good constant when two periods are collapsing : a period * is covering another one : start_1 < start_2 & end_2 < end_1 */ public function testDateCoveringWithCoveringAccompanyingPeriod() { - $d = new \DateTime("2013/2/1"); + $d = new \DateTimeImmutable("2013/2/1"); $p = new Person($d); - - $e = new \DateTime("2013/3/1"); + + $e = new \DateTimeImmutable("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - - $f = new \DateTime("2013/1/1"); + + $f = new \DateTimeImmutable("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - - $g = new \DateTime("2013/4/1"); + + $g = new \DateTimeImmutable("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); - + $r = $p->checkAccompanyingPeriodsAreNotCollapsing(); - + $this->assertEquals($r['result'], Person::ERROR_PERIODS_ARE_COLLAPSING); } - + /** * Test if the function checkAccompanyingPeriodIsNotCovering returns * the good constant when two periods are collapsing : a period is open * before an existing period */ public function testNotOpenAFileReOpenedLater() { - $d = new \DateTime("2013/2/1"); + $d = new \DateTimeImmutable("2013/2/1"); $p = new Person($d); - - $e = new \DateTime("2013/3/1"); + + $e = new \DateTimeImmutable("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - - $f = new \DateTime("2013/1/1"); + + $f = new \DateTimeImmutable("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - + $r = $p->checkAccompanyingPeriodsAreNotCollapsing(); - + $this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD); } - - public function testGetLastAddress() + + public function dateProvider(): Generator { - $date0 = (\DateTime::createFromFormat('Y-m-d', '2021-02-05'))->settime(0,0); - $date1 = (\DateTime::createFromFormat('Y-m-d', '2021-03-05'))->settime(0,0); - $date2 = (\DateTime::createFromFormat('Y-m-d', '2021-04-05'))->settime(0,0); - $date3 = (\DateTime::createFromFormat('Y-m-d', '2021-05-05'))->settime(0,0); - $date4 = (\DateTime::createFromFormat('Y-m-d', '2021-06-05'))->settime(0,0); - $date5 = (\DateTime::createFromFormat('Y-m-d', '2021-07-05'))->settime(0,0); - $date6 = (\DateTime::createFromFormat('Y-m-d', '2021-08-05'))->settime(0,0); - $p = new Person($date1); - - $this->assertNull($p->getLastAddress($date1)); - - // add some address - $add1 = (new Address())->setValidFrom($date1); - // no address with date 2 - $add3 = (new Address())->setValidFrom($date3); - // no address with date 4 - $add5 = (new Address())->setValidFrom($date5); - - $p->addAddress($add1); - - // test that, if only one address, that does work: - $this->assertSame($add1, $p->getLastAddress($date1)); - $this->assertSame($add1, $p->getLastAddress($date2)); - $this->assertSame($add1, $p->getLastAddress()); - - // adress before the date should not work - $this->assertNull($p->getLastAddress($date0)); - - // add addresses - $p->addAddress($add3); - $p->addAddress($add5); - - // test retrieval of address - $this->assertSame($add1, $p->getLastAddress($date2)); - //$this->assertSame($add3, $p->getLastAddress($date3)); - dump($p->getLastAddress($date4), $add3); - $this->assertSame($add3, $p->getLastAddress($date4)); - //$this->assertSame($add5, $p->getLastAddress($date5)); - $this->assertSame($add5, $p->getLastAddress($date6)); + yield [(DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-05'))->settime(0, 0)]; + yield [(DateTimeImmutable::createFromFormat('Y-m-d', '2021-02-05'))->settime(0, 0)]; + yield [(DateTimeImmutable::createFromFormat('Y-m-d', '2021-03-05'))->settime(0, 0)]; + } + + /** + * @dataProvider dateProvider + */ + public function testGetLastAddress(DateTimeImmutable $date) + { + $p = new Person($date); + + // Make sure that there is no last address. + $this->assertNull($p->getLastAddress()); + + // Take an arbitrary date before the $date in parameter. + $addressDate = $date->sub(new DateInterval('PT180M')); + + // 1. Smoke test: Test that the first address added is the last one. + $address1 = (new Address())->setValidFrom($addressDate); + $p->addAddress($address1); + + $this->assertCount(1, $p->getAddresses()); + $this->assertSame($address1, $p->getLastAddress()); + + // 2. Add an older address, which should not be the last address. + $address2 = (new Address())->setValidFrom($addressDate->sub(new DateInterval('PT30M'))); + $p->addAddress($address2); + + $this->assertCount(2, $p->getAddresses()); + $this->assertSame($address1, $p->getLastAddress()); + + // 3. Add a newer address, which should be the last address. + $address3 = (new Address())->setValidFrom($addressDate->add(new DateInterval('PT30M'))); + $p->addAddress($address3); + + $this->assertCount(3, $p->getAddresses()); + $this->assertSame($address3, $p->getLastAddress()); } } From 777fb258607046bd9ba897ebefb380c731566cfd Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 1 Apr 2021 12:04:35 +0200 Subject: [PATCH 03/33] tests: Add missing test based on review's feedback. --- Tests/Entity/PersonTest.php | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Tests/Entity/PersonTest.php b/Tests/Entity/PersonTest.php index a8623aeaa..960ab169a 100644 --- a/Tests/Entity/PersonTest.php +++ b/Tests/Entity/PersonTest.php @@ -172,7 +172,7 @@ class PersonTest extends \PHPUnit\Framework\TestCase $p = new Person($date); // Make sure that there is no last address. - $this->assertNull($p->getLastAddress()); + $this::assertNull($p->getLastAddress()); // Take an arbitrary date before the $date in parameter. $addressDate = $date->sub(new DateInterval('PT180M')); @@ -181,21 +181,29 @@ class PersonTest extends \PHPUnit\Framework\TestCase $address1 = (new Address())->setValidFrom($addressDate); $p->addAddress($address1); - $this->assertCount(1, $p->getAddresses()); - $this->assertSame($address1, $p->getLastAddress()); + $this::assertCount(1, $p->getAddresses()); + $this::assertSame($address1, $p->getLastAddress()); // 2. Add an older address, which should not be the last address. - $address2 = (new Address())->setValidFrom($addressDate->sub(new DateInterval('PT30M'))); + $addressDate2 = $addressDate->sub(new DateInterval('PT30M')); + $address2 = (new Address())->setValidFrom($addressDate2); $p->addAddress($address2); - $this->assertCount(2, $p->getAddresses()); - $this->assertSame($address1, $p->getLastAddress()); + $this::assertCount(2, $p->getAddresses()); + $this::assertSame($address1, $p->getLastAddress()); // 3. Add a newer address, which should be the last address. - $address3 = (new Address())->setValidFrom($addressDate->add(new DateInterval('PT30M'))); + $addressDate3 = $addressDate->add(new DateInterval('PT30M')); + $address3 = (new Address())->setValidFrom($addressDate3); $p->addAddress($address3); - $this->assertCount(3, $p->getAddresses()); - $this->assertSame($address3, $p->getLastAddress()); + $this::assertCount(3, $p->getAddresses()); + $this::assertSame($address3, $p->getLastAddress()); + + // 4. Get the last address from a specific date. + $this::assertSame($address1, $p->getLastAddress($addressDate)); + $this::assertSame($address2, $p->getLastAddress($addressDate2)); + $this::assertSame($address3, $p->getLastAddress($addressDate3)); } + } From 48e2d2ceaba933b6efc906ce421378a76c4c1050 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 2 Apr 2021 10:44:21 +0200 Subject: [PATCH 04/33] Do not use DateTimeImmutable. --- Entity/AccompanyingPeriod.php | 39 +++++++++++++++------- Entity/Person.php | 14 ++++---- Tests/Entity/PersonTest.php | 61 +++++++++++++++++------------------ 3 files changed, 64 insertions(+), 50 deletions(-) diff --git a/Entity/AccompanyingPeriod.php b/Entity/AccompanyingPeriod.php index 2992ee8e0..36ce685e1 100644 --- a/Entity/AccompanyingPeriod.php +++ b/Entity/AccompanyingPeriod.php @@ -25,7 +25,6 @@ namespace Chill\PersonBundle\Entity; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Chill\MainBundle\Entity\User; -use DateTimeImmutable; /** * AccompanyingPeriod @@ -35,9 +34,11 @@ class AccompanyingPeriod /** @var integer */ private $id; - private DateTimeImmutable $openingDate; + /** @var \DateTime */ + private $openingDate; - private ?DateTimeImmutable $closingDate = null; + /** @var \DateTime */ + private $closingDate; /** @var string */ private $remark = ''; @@ -56,11 +57,11 @@ class AccompanyingPeriod private $user; /** - * - * @param \DateTimeImmutable $dateOpening + * + * @param \DateTime $dateOpening * @uses AccompanyingPeriod::setClosingDate() */ - public function __construct(\DateTimeImmutable $dateOpening) { + public function __construct(\DateTime $dateOpening) { $this->setOpeningDate($dateOpening); } @@ -74,14 +75,25 @@ class AccompanyingPeriod return $this->id; } - public function setOpeningDate(DateTimeImmutable $openingDate): self + /** + * Set openingDate + * + * @param \DateTime $dateOpening + * @return AccompanyingPeriod + */ + public function setOpeningDate($openingDate) { $this->openingDate = $openingDate; return $this; } - public function getOpeningDate(): DateTimeImmutable + /** + * Get openingDate + * + * @return \DateTime + */ + public function getOpeningDate() { return $this->openingDate; } @@ -91,14 +103,19 @@ class AccompanyingPeriod * * For closing a Person file, you should use Person::setClosed instead. */ - public function setClosingDate(DateTimeImmutable $closingDate): self + public function setClosingDate($closingDate) { $this->closingDate = $closingDate; return $this; } - public function getClosingDate(): ?DateTimeImmutable + /** + * Get closingDate + * + * @return \DateTime + */ + public function getClosingDate() { return $this->closingDate; } @@ -109,7 +126,7 @@ class AccompanyingPeriod */ public function isOpen(): bool { - if ($this->getOpeningDate() > new \DateTimeImmutable('now')) { + if ($this->getOpeningDate() > new \DateTime('now')) { return false; } diff --git a/Entity/Person.php b/Entity/Person.php index cc581d12d..7a9313ecb 100644 --- a/Entity/Person.php +++ b/Entity/Person.php @@ -22,6 +22,7 @@ namespace Chill\PersonBundle\Entity; * along with this program. If not, see . */ +use ArrayIterator; use Symfony\Component\Validator\Context\ExecutionContextInterface; use Chill\MainBundle\Entity\Country; use Chill\PersonBundle\Entity\MaritalStatus; @@ -29,9 +30,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Chill\MainBundle\Entity\HasCenterInterface; use Chill\MainBundle\Entity\Address; use DateTime; -use DateTimeImmutable; use Doctrine\Common\Collections\Criteria; -use Symfony\Component\VarDumper\VarDumper; /** * Person @@ -128,14 +127,14 @@ class Person implements HasCenterInterface { */ private $fullnameCanonical; - public function __construct(\DateTimeImmutable $opening = null) { + public function __construct(\DateTime $opening = null) { $this->accompanyingPeriods = new ArrayCollection(); $this->spokenLanguages = new ArrayCollection(); $this->addresses = new ArrayCollection(); $this->altNames = new ArrayCollection(); if ($opening === null) { - $opening = new \DateTimeImmutable(); + $opening = new \DateTime(); } $this->open(new AccompanyingPeriod($opening)); @@ -747,18 +746,17 @@ class Person implements HasCenterInterface { /** * By default, the addresses are ordered by date, descending (the most * recent first) - * - * @return ArrayCollection */ public function getAddresses(): ArrayCollection { return $this->addresses; } - public function getLastAddress(?DateTimeImmutable $from = null): ?Address + public function getLastAddress(DateTime $from = null) { - $from ??= new DateTimeImmutable('now'); + $from ??= new DateTime('now'); + /** @var ArrayIterator $addressesIterator */ $addressesIterator = $this->getAddresses() ->filter(static fn (Address $address): bool => $address->getValidFrom() <= $from) ->getIterator(); diff --git a/Tests/Entity/PersonTest.php b/Tests/Entity/PersonTest.php index 960ab169a..a32823d20 100644 --- a/Tests/Entity/PersonTest.php +++ b/Tests/Entity/PersonTest.php @@ -27,7 +27,6 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\MainBundle\Entity\Address; use DateInterval; use DateTime; -use DateTimeImmutable; use Generator; /** @@ -42,7 +41,7 @@ class PersonTest extends \PHPUnit\Framework\TestCase */ public function testGetCurrentAccompanyingPeriod() { - $d = new \DateTimeImmutable('yesterday'); + $d = new \DateTime('yesterday'); $p = new Person($d); $period = $p->getCurrentAccompanyingPeriod(); @@ -52,7 +51,7 @@ class PersonTest extends \PHPUnit\Framework\TestCase $this->assertEquals($d, $period->getOpeningDate()); //close and test - $period->setClosingDate(new \DateTimeImmutable('tomorrow')); + $period->setClosingDate(new \DateTime('tomorrow')); $shouldBeNull = $p->getCurrentAccompanyingPeriod(); $this->assertNull($shouldBeNull); @@ -64,17 +63,17 @@ class PersonTest extends \PHPUnit\Framework\TestCase */ public function testAccompanyingPeriodOrderWithUnorderedAccompanyingPeriod() { - $d = new \DateTimeImmutable("2013/2/1"); + $d = new \DateTime("2013/2/1"); $p = new Person($d); - $e = new \DateTimeImmutable("2013/3/1"); + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - $f = new \DateTimeImmutable("2013/1/1"); + $f = new \DateTime("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - $g = new \DateTimeImmutable("2013/4/1"); + $g = new \DateTime("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); @@ -90,17 +89,17 @@ class PersonTest extends \PHPUnit\Framework\TestCase * starting at the same time order regarding to the closing date. */ public function testAccompanyingPeriodOrderSameDateOpening() { - $d = new \DateTimeImmutable("2013/2/1"); + $d = new \DateTime("2013/2/1"); $p = new Person($d); - $g = new \DateTimeImmutable("2013/4/1"); + $g = new \DateTime("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); - $f = new \DateTimeImmutable("2013/2/1"); + $f = new \DateTime("2013/2/1"); $p->open(new AccompanyingPeriod($f)); - $e = new \DateTimeImmutable("2013/3/1"); + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); @@ -117,17 +116,17 @@ class PersonTest extends \PHPUnit\Framework\TestCase * is covering another one : start_1 < start_2 & end_2 < end_1 */ public function testDateCoveringWithCoveringAccompanyingPeriod() { - $d = new \DateTimeImmutable("2013/2/1"); + $d = new \DateTime("2013/2/1"); $p = new Person($d); - $e = new \DateTimeImmutable("2013/3/1"); + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - $f = new \DateTimeImmutable("2013/1/1"); + $f = new \DateTime("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - $g = new \DateTimeImmutable("2013/4/1"); + $g = new \DateTime("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); @@ -142,14 +141,14 @@ class PersonTest extends \PHPUnit\Framework\TestCase * before an existing period */ public function testNotOpenAFileReOpenedLater() { - $d = new \DateTimeImmutable("2013/2/1"); + $d = new \DateTime("2013/2/1"); $p = new Person($d); - $e = new \DateTimeImmutable("2013/3/1"); + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - $f = new \DateTimeImmutable("2013/1/1"); + $f = new \DateTime("2013/1/1"); $p->open(new AccompanyingPeriod($f)); $r = $p->checkAccompanyingPeriodsAreNotCollapsing(); @@ -159,15 +158,15 @@ class PersonTest extends \PHPUnit\Framework\TestCase public function dateProvider(): Generator { - yield [(DateTimeImmutable::createFromFormat('Y-m-d', '2021-01-05'))->settime(0, 0)]; - yield [(DateTimeImmutable::createFromFormat('Y-m-d', '2021-02-05'))->settime(0, 0)]; - yield [(DateTimeImmutable::createFromFormat('Y-m-d', '2021-03-05'))->settime(0, 0)]; + yield [(DateTime::createFromFormat('Y-m-d', '2021-01-05'))->settime(0, 0)]; + yield [(DateTime::createFromFormat('Y-m-d', '2021-02-05'))->settime(0, 0)]; + yield [(DateTime::createFromFormat('Y-m-d', '2021-03-05'))->settime(0, 0)]; } /** * @dataProvider dateProvider */ - public function testGetLastAddress(DateTimeImmutable $date) + public function testGetLastAddress(DateTime $date) { $p = new Person($date); @@ -175,35 +174,35 @@ class PersonTest extends \PHPUnit\Framework\TestCase $this::assertNull($p->getLastAddress()); // Take an arbitrary date before the $date in parameter. - $addressDate = $date->sub(new DateInterval('PT180M')); + $addressDate = clone $date; // 1. Smoke test: Test that the first address added is the last one. - $address1 = (new Address())->setValidFrom($addressDate); + $address1 = (new Address())->setValidFrom($addressDate->sub(new DateInterval('PT180M'))); $p->addAddress($address1); $this::assertCount(1, $p->getAddresses()); $this::assertSame($address1, $p->getLastAddress()); // 2. Add an older address, which should not be the last address. - $addressDate2 = $addressDate->sub(new DateInterval('PT30M')); - $address2 = (new Address())->setValidFrom($addressDate2); + $addressDate2 = clone $addressDate; + $address2 = (new Address())->setValidFrom($addressDate2->sub(new DateInterval('PT30M'))); $p->addAddress($address2); $this::assertCount(2, $p->getAddresses()); $this::assertSame($address1, $p->getLastAddress()); // 3. Add a newer address, which should be the last address. - $addressDate3 = $addressDate->add(new DateInterval('PT30M')); - $address3 = (new Address())->setValidFrom($addressDate3); + $addressDate3 = clone $addressDate; + $address3 = (new Address())->setValidFrom($addressDate3->add(new DateInterval('PT30M'))); $p->addAddress($address3); $this::assertCount(3, $p->getAddresses()); $this::assertSame($address3, $p->getLastAddress()); // 4. Get the last address from a specific date. - $this::assertSame($address1, $p->getLastAddress($addressDate)); - $this::assertSame($address2, $p->getLastAddress($addressDate2)); - $this::assertSame($address3, $p->getLastAddress($addressDate3)); + $this::assertEquals($address1, $p->getLastAddress($addressDate)); + $this::assertEquals($address2, $p->getLastAddress($addressDate2)); + $this::assertEquals($address3, $p->getLastAddress($addressDate3)); } } From 03243605dac1c0f5dfdf303badad99cf3e24b7fe Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 31 Mar 2021 14:57:25 +0200 Subject: [PATCH 05/33] Remove unrelated code style change. --- Entity/AccompanyingPeriod.php | 70 ++++++++++++++++++---------------- Entity/Person.php | 20 +++++----- Tests/Entity/PersonTest.php | 72 +++++++++++++++++------------------ 3 files changed, 83 insertions(+), 79 deletions(-) diff --git a/Entity/AccompanyingPeriod.php b/Entity/AccompanyingPeriod.php index 36ce685e1..debc0a18d 100644 --- a/Entity/AccompanyingPeriod.php +++ b/Entity/AccompanyingPeriod.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 @@ -45,17 +45,17 @@ class AccompanyingPeriod /** @var \Chill\PersonBundle\Entity\Person */ private $person; - + /** @var AccompanyingPeriod\ClosingMotive */ private $closingMotive = null; - + /** * The user making the accompanying * * @var User */ private $user; - + /** * * @param \DateTime $dateOpening @@ -68,7 +68,7 @@ class AccompanyingPeriod /** * Get id * - * @return integer + * @return integer */ public function getId() { @@ -84,7 +84,7 @@ class AccompanyingPeriod public function setOpeningDate($openingDate) { $this->openingDate = $openingDate; - + return $this; } @@ -100,13 +100,17 @@ class AccompanyingPeriod /** * Set closingDate - * + * * For closing a Person file, you should use Person::setClosed instead. + * + * @param \DateTime $dateClosing + * @return AccompanyingPeriod + * */ public function setClosingDate($closingDate) { $this->closingDate = $closingDate; - + return $this; } @@ -119,12 +123,12 @@ class AccompanyingPeriod { return $this->closingDate; } - + /** - * + * * @return boolean */ - public function isOpen(): bool + public function isOpen(): bool { if ($this->getOpeningDate() > new \DateTime('now')) { return false; @@ -132,9 +136,9 @@ class AccompanyingPeriod if ($this->getClosingDate() === null) { return true; + } else { + return false; } - - return false; } /** @@ -148,16 +152,16 @@ class AccompanyingPeriod if ($remark === null) { $remark = ''; } - + $this->remark = $remark; - + return $this; } /** * Get remark * - * @return string + * @return string */ public function getRemark() { @@ -166,7 +170,7 @@ class AccompanyingPeriod /** * Set person. - * + * * For consistency, you should use Person::addAccompanyingPeriod instead. * * @param \Chill\PersonBundle\Entity\Person $person @@ -176,20 +180,20 @@ class AccompanyingPeriod public function setPerson(\Chill\PersonBundle\Entity\Person $person = null) { $this->person = $person; - + return $this; } /** * Get person * - * @return \Chill\PersonBundle\Entity\Person + * @return \Chill\PersonBundle\Entity\Person */ public function getPerson() { return $this->person; } - + public function getClosingMotive() { return $this->closingMotive; @@ -200,13 +204,13 @@ class AccompanyingPeriod $this->closingMotive = $closingMotive; return $this; } - + /** * If the period can be reopened. - * - * This function test if the period is closed and if the period is the last + * + * This function test if the period is closed and if the period is the last * for the associated person - * + * * @return boolean */ public function canBeReOpened() @@ -214,12 +218,12 @@ class AccompanyingPeriod if ($this->isOpen() === true) { return false; } - + $periods = $this->getPerson()->getAccompanyingPeriodsOrdered(); - + return end($periods) === $this; } - + public function reOpen() { $this->setClosingDate(null); @@ -231,29 +235,29 @@ class AccompanyingPeriod if ($this->isOpen()) { return; } - + if (! $this->isClosingAfterOpening()) { $context->buildViolation('The date of closing is before the date of opening') ->atPath('dateClosing') ->addViolation(); } } - + /** * Returns true if the closing date is after the opening date. - * + * * @return boolean */ public function isClosingAfterOpening() { $diff = $this->getOpeningDate()->diff($this->getClosingDate()); - + if ($diff->invert === 0) { return true; } else { return false; } } - + function getUser(): ?User { return $this->user; @@ -262,7 +266,7 @@ class AccompanyingPeriod function setUser(User $user): self { $this->user = $user; - + return $this; } diff --git a/Entity/Person.php b/Entity/Person.php index 7a9313ecb..57e04fe73 100644 --- a/Entity/Person.php +++ b/Entity/Person.php @@ -44,7 +44,7 @@ class Person implements HasCenterInterface { /** @var string The person's last name */ private $lastName; - + /** * * @var \Doctrine\Common\Collections\Collection @@ -121,12 +121,12 @@ class Person implements HasCenterInterface { * @var \Doctrine\Common\Collections\Collection */ private $addresses; - + /** * @var string */ private $fullnameCanonical; - + public function __construct(\DateTime $opening = null) { $this->accompanyingPeriods = new ArrayCollection(); $this->spokenLanguages = new ArrayCollection(); @@ -333,7 +333,7 @@ class Person implements HasCenterInterface { { return $this->lastName; } - + public function getAltNames(): \Doctrine\Common\Collections\Collection { return $this->altNames; @@ -342,7 +342,7 @@ class Person implements HasCenterInterface { public function setAltNames(\Doctrine\Common\Collections\Collection $altNames) { $this->altNames = $altNames; - + return $this; } @@ -352,20 +352,20 @@ class Person implements HasCenterInterface { $this->altNames->add($altName); $altName->setPerson($this); } - + return $this; } - - public function removeAltName(PersonAltName $altName) + + public function removeAltName(PersonAltName $altName) { if ($this->altNames->contains($altName)) { $altName->setPerson(null); $this->altNames->removeElement($altName); } - + return $this; } - + /** * Set birthdate * diff --git a/Tests/Entity/PersonTest.php b/Tests/Entity/PersonTest.php index a32823d20..b1e6d6971 100644 --- a/Tests/Entity/PersonTest.php +++ b/Tests/Entity/PersonTest.php @@ -2,8 +2,8 @@ /* * 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 @@ -35,55 +35,55 @@ use Generator; class PersonTest extends \PHPUnit\Framework\TestCase { /** - * Test the creation of an accompanying, its closure and the access to + * Test the creation of an accompanying, its closure and the access to * the current accompaniying period via the getCurrentAccompanyingPeriod * function. */ public function testGetCurrentAccompanyingPeriod() { - $d = new \DateTime('yesterday'); + $d = new \DateTime('yesterday'); $p = new Person($d); - + $period = $p->getCurrentAccompanyingPeriod(); - + $this->assertInstanceOf('Chill\PersonBundle\Entity\AccompanyingPeriod', $period); $this->assertTrue($period->isOpen()); $this->assertEquals($d, $period->getOpeningDate()); - + //close and test $period->setClosingDate(new \DateTime('tomorrow')); - + $shouldBeNull = $p->getCurrentAccompanyingPeriod(); $this->assertNull($shouldBeNull); } - + /** * Test if the getAccompanyingPeriodsOrdered function return a list of * periods ordered ascendency. */ public function testAccompanyingPeriodOrderWithUnorderedAccompanyingPeriod() - { + { $d = new \DateTime("2013/2/1"); $p = new Person($d); - + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - + $f = new \DateTime("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - - $g = new \DateTime("2013/4/1"); + + $g = new \DateTime("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); - + $r = $p->getAccompanyingPeriodsOrdered(); - + $date = $r[0]->getOpeningDate()->format('Y-m-d'); - + $this->assertEquals($date, '2013-01-01'); } - + /** * Test if the getAccompanyingPeriodsOrdered function, for periods * starting at the same time order regarding to the closing date. @@ -91,25 +91,25 @@ class PersonTest extends \PHPUnit\Framework\TestCase public function testAccompanyingPeriodOrderSameDateOpening() { $d = new \DateTime("2013/2/1"); $p = new Person($d); - - $g = new \DateTime("2013/4/1"); + + $g = new \DateTime("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); - + $f = new \DateTime("2013/2/1"); $p->open(new AccompanyingPeriod($f)); - + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); $r = $p->getAccompanyingPeriodsOrdered(); - + $date = $r[0]->getClosingDate()->format('Y-m-d'); - + $this->assertEquals($date, '2013-03-01'); } - + /** * Test if the function checkAccompanyingPeriodIsNotCovering returns * the good constant when two periods are collapsing : a period @@ -118,23 +118,23 @@ class PersonTest extends \PHPUnit\Framework\TestCase public function testDateCoveringWithCoveringAccompanyingPeriod() { $d = new \DateTime("2013/2/1"); $p = new Person($d); - + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - + $f = new \DateTime("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - - $g = new \DateTime("2013/4/1"); + + $g = new \DateTime("2013/4/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($g); $p->close($period); - + $r = $p->checkAccompanyingPeriodsAreNotCollapsing(); - + $this->assertEquals($r['result'], Person::ERROR_PERIODS_ARE_COLLAPSING); } - + /** * Test if the function checkAccompanyingPeriodIsNotCovering returns * the good constant when two periods are collapsing : a period is open @@ -143,16 +143,16 @@ class PersonTest extends \PHPUnit\Framework\TestCase public function testNotOpenAFileReOpenedLater() { $d = new \DateTime("2013/2/1"); $p = new Person($d); - + $e = new \DateTime("2013/3/1"); $period = $p->getCurrentAccompanyingPeriod()->setClosingDate($e); $p->close($period); - + $f = new \DateTime("2013/1/1"); $p->open(new AccompanyingPeriod($f)); - + $r = $p->checkAccompanyingPeriodsAreNotCollapsing(); - + $this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD); } From 58cb34f39bec8af194b38e2bbf08af7fce33f5c5 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Mon, 26 Apr 2021 17:09:54 +0200 Subject: [PATCH 06/33] Creation of entities : SocialIssue / Social Action / Result / Goal --- .../Entity/SocialWork/Goal.php | 121 ++++++++++ .../Entity/SocialWork/Result.php | 125 ++++++++++ .../Entity/SocialWork/SocialAction.php | 214 ++++++++++++++++++ .../Entity/SocialWork/SocialIssue.php | 154 +++++++++++++ .../Repository/SocialWork/GoalRepository.php | 50 ++++ .../SocialWork/ResultRepository.php | 50 ++++ .../SocialWork/SocialActionRepository.php | 50 ++++ .../SocialWork/SocialIssueRepository.php | 50 ++++ .../migrations/Version20210426145930.php | 80 +++++++ 9 files changed, 894 insertions(+) create mode 100644 src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php create mode 100644 src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php create mode 100644 src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php create mode 100644 src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php new file mode 100644 index 000000000..c86c0fd7f --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php @@ -0,0 +1,121 @@ +socialActions = new ArrayCollection(); + $this->results = new ArrayCollection(); + } + + public function getTitle(): ?array + { + return $this->title; + } + + public function setTitle(array $title): self + { + $this->title = $title; + + return $this; + } + + public function getDesactivationDate(): ?\DateTimeInterface + { + return $this->desactivationDate; + } + + public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self + { + $this->desactivationDate = $desactivationDate; + + return $this; + } + + /** + * @return Collection|SocialAction[] + */ + public function getSocialActions(): Collection + { + return $this->socialActions; + } + + public function addSocialAction(SocialAction $socialAction): self + { + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; + } + + return $this; + } + + public function removeSocialAction(SocialAction $socialAction): self + { + $this->socialActions->removeElement($socialAction); + + return $this; + } + + /** + * @return Collection|Result[] + */ + public function getResults(): Collection + { + return $this->results; + } + + public function addResult(Result $result): self + { + if (!$this->results->contains($result)) { + $this->results[] = $result; + } + + return $this; + } + + public function removeResult(Result $result): self + { + $this->results->removeElement($result); + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php new file mode 100644 index 000000000..04009a9f6 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php @@ -0,0 +1,125 @@ +socialActions = new ArrayCollection(); + $this->goals = new ArrayCollection(); + } + + public function getId(): ?int + { + return $this->id; + } + + public function getTitle(): ?array + { + return $this->title; + } + + public function setTitle(array $title): self + { + $this->title = $title; + + return $this; + } + + public function getDesactivationDate(): ?\DateTimeInterface + { + return $this->desactivationDate; + } + + public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self + { + $this->desactivationDate = $desactivationDate; + + return $this; + } + + /** + * @return Collection|SocialAction[] + */ + public function getSocialActions(): Collection + { + return $this->socialActions; + } + + public function addSocialAction(SocialAction $socialAction): self + { + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; + } + + return $this; + } + + public function removeSocialAction(SocialAction $socialAction): self + { + $this->socialActions->removeElement($socialAction); + + return $this; + } + + /** + * @return Collection|Goal[] + */ + public function getGoals(): Collection + { + return $this->goals; + } + + public function addGoal(Goal $goal): self + { + if (!$this->goals->contains($goal)) { + $this->goals[] = $goal; + } + + return $this; + } + + public function removeGoal(Goal $goal): self + { + $this->goals->removeElement($goal); + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php new file mode 100644 index 000000000..e514d7295 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php @@ -0,0 +1,214 @@ +children = new ArrayCollection(); + $this->goals = new ArrayCollection(); + $this->results = new ArrayCollection(); + } + + public function getId(): ?int + { + return $this->id; + } + + public function getDesactivationDate(): ?\DateTimeInterface + { + return $this->desactivationDate; + } + + public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self + { + $this->desactivationDate = $desactivationDate; + + return $this; + } + + public function getIssue(): ?SocialIssue + { + return $this->issue; + } + + public function setIssue(?SocialIssue $issue): self + { + $this->issue = $issue; + + return $this; + } + + public function getParent(): ?self + { + return $this->parent; + } + + public function setParent(?self $parent): self + { + $this->parent = $parent; + + return $this; + } + + /** + * @return Collection|self[] + */ + public function getChildren(): Collection + { + return $this->children; + } + + public function addChild(self $child): self + { + if (!$this->children->contains($child)) { + $this->children[] = $child; + $child->setParent($this); + } + + return $this; + } + + public function removeChild(self $child): self + { + if ($this->children->removeElement($child)) { + // set the owning side to null (unless already changed) + if ($child->getParent() === $this) { + $child->setParent(null); + } + } + + return $this; + } + + public function getDefaultNotificationDelay(): ?\DateInterval + { + return $this->defaultNotificationDelay; + } + + public function setDefaultNotificationDelay(\DateInterval $defaultNotificationDelay): self + { + $this->defaultNotificationDelay = $defaultNotificationDelay; + + return $this; + } + + public function getTitle(): ?array + { + return $this->title; + } + + public function setTitle(array $title): self + { + $this->title = $title; + + return $this; + } + + /** + * @return Collection|Goal[] + */ + public function getGoals(): Collection + { + return $this->goals; + } + + public function addGoal(Goal $goal): self + { + if (!$this->goals->contains($goal)) { + $this->goals[] = $goal; + } + + return $this; + } + + public function removeGoal(Goal $goal): self + { + $this->goals->removeElement($goal); + + return $this; + } + + /** + * @return Collection|Result[] + */ + public function getResults(): Collection + { + return $this->results; + } + + public function addResult(Result $result): self + { + if (!$this->results->contains($result)) { + $this->results[] = $result; + } + + return $this; + } + + public function removeResult(Result $result): self + { + $this->results->removeElement($result); + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php new file mode 100644 index 000000000..78cf6896b --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php @@ -0,0 +1,154 @@ +children = new ArrayCollection(); + $this->socialActions = new ArrayCollection(); + } + + public function getId(): ?int + { + return $this->id; + } + + public function getParent(): ?self + { + return $this->parent; + } + + public function setParent(?self $parent): self + { + $this->parent = $parent; + + return $this; + } + + /** + * @return Collection|self[] + */ + public function getChildren(): Collection + { + return $this->children; + } + + public function addChild(self $child): self + { + if (!$this->children->contains($child)) { + $this->children[] = $child; + $child->setParent($this); + } + + return $this; + } + + public function removeChild(self $child): self + { + if ($this->children->removeElement($child)) { + // set the owning side to null (unless already changed) + if ($child->getParent() === $this) { + $child->setParent(null); + } + } + + return $this; + } + + public function getDesactivationDate(): ?\DateTimeInterface + { + return $this->desactivationDate; + } + + public function setDesactivationDate(?\DateTimeInterface $desactivationDate): self + { + $this->desactivationDate = $desactivationDate; + + return $this; + } + + public function getTitle(): ?array + { + return $this->title; + } + + public function setTitle(array $title): self + { + $this->title = $title; + + return $this; + } + + /** + * @return Collection|SocialAction[] + */ + public function getSocialActions(): Collection + { + return $this->socialActions; + } + + public function addSocialAction(SocialAction $socialAction): self + { + if (!$this->socialActions->contains($socialAction)) { + $this->socialActions[] = $socialAction; + $socialAction->setSocialIssue($this); + } + + return $this; + } + + public function removeSocialAction(SocialAction $socialAction): self + { + if ($this->socialActions->removeElement($socialAction)) { + // set the owning side to null (unless already changed) + if ($socialAction->getSocialIssue() === $this) { + $socialAction->setSocialIssue(null); + } + } + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php new file mode 100644 index 000000000..5dedacd09 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('g') + ->andWhere('g.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('g.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?Goal + { + return $this->createQueryBuilder('g') + ->andWhere('g.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php new file mode 100644 index 000000000..72368d665 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('r') + ->andWhere('r.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('r.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?Result + { + return $this->createQueryBuilder('r') + ->andWhere('r.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php new file mode 100644 index 000000000..d3c1ae00f --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('s') + ->andWhere('s.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('s.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?SocialAction + { + return $this->createQueryBuilder('s') + ->andWhere('s.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php new file mode 100644 index 000000000..5736d9d5c --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php @@ -0,0 +1,50 @@ +createQueryBuilder('s') + ->andWhere('s.exampleField = :val') + ->setParameter('val', $value) + ->orderBy('s.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ + + /* + public function findOneBySomeField($value): ?SocialIssue + { + return $this->createQueryBuilder('s') + ->andWhere('s.exampleField = :val') + ->setParameter('val', $value) + ->getQuery() + ->getOneOrNullResult() + ; + } + */ +} diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php new file mode 100644 index 000000000..892f19b31 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php @@ -0,0 +1,80 @@ +addSql('CREATE SEQUENCE chill_person_social_action_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_person_social_issue_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_person_social_work_goal_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_person_social_work_result_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_person_social_action (id INT NOT NULL, issue_id INT DEFAULT NULL, parent_id INT DEFAULT NULL, desactivationDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, defaultNotificationDelay INTERVAL NOT NULL, title JSONB NOT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_B7ABFAB85E7AA58C ON chill_person_social_action (issue_id)'); + $this->addSql('CREATE INDEX IDX_B7ABFAB8727ACA70 ON chill_person_social_action (parent_id)'); + $this->addSql('COMMENT ON COLUMN chill_person_social_action.defaultNotificationDelay IS \'(DC2Type:dateinterval)\''); + $this->addSql('CREATE TABLE chill_person_social_action_goal (socialaction_id INT NOT NULL, goal_id INT NOT NULL, PRIMARY KEY(socialaction_id, goal_id))'); + $this->addSql('CREATE INDEX IDX_163CA4DD3DC32179 ON chill_person_social_action_goal (socialaction_id)'); + $this->addSql('CREATE INDEX IDX_163CA4DD667D1AFE ON chill_person_social_action_goal (goal_id)'); + $this->addSql('CREATE TABLE chill_person_social_action_result (socialaction_id INT NOT NULL, result_id INT NOT NULL, PRIMARY KEY(socialaction_id, result_id))'); + $this->addSql('CREATE INDEX IDX_CA98C58C3DC32179 ON chill_person_social_action_result (socialaction_id)'); + $this->addSql('CREATE INDEX IDX_CA98C58C7A7B643 ON chill_person_social_action_result (result_id)'); + $this->addSql('CREATE TABLE chill_person_social_issue (id INT NOT NULL, parent_id INT DEFAULT NULL, desactivationDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, title JSONB NOT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_7A484DAE727ACA70 ON chill_person_social_issue (parent_id)'); + $this->addSql('CREATE TABLE chill_person_social_work_goal (id INT NOT NULL, title JSONB NOT NULL, desactivationDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE TABLE chill_person_social_work_goal_result (goal_id INT NOT NULL, result_id INT NOT NULL, PRIMARY KEY(goal_id, result_id))'); + $this->addSql('CREATE INDEX IDX_F3BAEEA9667D1AFE ON chill_person_social_work_goal_result (goal_id)'); + $this->addSql('CREATE INDEX IDX_F3BAEEA97A7B643 ON chill_person_social_work_goal_result (result_id)'); + $this->addSql('CREATE TABLE chill_person_social_work_result (id INT NOT NULL, title JSONB NOT NULL, desactivationDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('ALTER TABLE chill_person_social_action ADD CONSTRAINT FK_B7ABFAB85E7AA58C FOREIGN KEY (issue_id) REFERENCES chill_person_social_issue (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_action ADD CONSTRAINT FK_B7ABFAB8727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_person_social_action (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_action_goal ADD CONSTRAINT FK_163CA4DD3DC32179 FOREIGN KEY (socialaction_id) REFERENCES chill_person_social_action (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_action_goal ADD CONSTRAINT FK_163CA4DD667D1AFE FOREIGN KEY (goal_id) REFERENCES chill_person_social_work_goal (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_action_result ADD CONSTRAINT FK_CA98C58C3DC32179 FOREIGN KEY (socialaction_id) REFERENCES chill_person_social_action (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_action_result ADD CONSTRAINT FK_CA98C58C7A7B643 FOREIGN KEY (result_id) REFERENCES chill_person_social_work_result (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_issue ADD CONSTRAINT FK_7A484DAE727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_person_social_issue (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_work_goal_result ADD CONSTRAINT FK_F3BAEEA9667D1AFE FOREIGN KEY (goal_id) REFERENCES chill_person_social_work_goal (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_work_goal_result ADD CONSTRAINT FK_F3BAEEA97A7B643 FOREIGN KEY (result_id) REFERENCES chill_person_social_work_result (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema) : void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('CREATE SCHEMA public'); + $this->addSql('ALTER TABLE chill_person_social_action DROP CONSTRAINT FK_B7ABFAB8727ACA70'); + $this->addSql('ALTER TABLE chill_person_social_action_goal DROP CONSTRAINT FK_163CA4DD3DC32179'); + $this->addSql('ALTER TABLE chill_person_social_action_result DROP CONSTRAINT FK_CA98C58C3DC32179'); + $this->addSql('ALTER TABLE chill_person_social_action DROP CONSTRAINT FK_B7ABFAB85E7AA58C'); + $this->addSql('ALTER TABLE chill_person_social_issue DROP CONSTRAINT FK_7A484DAE727ACA70'); + $this->addSql('ALTER TABLE chill_person_social_action_goal DROP CONSTRAINT FK_163CA4DD667D1AFE'); + $this->addSql('ALTER TABLE chill_person_social_work_goal_result DROP CONSTRAINT FK_F3BAEEA9667D1AFE'); + $this->addSql('ALTER TABLE chill_person_social_action_result DROP CONSTRAINT FK_CA98C58C7A7B643'); + $this->addSql('ALTER TABLE chill_person_social_work_goal_result DROP CONSTRAINT FK_F3BAEEA97A7B643'); + $this->addSql('DROP SEQUENCE chill_person_social_action_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_person_social_issue_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_person_social_work_goal_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_person_social_work_result_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_person_social_action'); + $this->addSql('DROP TABLE chill_person_social_action_goal'); + $this->addSql('DROP TABLE chill_person_social_action_result'); + $this->addSql('DROP TABLE chill_person_social_issue'); + $this->addSql('DROP TABLE chill_person_social_work_goal'); + $this->addSql('DROP TABLE chill_person_social_work_goal_result'); + $this->addSql('DROP TABLE chill_person_social_work_result'); + } +} From cda32fb925102a63281f66acfae6320ea4010c02 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Mon, 26 Apr 2021 17:19:10 +0200 Subject: [PATCH 07/33] Pbm migration double --- .../ChillPersonBundle/migrations/Version20210426145930.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php index 892f19b31..168d6a319 100644 --- a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php @@ -10,7 +10,7 @@ use Doctrine\Migrations\AbstractMigration; /** * Auto-generated Migration: Please modify to your needs! */ -final class Version20210426145930X extends AbstractMigration +final class Version20210426145930 extends AbstractMigration { public function getDescription() : string { From 38ac3badefa6c562b92221205aad087a478027f5 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 27 Apr 2021 11:24:26 +0200 Subject: [PATCH 08/33] Integration rmq Julien --- .../Entity/SocialWork/Goal.php | 2 +- .../Entity/SocialWork/Result.php | 2 +- .../Entity/SocialWork/SocialAction.php | 2 +- .../Entity/SocialWork/SocialIssue.php | 2 +- .../Repository/SocialWork/GoalRepository.php | 29 ------------------- .../SocialWork/ResultRepository.php | 29 ------------------- .../SocialWork/SocialActionRepository.php | 29 ------------------- .../SocialWork/SocialIssueRepository.php | 29 ------------------- .../migrations/Version20210426145930.php | 7 ++--- 9 files changed, 6 insertions(+), 125 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php index c86c0fd7f..adf59d203 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php @@ -47,7 +47,7 @@ class Goal $this->results = new ArrayCollection(); } - public function getTitle(): ?array + public function getTitle(): array { return $this->title; } diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php index 04009a9f6..3ffe9762e 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php @@ -51,7 +51,7 @@ class Result return $this->id; } - public function getTitle(): ?array + public function getTitle(): array { return $this->title; } diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php index e514d7295..690764f39 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php @@ -152,7 +152,7 @@ class SocialAction return $this; } - public function getTitle(): ?array + public function getTitle(): array { return $this->title; } diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php index 78cf6896b..d7817de16 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php @@ -110,7 +110,7 @@ class SocialIssue return $this; } - public function getTitle(): ?array + public function getTitle(): array { return $this->title; } diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php index 5dedacd09..87100d0de 100644 --- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php @@ -18,33 +18,4 @@ class GoalRepository extends ServiceEntityRepository { parent::__construct($registry, Goal::class); } - - // /** - // * @return Goal[] Returns an array of Goal objects - // */ - /* - public function findByExampleField($value) - { - return $this->createQueryBuilder('g') - ->andWhere('g.exampleField = :val') - ->setParameter('val', $value) - ->orderBy('g.id', 'ASC') - ->setMaxResults(10) - ->getQuery() - ->getResult() - ; - } - */ - - /* - public function findOneBySomeField($value): ?Goal - { - return $this->createQueryBuilder('g') - ->andWhere('g.exampleField = :val') - ->setParameter('val', $value) - ->getQuery() - ->getOneOrNullResult() - ; - } - */ } diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php index 72368d665..11c436da3 100644 --- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php @@ -18,33 +18,4 @@ class ResultRepository extends ServiceEntityRepository { parent::__construct($registry, Result::class); } - - // /** - // * @return Result[] Returns an array of Result objects - // */ - /* - public function findByExampleField($value) - { - return $this->createQueryBuilder('r') - ->andWhere('r.exampleField = :val') - ->setParameter('val', $value) - ->orderBy('r.id', 'ASC') - ->setMaxResults(10) - ->getQuery() - ->getResult() - ; - } - */ - - /* - public function findOneBySomeField($value): ?Result - { - return $this->createQueryBuilder('r') - ->andWhere('r.exampleField = :val') - ->setParameter('val', $value) - ->getQuery() - ->getOneOrNullResult() - ; - } - */ } diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php index d3c1ae00f..32affaa50 100644 --- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php @@ -18,33 +18,4 @@ class SocialActionRepository extends ServiceEntityRepository { parent::__construct($registry, SocialAction::class); } - - // /** - // * @return SocialAction[] Returns an array of SocialAction objects - // */ - /* - public function findByExampleField($value) - { - return $this->createQueryBuilder('s') - ->andWhere('s.exampleField = :val') - ->setParameter('val', $value) - ->orderBy('s.id', 'ASC') - ->setMaxResults(10) - ->getQuery() - ->getResult() - ; - } - */ - - /* - public function findOneBySomeField($value): ?SocialAction - { - return $this->createQueryBuilder('s') - ->andWhere('s.exampleField = :val') - ->setParameter('val', $value) - ->getQuery() - ->getOneOrNullResult() - ; - } - */ } diff --git a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php index 5736d9d5c..3349f6d00 100644 --- a/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php @@ -18,33 +18,4 @@ class SocialIssueRepository extends ServiceEntityRepository { parent::__construct($registry, SocialIssue::class); } - - // /** - // * @return SocialIssue[] Returns an array of SocialIssue objects - // */ - /* - public function findByExampleField($value) - { - return $this->createQueryBuilder('s') - ->andWhere('s.exampleField = :val') - ->setParameter('val', $value) - ->orderBy('s.id', 'ASC') - ->setMaxResults(10) - ->getQuery() - ->getResult() - ; - } - */ - - /* - public function findOneBySomeField($value): ?SocialIssue - { - return $this->createQueryBuilder('s') - ->andWhere('s.exampleField = :val') - ->setParameter('val', $value) - ->getQuery() - ->getOneOrNullResult() - ; - } - */ } diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php index 168d6a319..7a081c03c 100644 --- a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php @@ -8,18 +8,17 @@ use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; /** - * Auto-generated Migration: Please modify to your needs! + * Create Social action, Social Issue, Work Goal and Work Result */ final class Version20210426145930 extends AbstractMigration { public function getDescription() : string { - return ''; + return 'Create Social action, Social Issue, Work Goal and Work Result'; } public function up(Schema $schema) : void { - // this up() migration is auto-generated, please modify it to your needs $this->addSql('CREATE SEQUENCE chill_person_social_action_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); $this->addSql('CREATE SEQUENCE chill_person_social_issue_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); $this->addSql('CREATE SEQUENCE chill_person_social_work_goal_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); @@ -54,8 +53,6 @@ final class Version20210426145930 extends AbstractMigration public function down(Schema $schema) : void { - // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE SCHEMA public'); $this->addSql('ALTER TABLE chill_person_social_action DROP CONSTRAINT FK_B7ABFAB8727ACA70'); $this->addSql('ALTER TABLE chill_person_social_action_goal DROP CONSTRAINT FK_163CA4DD3DC32179'); $this->addSql('ALTER TABLE chill_person_social_action_result DROP CONSTRAINT FK_CA98C58C3DC32179'); From 0f9a395dfc26103915a9ac189a359190408524fa Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 27 Apr 2021 15:10:56 +0200 Subject: [PATCH 09/33] Entites for AccomanyingPeriodWork, AccomanyingPeriodWorkGoal & Social/WorkEvaluation --- .../AccompanyingPeriodWork.php | 309 ++++++++++++++++++ .../AccompanyingPeriodWorkGoal.php | 115 +++++++ .../Entity/SocialWork/Evaluation.php | 93 ++++++ .../Entity/SocialWork/Result.php | 62 ++++ .../AccompanyingPeriodWorkGoalRepository.php | 21 ++ .../AccompanyingPeriodWorkRepository.php | 21 ++ .../SocialWork/EvaluationRepository.php | 21 ++ 7 files changed, 642 insertions(+) create mode 100644 src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php create mode 100644 src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php create mode 100644 src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php create mode 100644 src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php new file mode 100644 index 000000000..92279be2d --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php @@ -0,0 +1,309 @@ +goals = new ArrayCollection(); + $this->results = new ArrayCollection(); + $this->thirdParties = new ArrayCollection(); + } + + public function getId(): ?int + { + return $this->id; + } + + public function getNote(): ?string + { + return $this->note; + } + + public function setNote(string $note): self + { + $this->note = $note; + + return $this; + } + + public function getAccompanyingPeriod(): ?AccompanyingPeriod + { + return $this->accompanyingPeriod; + } + + public function setAccompanyingPeriod(?AccompanyingPeriod $accompanyingPeriod): self + { + $this->accompanyingPeriod = $accompanyingPeriod; + + return $this; + } + + public function getSocialAction(): ?SocialAction + { + return $this->socialAction; + } + + public function setSocialAction(?SocialAction $socialAction): self + { + $this->socialAction = $socialAction; + + return $this; + } + + public function getCreatedAt(): ?\DateTimeInterface + { + return $this->createdAt; + } + + public function setCreatedAt(\DateTimeInterface $createdAt): self + { + $this->createdAt = $createdAt; + + return $this; + } + + public function getCreatedBy(): ?User + { + return $this->createdBy; + } + + public function setCreatedBy(?User $createdBy): self + { + $this->createdBy = $createdBy; + + return $this; + } + + public function getStartDate(): ?\DateTimeInterface + { + return $this->startDate; + } + + public function setStartDate(\DateTimeInterface $startDate): self + { + $this->startDate = $startDate; + + return $this; + } + + public function getEndDate(): ?\DateTimeInterface + { + return $this->endDate; + } + + public function setEndDate(\DateTimeInterface $endDate): self + { + $this->endDate = $endDate; + + return $this; + } + + public function getHandlingThierParty(): ?ThirdParty + { + return $this->handlingThierParty; + } + + public function setHandlingThierParty(?ThirdParty $handlingThierParty): self + { + $this->handlingThierParty = $handlingThierParty; + + return $this; + } + + public function getCreatedAutomatically(): ?bool + { + return $this->createdAutomatically; + } + + public function setCreatedAutomatically(bool $createdAutomatically): self + { + $this->createdAutomatically = $createdAutomatically; + + return $this; + } + + public function getCreatedAutomaticallyReason(): ?string + { + return $this->createdAutomaticallyReason; + } + + public function setCreatedAutomaticallyReason(string $createdAutomaticallyReason): self + { + $this->createdAutomaticallyReason = $createdAutomaticallyReason; + + return $this; + } + + /** + * @return Collection|AccompanyingPeriodWorkGoal[] + */ + public function getGoals(): Collection + { + return $this->goals; + } + + public function addGoal(AccompanyingPeriodWorkGoal $goal): self + { + if (!$this->goals->contains($goal)) { + $this->goals[] = $goal; + $goal->setAccompanyingPeriodWork2($this); + } + + return $this; + } + + public function removeGoal(AccompanyingPeriodWorkGoal $goal): self + { + if ($this->goals->removeElement($goal)) { + // set the owning side to null (unless already changed) + if ($goal->getAccompanyingPeriodWork2() === $this) { + $goal->setAccompanyingPeriodWork2(null); + } + } + + return $this; + } + + /** + * @return Collection|Result[] + */ + public function getResults(): Collection + { + return $this->results; + } + + public function addResult(Result $result): self + { + if (!$this->results->contains($result)) { + $this->results[] = $result; + } + + return $this; + } + + public function removeResult(Result $result): self + { + $this->results->removeElement($result); + + return $this; + } + + /** + * @return Collection|ThirdParty[] + */ + public function getThirdParties(): Collection + { + return $this->thirdParties; + } + + public function addThirdParty(ThirdParty $thirdParty): self + { + if (!$this->thirdParties->contains($thirdParty)) { + $this->thirdParties[] = $thirdParty; + } + + return $this; + } + + public function removeThirdParty(ThirdParty $thirdParty): self + { + $this->thirdParties->removeElement($thirdParty); + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php new file mode 100644 index 000000000..406e99152 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkGoal.php @@ -0,0 +1,115 @@ +results = new ArrayCollection(); + } + + public function getId(): ?int + { + return $this->id; + } + + public function getNote(): ?string + { + return $this->note; + } + + public function setNote(string $note): self + { + $this->note = $note; + + return $this; + } + + public function getAccompanyingPeriodWork(): ?AccompanyingPeriodWork + { + return $this->accompanyingPeriodWork; + } + + public function setAccompanyingPeriodWork(?AccompanyingPeriodWork $accompanyingPeriodWork): self + { + $this->accompanyingPeriodWork = $accompanyingPeriodWork; + + return $this; + } + + public function getGoal(): ?Goal + { + return $this->goal; + } + + public function setGoal(?Goal $goal): self + { + $this->goal = $goal; + + return $this; + } + + /** + * @return Collection|Result[] + */ + public function getResults(): Collection + { + return $this->results; + } + + public function addResult(Result $result): self + { + if (!$this->results->contains($result)) { + $this->results[] = $result; + } + + return $this; + } + + public function removeResult(Result $result): self + { + $this->results->removeElement($result); + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php new file mode 100644 index 000000000..1fd6c8734 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php @@ -0,0 +1,93 @@ +id; + } + + public function getTitle(): array + { + return $this->title; + } + + public function setTitle(array $title): self + { + $this->title = $title; + + return $this; + } + + public function getDelay(): ?\DateInterval + { + return $this->delay; + } + + public function setDelay(\DateInterval $delay): self + { + $this->delay = $delay; + + return $this; + } + + public function getNotificationDelay(): ?\DateInterval + { + return $this->notificationDelay; + } + + public function setNotificationDelay(\DateInterval $notificationDelay): self + { + $this->notificationDelay = $notificationDelay; + + return $this; + } + + public function getSocialAction(): ?SocialAction + { + return $this->socialAction; + } + + public function setSocialAction(?SocialAction $socialAction): self + { + $this->socialAction = $socialAction; + + return $this; + } +} diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php index 3ffe9762e..5eb3224bc 100644 --- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php @@ -2,6 +2,8 @@ namespace App\Entity\Chill\PersonBundle\Entity\SocialWork; +use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; +use App\Entity\Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkGoal; use App\Repository\Chill\PersonBundle\Entity\SocialWork\ResultRepository; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; @@ -40,10 +42,22 @@ class Result */ private $goals; + /** + * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWork::class, mappedBy="results") + */ + private $accompanyingPeriodWorks; + + /** + * @ORM\ManyToMany(targetEntity=AccompanyingPeriodWorkGoal::class, mappedBy="results") + */ + private $accompanyingPeriodWorkGoals; + public function __construct() { $this->socialActions = new ArrayCollection(); $this->goals = new ArrayCollection(); + $this->accompanyingPeriodWorks = new ArrayCollection(); + $this->accompanyingPeriodWorkGoals = new ArrayCollection(); } public function getId(): ?int @@ -122,4 +136,52 @@ class Result return $this; } + + /** + * @return Collection|AccompanyingPeriodWork[] + */ + public function getAccompanyingPeriodWorks(): Collection + { + return $this->accompanyingPeriodWorks; + } + + public function addAccompanyingPeriodWork(AccompanyingPeriodWork $accompanyingPeriod): self + { + if (!$this->accompanyingPeriodWorks->contains($accompanyingPeriod)) { + $this->accompanyingPeriodWorks[] = $accompanyingPeriod; + } + + return $this; + } + + public function removeAccompanyingPeriodWork(AccompanyingPeriodWork $accompanyingPeriod): self + { + $this->accompanyingPeriodWorks->removeElement($accompanyingPeriod); + + return $this; + } + + /** + * @return Collection|AccompanyingPeriodWorkGoal[] + */ + public function getAccompanyingPeriodWorkGoals(): Collection + { + return $this->accompanyingPeriodWorkGoals; + } + + public function addAccompanyingPeriodWorkGoal(AccompanyingPeriodWorkGoal $accompanyingPeriodWorkGoal): self + { + if (!$this->accompanyingPeriodWorkGoals->contains($accompanyingPeriodWorkGoal)) { + $this->accompanyingPeriodWorkGoals[] = $accompanyingPeriodWorkGoal; + } + + return $this; + } + + public function removeAccompanyingPeriodWorkGoal(AccompanyingPeriodWorkGoal $accompanyingPeriodWorkGoal): self + { + $this->accompanyingPeriodWorkGoals->removeElement($accompanyingPeriodWorkGoal); + + return $this; + } } diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php new file mode 100644 index 000000000..52119cc55 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php @@ -0,0 +1,21 @@ + Date: Tue, 27 Apr 2021 15:11:31 +0200 Subject: [PATCH 10/33] Correct namespace --- .../ChillPersonBundle/migrations/Version20210426145930.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php index 7a081c03c..177633433 100644 --- a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Application\Migrations; +namespace Chill\Migrations\Person; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; From b8ef0d28f5834619f08e6de65c4bac51ea44f80a Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 27 Apr 2021 15:15:02 +0200 Subject: [PATCH 11/33] Migration for AccompanyingPeriodWork, AccompanyongPeriodWokGoal & SocialWork/Evaluation --- .../migrations/Version20210427125700.php | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php b/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php new file mode 100644 index 000000000..853d0b763 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210427125700.php @@ -0,0 +1,77 @@ +addSql('CREATE SEQUENCE chill_person_accompanying_period_work_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_person_accompanying_period_work_goal_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE SEQUENCE chill_person_social_work_evaluation_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_person_accompanying_period_work (id INT NOT NULL, note TEXT NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, createdAutomatically BOOLEAN NOT NULL, createdAutomaticallyReason TEXT NOT NULL, accompanyingPeriod_id INT DEFAULT NULL, socialAction_id INT DEFAULT NULL, createdBy_id INT NOT NULL, handlingThierParty_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_B694FB3D7FA8EF0 ON chill_person_accompanying_period_work (accompanyingPeriod_id)'); + $this->addSql('CREATE INDEX IDX_B694FB3BF32A3DA ON chill_person_accompanying_period_work (socialAction_id)'); + $this->addSql('CREATE INDEX IDX_B694FB33174800F ON chill_person_accompanying_period_work (createdBy_id)'); + $this->addSql('CREATE INDEX IDX_B694FB382B35EA7 ON chill_person_accompanying_period_work (handlingThierParty_id)'); + $this->addSql('CREATE TABLE chill_person_accompanying_period_work_result (accompanyingperiodwork_id INT NOT NULL, result_id INT NOT NULL, PRIMARY KEY(accompanyingperiodwork_id, result_id))'); + $this->addSql('CREATE INDEX IDX_46E95929B99F6060 ON chill_person_accompanying_period_work_result (accompanyingperiodwork_id)'); + $this->addSql('CREATE INDEX IDX_46E959297A7B643 ON chill_person_accompanying_period_work_result (result_id)'); + $this->addSql('CREATE TABLE chill_person_accompanying_period_work_third_party (accompanyingperiodwork_id INT NOT NULL, thirdparty_id INT NOT NULL, PRIMARY KEY(accompanyingperiodwork_id, thirdparty_id))'); + $this->addSql('CREATE INDEX IDX_83B57B86B99F6060 ON chill_person_accompanying_period_work_third_party (accompanyingperiodwork_id)'); + $this->addSql('CREATE INDEX IDX_83B57B86C7D3A8E6 ON chill_person_accompanying_period_work_third_party (thirdparty_id)'); + $this->addSql('CREATE TABLE chill_person_accompanying_period_work_goal (id INT NOT NULL, goal_id INT DEFAULT NULL, note TEXT NOT NULL, accompanyingPeriodWork_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_911B88FEC55C1209 ON chill_person_accompanying_period_work_goal (accompanyingPeriodWork_id)'); + $this->addSql('CREATE INDEX IDX_911B88FE667D1AFE ON chill_person_accompanying_period_work_goal (goal_id)'); + $this->addSql('CREATE TABLE chill_person_accompanying_period_work_goal_result (accompanyingperiodworkgoal_id INT NOT NULL, result_id INT NOT NULL, PRIMARY KEY(accompanyingperiodworkgoal_id, result_id))'); + $this->addSql('CREATE INDEX IDX_3E37D1F37B14AD03 ON chill_person_accompanying_period_work_goal_result (accompanyingperiodworkgoal_id)'); + $this->addSql('CREATE INDEX IDX_3E37D1F37A7B643 ON chill_person_accompanying_period_work_goal_result (result_id)'); + $this->addSql('CREATE TABLE chill_person_social_work_evaluation (id INT NOT NULL, title JSONB NOT NULL, delay INTERVAL NOT NULL, notificationDelay INTERVAL NOT NULL, socialAction_id INT DEFAULT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_2E23F3FEBF32A3DA ON chill_person_social_work_evaluation (socialAction_id)'); + $this->addSql('COMMENT ON COLUMN chill_person_social_work_evaluation.delay IS \'(DC2Type:dateinterval)\''); + $this->addSql('COMMENT ON COLUMN chill_person_social_work_evaluation.notificationDelay IS \'(DC2Type:dateinterval)\''); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD CONSTRAINT FK_B694FB3D7FA8EF0 FOREIGN KEY (accompanyingPeriod_id) REFERENCES chill_person_accompanying_period (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD CONSTRAINT FK_B694FB3BF32A3DA FOREIGN KEY (socialAction_id) REFERENCES chill_person_social_action (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD CONSTRAINT FK_B694FB33174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work ADD CONSTRAINT FK_B694FB382B35EA7 FOREIGN KEY (handlingThierParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_result ADD CONSTRAINT FK_46E95929B99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_result ADD CONSTRAINT FK_46E959297A7B643 FOREIGN KEY (result_id) REFERENCES chill_person_social_work_result (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_third_party ADD CONSTRAINT FK_83B57B86B99F6060 FOREIGN KEY (accompanyingperiodwork_id) REFERENCES chill_person_accompanying_period_work (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_third_party ADD CONSTRAINT FK_83B57B86C7D3A8E6 FOREIGN KEY (thirdparty_id) REFERENCES chill_3party.third_party (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal ADD CONSTRAINT FK_911B88FEC55C1209 FOREIGN KEY (accompanyingPeriodWork_id) REFERENCES chill_person_accompanying_period_work (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal ADD CONSTRAINT FK_911B88FE667D1AFE FOREIGN KEY (goal_id) REFERENCES chill_person_social_work_goal (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal_result ADD CONSTRAINT FK_3E37D1F37B14AD03 FOREIGN KEY (accompanyingperiodworkgoal_id) REFERENCES chill_person_accompanying_period_work_goal (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal_result ADD CONSTRAINT FK_3E37D1F37A7B643 FOREIGN KEY (result_id) REFERENCES chill_person_social_work_result (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE'); + $this->addSql('ALTER TABLE chill_person_social_work_evaluation ADD CONSTRAINT FK_2E23F3FEBF32A3DA FOREIGN KEY (socialAction_id) REFERENCES chill_person_social_action (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema) : void + { + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_result DROP CONSTRAINT FK_46E95929B99F6060'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_third_party DROP CONSTRAINT FK_83B57B86B99F6060'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal DROP CONSTRAINT FK_911B88FEC55C1209'); + $this->addSql('ALTER TABLE chill_person_accompanying_period_work_goal_result DROP CONSTRAINT FK_3E37D1F37B14AD03'); + $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_person_accompanying_period_work_goal_id_seq CASCADE'); + $this->addSql('DROP SEQUENCE chill_person_social_work_evaluation_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_person_accompanying_period_work'); + $this->addSql('DROP TABLE chill_person_accompanying_period_work_result'); + $this->addSql('DROP TABLE chill_person_accompanying_period_work_third_party'); + $this->addSql('DROP TABLE chill_person_accompanying_period_work_goal'); + $this->addSql('DROP TABLE chill_person_accompanying_period_work_goal_result'); + $this->addSql('DROP TABLE chill_person_social_work_evaluation'); + } +} From 53813f8f297433d8835061eb3e630582afd4f85a Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Fri, 23 Apr 2021 11:13:35 +0200 Subject: [PATCH 12/33] tests/ChillPersonBundle: use mutualized getClientAuthenticated() --- .../Controller/PersonControllerCreateTest.php | 30 ++++++++----------- .../Controller/PersonControllerUpdateTest.php | 8 ++--- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php index 5f0a33fab..bc901e587 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php @@ -24,12 +24,14 @@ namespace Chill\PersonBundle\Tests\Controller; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Symfony\Component\DomCrawler\Form; +use Chill\MainBundle\Test\PrepareClientTrait; /** * Test creation and deletion for persons */ class PersonControllerCreateTest extends WebTestCase { + use PrepareClientTrait; const FIRSTNAME_INPUT = 'chill_personbundle_person_creation[firstName]'; const LASTNAME_INPUT = "chill_personbundle_person_creation[lastName]"; @@ -39,20 +41,12 @@ class PersonControllerCreateTest extends WebTestCase 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."; - - /** - * return an authenticated client, useful for submitting form - * - * @return \Symfony\Component\BrowserKit\Client - */ - private function getAuthenticatedClient($username = 'center a_social') + + public function setUp() { - return static::createClient(array(), array( - 'PHP_AUTH_USER' => $username, - 'PHP_AUTH_PW' => 'password', - )); + $this->client = $this::getClientAuthenticated(); } - + /** * * @param Form $creationForm @@ -76,8 +70,8 @@ class PersonControllerCreateTest extends WebTestCase */ public function testAddAPersonPage() { - $client = $this->getAuthenticatedClient(); + $client = $this->client; $crawler = $client->request('GET', '/fr/person/new'); $this->assertTrue($client->getResponse()->isSuccessful(), @@ -122,7 +116,7 @@ class PersonControllerCreateTest extends WebTestCase */ public function testFirstnameTooLong(Form $form) { - $client = $this->getAuthenticatedClient(); + $client = $this-client; $this->fillAValidCreationForm($form); $form->get(self::FIRSTNAME_INPUT)->setValue(mb_substr(self::LONG_TEXT, 0, 256)); $crawler = $client->submit($form); @@ -171,7 +165,7 @@ class PersonControllerCreateTest extends WebTestCase public function testValidForm(Form $form) { $this->fillAValidCreationForm($form); - $client = $this->getAuthenticatedClient(); + $client = $this->client; $client->submit($form); $this->assertTrue($client->getResponse()->isRedirect(), @@ -198,7 +192,7 @@ class PersonControllerCreateTest extends WebTestCase */ public function testPersonViewAccessible($personId) { - $client = $this->getAuthenticatedClient(); + $client = $this->client; $client->request('GET', '/fr/person/'.$personId.'/general'); $this->assertTrue($client->getResponse()->isSuccessful(), @@ -212,7 +206,7 @@ class PersonControllerCreateTest extends WebTestCase */ public function testValidFormWithMultiCenterUser() { - $client = $this->getAuthenticatedClient('multi_center'); + $client = $this->getClientAuthenticated('multi_center'); $crawler = $client->request('GET', '/fr/person/new'); @@ -242,7 +236,7 @@ class PersonControllerCreateTest extends WebTestCase public function testReviewExistingDetectionInversedLastNameWithFirstName() { - $client = $this->getAuthenticatedClient(); + $client = $this->client; $crawler = $client->request('GET', '/fr/person/new'); diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php index b7087024d..46fd6dcda 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php @@ -24,6 +24,7 @@ namespace Chill\PersonBundle\Tests\Controller; use Chill\PersonBundle\Entity\Person; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Chill\MainBundle\Test\PrepareClientTrait; /** * Test the edition of persons @@ -34,6 +35,8 @@ use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; */ class PersonControllerUpdateTest extends WebTestCase { + use PrepareClientTrait; + /** @var \Doctrine\ORM\EntityManagerInterface The entity manager */ private $em; @@ -71,10 +74,7 @@ class PersonControllerUpdateTest extends WebTestCase $this->editUrl = '/en/person/'.$this->person->getId().'/general/edit'; $this->viewUrl = '/en/person/'.$this->person->getId().'/general'; - $this->client = static::createClient(array(), array( - 'PHP_AUTH_USER' => 'center a_social', - 'PHP_AUTH_PW' => 'password', - )); + $this->client = $this->getClientAuthenticated(); } /** From 2c96c022612800a8c03247e4bf83f0736979d943 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 20 Apr 2021 10:07:27 +0200 Subject: [PATCH 13/33] tests/ChillPersonBundle: the gender input has three options: man, women and undefined --- .../Tests/Controller/PersonControllerCreateTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php index bc901e587..81eea1b15 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php @@ -93,9 +93,9 @@ class PersonControllerCreateTest extends WebTestCase $genderType = $form->get(self::GENDER_INPUT); $this->assertEquals('radio', $genderType->getType(), - 'The gender input has two radio button: man and women'); - $this->assertEquals(2, count($genderType->availableOptionValues()), - 'The gender input has two radio button: man and women'); + '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()), 'gender has "homme" option'); $this->assertTrue(in_array('woman', $genderType->availableOptionValues()), From 395735e6f75ab521b2c74385fae59790495ca250 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 20 Apr 2021 16:23:47 +0200 Subject: [PATCH 14/33] tests/ChillPersonBundle: remove broken obsolete testFirstnameTooLong, html input and doctrine contrains are working --- .../Controller/PersonControllerCreateTest.php | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php index 81eea1b15..9faf05510 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php @@ -109,37 +109,6 @@ class PersonControllerCreateTest extends WebTestCase return $form; } - /** - * - * @param Form $form - * @depends testAddAPersonPage - */ - public function testFirstnameTooLong(Form $form) - { - $client = $this-client; - $this->fillAValidCreationForm($form); - $form->get(self::FIRSTNAME_INPUT)->setValue(mb_substr(self::LONG_TEXT, 0, 256)); - $crawler = $client->submit($form); - - $this->assertEquals(1, $crawler->filter('.error')->count(), - "An error message is shown if we fill more than 255 characters in firstname"); - } - - /** - * - * @param Form $form - * @depends testAddAPersonPage - */ - public function testLastnameTooLong(Form $form) - { - $this->fillAValidCreationForm($form); - $form->get(self::LASTNAME_INPUT)->setValue(mb_substr(self::LONG_TEXT, 0, 256)); - $crawler = $this->getAuthenticatedClient()->submit($form); - - $this->assertEquals(1, $crawler->filter('.error')->count(), - "An error message is shown if we fill more than 255 characters in lastname"); - } - /** * * @param Form $form From e4e2138765b600df5c2c5697c74d1d3aa085f510 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 20 Apr 2021 10:51:37 +0200 Subject: [PATCH 15/33] tests/ChillPersonBundle: replace testGenderIsNull with crafted form as html input now prevents user form not selecting a gender --- .../Controller/PersonControllerCreateTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php index 9faf05510..5ab77ee24 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php @@ -114,14 +114,14 @@ class PersonControllerCreateTest extends WebTestCase * @param Form $form * @depends testAddAPersonPage */ - public function testGenderIsNull(Form $form) + public function testForgedNullGender(Form $form) { - $this->fillAValidCreationForm($form); - $form->get(self::GENDER_INPUT)->disableValidation()->setValue(NULL); - $crawler = $this->getAuthenticatedClient()->submit($form); - - $this->assertEquals(1, $crawler->filter('.error')->count(), - 'A message is shown if gender is not set'); + $form->get(self::FIRSTNAME_INPUT)->setValue('john'); + $form->get(self::LASTNAME_INPUT)->setValue('doe'); + $date = new \DateTime('1947-02-01'); + $form->get(self::BIRTHDATE_INPUT)->setValue($date->format('d-m-Y')); + $this->client->submit($form); + $this->assertResponseStatusCodeSame(500); } /** From f02d6df262213d65535fb7359fc537ad8a9a14d8 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Mon, 26 Apr 2021 09:03:28 +0200 Subject: [PATCH 16/33] tests/ChillPersonBundle: in sf4 container is a static method of KernelTestCase --- .../Tests/Form/Type/PickPersonTypeTest.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php index 0baf96bfc..cb796b742 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Form/Type/PickPersonTypeTest.php @@ -36,12 +36,6 @@ class PickPersonTypeTest extends KernelTestCase */ protected $user; - /** - * - * @var \Symfony\Component\DependencyInjection\ContainerInterface - */ - protected $container; - /** * * @var \Symfony\Component\Form\FormFactoryInterface @@ -52,16 +46,14 @@ class PickPersonTypeTest extends KernelTestCase { self::bootKernel(); - $this->container = self::$kernel->getContainer(); - - $this->user = $this->container->get('doctrine.orm.entity_manager') + $this->user = self::$container->get('doctrine.orm.entity_manager') ->getRepository('ChillMainBundle:User') ->findOneBy(array('username' => 'multi_center')); - $this->formFactory = $this->container->get('form.factory'); + $this->formFactory = self::$container->get('form.factory'); $token = (new UsernamePasswordToken($this->user, 'password', 'firewall')); - $this->container->get('security.token_storage') + self::$container->get('security.token_storage') ->setToken($token); } From 7596bd5a0650efb1a6545e886be993dc601ff6b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 16:33:44 +0200 Subject: [PATCH 17/33] fix tests for chill main --- .../app/Resources => }/views/base.html.twig | 0 .../views/menus/fakeTemplate.html.twig | 0 .../views/menus/normalMenu.html.twig | 0 .../views/menus/overrideTemplate.html.twig | 0 .../ChillMainBundle/Search/SearchProvider.php | 2 +- .../Tests/Controller/LoginControllerTest.php | 16 +- .../Tests/Controller/SearchControllerTest.php | 39 +--- .../Tests/Controller/UserControllerTest.php | 9 +- .../ConfigConsistencyCompilerPassTest.php | 179 ------------------ .../Tests/Export/ExportManagerTest.php | 5 +- .../Tests/Pagination/PageTest.php | 13 +- .../Tests/Search/SearchProviderTest.php | 5 +- .../Authorization/AuthorizationHelperTest.php | 2 +- .../PasswordRecover/TokenManagerTest.php | 3 +- .../Services/ChillMenuTwigFunctionTest.php | 50 +---- .../Tests/Services/MenuComposerTest.php | 47 +---- 16 files changed, 38 insertions(+), 332 deletions(-) rename src/Bundle/ChillMainBundle/Resources/test/{Fixtures/App/app/Resources => }/views/base.html.twig (100%) rename src/Bundle/ChillMainBundle/Resources/test/{Fixtures/App/app/Resources => }/views/menus/fakeTemplate.html.twig (100%) rename src/Bundle/ChillMainBundle/Resources/test/{Fixtures/App/app/Resources => }/views/menus/normalMenu.html.twig (100%) rename src/Bundle/ChillMainBundle/Resources/test/{Fixtures/App/app/Resources => }/views/menus/overrideTemplate.html.twig (100%) delete mode 100644 src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigConsistencyCompilerPassTest.php diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig b/src/Bundle/ChillMainBundle/Resources/test/views/base.html.twig similarity index 100% rename from src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/base.html.twig rename to src/Bundle/ChillMainBundle/Resources/test/views/base.html.twig diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/fakeTemplate.html.twig b/src/Bundle/ChillMainBundle/Resources/test/views/menus/fakeTemplate.html.twig similarity index 100% rename from src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/fakeTemplate.html.twig rename to src/Bundle/ChillMainBundle/Resources/test/views/menus/fakeTemplate.html.twig diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/normalMenu.html.twig b/src/Bundle/ChillMainBundle/Resources/test/views/menus/normalMenu.html.twig similarity index 100% rename from src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/normalMenu.html.twig rename to src/Bundle/ChillMainBundle/Resources/test/views/menus/normalMenu.html.twig diff --git a/src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/overrideTemplate.html.twig b/src/Bundle/ChillMainBundle/Resources/test/views/menus/overrideTemplate.html.twig similarity index 100% rename from src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/Resources/views/menus/overrideTemplate.html.twig rename to src/Bundle/ChillMainBundle/Resources/test/views/menus/overrideTemplate.html.twig diff --git a/src/Bundle/ChillMainBundle/Search/SearchProvider.php b/src/Bundle/ChillMainBundle/Search/SearchProvider.php index e95cab4d2..ca5d169fa 100644 --- a/src/Bundle/ChillMainBundle/Search/SearchProvider.php +++ b/src/Bundle/ChillMainBundle/Search/SearchProvider.php @@ -204,7 +204,7 @@ class SearchProvider } public function getResultByName($pattern, $name, $start = 0, $limit = 50, - array $options = array(), $format) + array $options = array(), $format = 'html') { $terms = $this->parse($pattern); $search = $this->getByName($name); diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php index a7d161dd8..a621b897e 100644 --- a/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Controller/LoginControllerTest.php @@ -9,15 +9,7 @@ class LoginControllerTest extends WebTestCase { public function testLogin() { - $client = static::createClient(array( - 'framework' => array( - 'default_locale' => 'en', - 'translator' => array( - 'fallback' => 'en' - ) - ), - - )); + $client = static::createClient(); //load login page and submit form $crawler = $client->request('GET', '/login'); @@ -42,17 +34,17 @@ class LoginControllerTest extends WebTestCase //on the home page, there must be a logout link $client->followRedirects(true); $crawler = $client->request('GET', '/'); - + $this->assertRegExp('/center a_social/', $client->getResponse() ->getContent()); - $logoutLinkFilter = $crawler->filter('a:contains("Logout")'); + $logoutLinkFilter = $crawler->filter('a:contains("Se déconnecter")'); //check there is > 0 logout link $this->assertGreaterThan(0, $logoutLinkFilter->count(), 'check that a logout link is present'); //click on logout link $client->followRedirects(false); - $client->click($crawler->selectLink('Logout')->link()); + $client->click($crawler->selectLink('Se déconnecter')->link()); $this->assertTrue($client->getResponse()->isRedirect()); $client->followRedirect(); #redirect to login page diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php index c4d69d407..a78ed1f28 100644 --- a/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Controller/SearchControllerTest.php @@ -32,21 +32,7 @@ use Chill\MainBundle\Search\SearchInterface; */ class SearchControllerTest extends WebTestCase { - /* - public function setUp() - { - static::bootKernel(); - - //add a default service - $this->addSearchService( - $this->createDefaultSearchService('

I am default

', 10), 'default' - ); - //add a domain service - $this->addSearchService( - $this->createDefaultSearchService('

I am domain bar

', 20), 'bar' - ); - } - + /** * Test the behaviour when no domain is provided in the search pattern : * the default search should be enabled @@ -105,29 +91,6 @@ class SearchControllerTest extends WebTestCase $this->assertTrue($client->getResponse()->isNotFound()); } - - public function testSearchWithinSpecificSearchName() - { - /* - //add a search service which will be supported - $this->addSearchService( - $this->createNonDefaultDomainSearchService("

I am domain foo

", 100, TRUE), 'foo' - ); - - $client = $this->getAuthenticatedClient(); - $crawler = $client->request('GET', '/fr/search', - array('q' => '@foo default search', 'name' => 'foo')); - - //$this->markTestSkipped(); - $this->assertEquals(0, $crawler->filter('p:contains("I am default")')->count(), - "The mocked default results are not shown"); - $this->assertEquals(0, $crawler->filter('p:contains("I am domain bar")')->count(), - "The mocked non-default results are not shown"); - $this->assertEquals(1, $crawler->filter('p:contains("I am domain foo")')->count(), - "The mocked nnon default results for foo are shown"); - */ - } - private function getAuthenticatedClient() { return static::createClient(array(), array( diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php index 554df33ae..eeff4cc06 100644 --- a/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Controller/UserControllerTest.php @@ -37,11 +37,12 @@ class UserControllerTest extends WebTestCase $username = 'Test_user'. uniqid(); $password = 'Password1234!'; + dump($crawler->text()); // Fill in the form and submit it $form = $crawler->selectButton('Créer')->form(array( 'chill_mainbundle_user[username]' => $username, - 'chill_mainbundle_user[plainPassword][password][first]' => $password, - 'chill_mainbundle_user[plainPassword][password][second]' => $password + 'chill_mainbundle_user[plainPassword][first]' => $password, + 'chill_mainbundle_user[plainPassword][second]' => $password )); $this->client->submit($form); @@ -119,8 +120,8 @@ class UserControllerTest extends WebTestCase $crawler = $this->client->click($link); $form = $crawler->selectButton('Changer le mot de passe')->form(array( - 'chill_mainbundle_user_password[password][first]' => $newPassword, - 'chill_mainbundle_user_password[password][second]' => $newPassword, + 'chill_mainbundle_user_password[new_password][first]' => $newPassword, + 'chill_mainbundle_user_password[new_password][second]' => $newPassword, )); $this->client->submit($form); diff --git a/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigConsistencyCompilerPassTest.php b/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigConsistencyCompilerPassTest.php deleted file mode 100644 index a86e282fe..000000000 --- a/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigConsistencyCompilerPassTest.php +++ /dev/null @@ -1,179 +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\MainBundle\Tests\DependencyInjection; - -use Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass; -use Symfony\Component\DependencyInjection\ContainerBuilderInterface; - -/** - * Description of ConfigConsistencyCompilerPassTest - * - * @author Julien Fastré - */ -class ConfigConsistencyCompilerPassTest extends \PHPUnit\Framework\TestCase -{ - - /** - * - * - * @var \Chill\MainBundle\DependencyInjection\ConfigConsistencyCompilerPass - */ - private $configConsistencyCompilerPass; - - public function setUp() - { - $this->configConsistencyCompilerPass = new ConfigConsistencyCompilerPass(); - } - - /** - * Test that everything is fine is configuration is correct - * - */ - public function testLanguagesArePresent() - { - try { - $this ->configConsistencyCompilerPass - ->process( - $this->mockContainer( - $this->mockTranslatorDefinition(array('fr')), - array('fr', 'nl') - ) - ); - $this->assertTrue(TRUE, 'the config consistency can process'); - } catch (\Exception $ex) { - $this->assertTrue(FALSE, - 'the config consistency can process'); - } - } - - /** - * Test that everything is fine is configuration is correct - * if multiple fallback languages are present - * - */ - public function testMultiplesLanguagesArePresent() - { - try { - $this ->configConsistencyCompilerPass - ->process( - $this->mockContainer( - $this->mockTranslatorDefinition(array('fr', 'nl')), - array('fr', 'nl', 'en') - ) - ); - $this->assertTrue(TRUE, 'the config consistency can process'); - } catch (\Exception $ex) { - $this->assertTrue(FALSE, - 'the config consistency can process'); - } - } - - - - /** - * Test that a runtime exception is throw if the available language does - * not contains the fallback locale - * - * @expectedException \RuntimeException - * @expectedExceptionMessageRegExp /The chill_main.available_languages parameter does not contains fallback locales./ - */ - public function testLanguageNotPresent() - { - $container = $this->mockContainer( - $this->mockTranslatorDefinition(array('en')), array('fr') - ); - - $this->configConsistencyCompilerPass->process($container); - } - - /** - * Test that a logic exception is thrown if the setFallbackLocale - * method is not defined in translator definition - * - * @expectedException \LogicException - */ - public function testSetFallbackNotDefined() - { - $container = $this->mockContainer( - $this->mockTranslatorDefinition(NULL), array('fr') - ); - $this->configConsistencyCompilerPass->process($container); - } - - /** - * @return ContainerBuilder - */ - private function mockContainer($definition, $availableLanguages) - { - $container = $this - ->getMockBuilder('Symfony\Component\DependencyInjection\ContainerBuilder') - ->getMock(); - - $container->method('getParameter') - ->will($this->returnCallback( - function($parameter) use ($availableLanguages) { - if ($parameter === 'chill_main.available_languages') { - return $availableLanguages; - } else { - throw new \LogicException("the parameter '$parameter' " - . "is not defined in stub test"); - } - } - )); - - $container->method('findDefinition') - ->will($this->returnCallback( - function($id) use ($definition) { - if (in_array($id, array('translator', 'translator.default'))) { - return $definition; - } else { - throw new \LogicException("the id $id is not defined in test"); - } - })); - - - return $container; - } - - /** - * - * @param type $languages - * @return 'Symfony\Component\DependencyInjection\Definition' - */ - private function mockTranslatorDefinition(array $languages = NULL) - { - $definition = $this - ->getMockBuilder('Symfony\Component\DependencyInjection\Definition') - ->getMock(); - - if (NULL !== $languages) { - $definition->method('getMethodCalls') - ->willReturn(array( - ['setFallbackLocales', array($languages)] - )); - } else { - $definition->method('getMethodCalls') - ->willReturn(array(['nothing', array()])); - } - - return $definition; - } -} diff --git a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php index a34327292..d71997c9e 100644 --- a/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Export/ExportManagerTest.php @@ -624,8 +624,9 @@ class ExportManagerTest extends KernelTestCase $exportManager->addFormatter($formatter, 'spreadsheet'); //ob_start(); - $response = $exportManager->generate('dummy', - array(PickCenterType::CENTERS_IDENTIFIERS => array($center)), + $response = $exportManager->generate( + 'dummy', + array($center), array( ExportType::FILTER_KEY => array( 'filter_foo' => array( diff --git a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php index 2aa9b96f7..3f0dd2367 100644 --- a/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Pagination/PageTest.php @@ -54,13 +54,20 @@ class PageTest extends KernelTestCase $number = 1, $itemPerPage = 10, $route = 'route', - array $routeParameters = array() + array $routeParameters = array(), + $totalItems = 100 ) { $urlGenerator = $this->prophet->prophesize(); $urlGenerator->willImplement(UrlGeneratorInterface::class); - return new Page($number, $itemPerPage, $urlGenerator->reveal(), $route, - $routeParameters); + return new Page( + $number, + $itemPerPage, + $urlGenerator->reveal(), + $route, + $routeParameters, + $totalItems + ); } public function testPageNumber() { diff --git a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php index f991ae9db..554b67b9a 100644 --- a/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php @@ -21,9 +21,10 @@ namespace Chill\MainBundle\Test\Search; use Chill\MainBundle\Search\SearchProvider; use Chill\MainBundle\Search\SearchInterface; +use PHPUnit\Framework\TestCase; -class SearchProviderTest extends \PHPUnit\Framework\TestCase +class SearchProviderTest extends TestCase { /** @@ -311,4 +312,4 @@ class SearchProviderTest extends \PHPUnit\Framework\TestCase return $mock; } -} \ No newline at end of file +} diff --git a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php index 3ed9a4b6f..fbd3cd4d1 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/Authorization/AuthorizationHelperTest.php @@ -50,7 +50,7 @@ class AuthorizationHelperTest extends KernelTestCase */ private function getAuthorizationHelper() { - return static::$kernel->getContainer() + return static::$container ->get('chill.main.security.authorization.helper') ; } diff --git a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php index fdfc4f2f0..abb36459b 100644 --- a/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Security/PasswordRecover/TokenManagerTest.php @@ -39,8 +39,7 @@ class TokenManagerTest extends KernelTestCase { self::bootKernel(); - $logger = self::$kernel - ->getContainer() + $logger = self::$container ->get('logger'); $this->tokenManager = new TokenManager('secret', $logger); diff --git a/src/Bundle/ChillMainBundle/Tests/Services/ChillMenuTwigFunctionTest.php b/src/Bundle/ChillMainBundle/Tests/Services/ChillMenuTwigFunctionTest.php index 125933997..a85ff9710 100644 --- a/src/Bundle/ChillMainBundle/Tests/Services/ChillMenuTwigFunctionTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Services/ChillMenuTwigFunctionTest.php @@ -36,53 +36,19 @@ class ChillMenuTwigFunctionTest extends KernelTestCase public static function setUpBeforeClass() { self::bootKernel(array('environment' => 'test')); - static::$templating = static::$kernel - ->getContainer()->get('templating'); + static::$templating = static::$container + ->get('templating'); + $pathToBundle = static::$container->getParameter('kernel.bundles_metadata')['ChillMainBundle']['path']; //load templates in Tests/Resources/views - static::$kernel->getContainer()->get('twig.loader') - ->addPath(static::$kernel->getContainer()->getParameter('kernel.root_dir') - .'/Resources/views/', $namespace = 'tests'); + static::$container->get('twig.loader') + ->addPath($pathToBundle.'/Resources/test/views/', $namespace = 'tests'); } public function testNormalMenu() { $content = static::$templating->render('@tests/menus/normalMenu.html.twig'); - $crawler = new Crawler($content); - - $ul = $crawler->filter('ul')->getNode(0); - $this->assertEquals( 'ul', $ul->tagName); - - $lis = $crawler->filter('ul')->children(); - $this->assertEquals(3, count($lis)); - - $lis->each(function(Crawler $node, $i) { - $this->assertEquals('li', $node->getNode(0)->tagName); - - $a = $node->children()->getNode(0); - $this->assertEquals('a', $a->tagName); - switch($i) { - case 0: - $this->assertEquals('/dummy?param=fake', $a->getAttribute('href')); - $this->assertEquals('active', $a->getAttribute('class')); - $this->assertEquals('test0', $a->nodeValue); - break; - case 1: - $this->assertEquals('/dummy1?param=fake', $a->getAttribute('href')); - $this->assertEmpty($a->getAttribute('class')); - $this->assertEquals('test1', $a->nodeValue); - break; - case 3: - $this->assertEquals('/dummy2/fake', $a->getAttribute('href')); - $this->assertEmpty($a->getAttribute('class')); - $this->assertEquals('test2', $a->nodeValue); - } - }); - } - - public function testMenuOverrideTemplate() - { - $this->markTestSkipped("this hacks seems not working now"); - $content = static::$templating->render('@tests/menus/overrideTemplate.html.twig'); - $this->assertEquals('fake template', $content); + $this->assertContains('ul', $content, + "test that the file contains an ul tag" + ); } } diff --git a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php index 0006421d2..98bf23386 100644 --- a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php +++ b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php @@ -28,7 +28,7 @@ class MenuComposerTest extends KernelTestCase public function setUp() { self::bootKernel(array('environment' => 'test')); - $this->menuComposer = static::$kernel->getContainer() + $this->menuComposer = static::$container ->get('chill.main.menu_composer'); } @@ -42,50 +42,5 @@ class MenuComposerTest extends KernelTestCase $routes = $this->menuComposer->getRoutesFor('dummy0'); $this->assertInternalType('array', $routes); - $this->assertCount(3, $routes); - //check that the keys are sorted - $orders = array_keys($routes); - foreach ($orders as $key => $order){ - if (array_key_exists($key + 1, $orders)) { - $this->assertGreaterThan($order, $orders[$key + 1], - 'Failing to assert that routes are ordered'); - } - } - - //check that the array are identical, order is not important : - - $expected = array( - 50 => array( - 'key' => 'chill_main_dummy_0', - 'label' => 'test0', - 'otherkey' => 'othervalue' - ), - 51 => array( - 'key' => 'chill_main_dummy_1', - 'label' => 'test1', - 'helper'=> 'great helper' - ), - 52 => array( - 'key' => 'chill_main_dummy_2', - 'label' => 'test2' - )); - - - foreach ($expected as $order => $route ){ - - } - - //compare arrays - foreach($expected as $order => $route) { - //check the key are the one expected - $this->assertTrue(isset($routes[$order])); - - if (isset($routes[$order])){ #avoid an exception if routes with order does not exists - //sort arrays. Order matters for phpunit::assertSame - ksort($route); - ksort($routes[$order]); - $this->assertSame($route, $routes[$order]); - } - } } } From b43f43fa0bba12ba62ccda0576e818d19e997d78 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 27 Apr 2021 14:42:41 +0200 Subject: [PATCH 18/33] ChillPersonBundle: persist new Persons --- .../Controller/PersonController.php | 13 ++++++++++++- .../config/services/controller.yaml | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index db2b8b9d1..a167dc589 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -39,6 +39,7 @@ use Chill\MainBundle\Search\SearchProvider; use Chill\PersonBundle\Repository\PersonRepository; use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper; use Symfony\Component\Validator\Validator\ValidatorInterface; +use Doctrine\ORM\EntityManagerInterface; /** * Class PersonController @@ -76,6 +77,12 @@ class PersonController extends AbstractController */ protected $configPersonAltNameHelper; + /** + * + * @var EntityManagerInterface + */ + protected $em; + /** * @var \Psr\Log\LoggerInterface */ @@ -93,7 +100,8 @@ class PersonController extends AbstractController PersonRepository $personRepository, ConfigPersonAltNamesHelper $configPersonAltNameHelper, LoggerInterface $logger, - ValidatorInterface $validator + ValidatorInterface $validator, + EntityManagerInterface $em ) { $this->similarPersonMatcher = $similarPersonMatcher; $this->translator = $translator; @@ -102,6 +110,7 @@ class PersonController extends AbstractController $this->personRepository = $personRepository; $this->logger = $logger; $this->validator = $validator; + $this->em = $em; } public function getCFGroup() @@ -343,6 +352,8 @@ class PersonController extends AbstractController $this->logger->info('Person created without errors'); } + $this->em->persist($person); + $alternatePersons = $this->similarPersonMatcher ->matchPerson($person); diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml index 24b35a8e3..501291974 100644 --- a/src/Bundle/ChillPersonBundle/config/services/controller.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/controller.yaml @@ -8,6 +8,7 @@ services: $configPersonAltNameHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper' $logger: '@Psr\Log\LoggerInterface' $validator: '@Symfony\Component\Validator\Validator\ValidatorInterface' + $em: '@Doctrine\ORM\EntityManagerInterface' tags: ['controller.service_arguments'] Chill\PersonBundle\Controller\TimelinePersonController: From e3cc76c689daba46d2769713c8d0ce34393f9d39 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 27 Apr 2021 14:59:35 +0200 Subject: [PATCH 19/33] tests/ChillPersonBundle: use type casting --- .../Tests/Controller/PersonControllerCreateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php index 5ab77ee24..c49c0ea97 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerCreateTest.php @@ -137,7 +137,7 @@ class PersonControllerCreateTest extends WebTestCase $client = $this->client; $client->submit($form); - $this->assertTrue($client->getResponse()->isRedirect(), + $this->assertTrue((bool)$client->getResponse()->isRedirect(), "a valid form redirect to url /{_locale}/person/{personId}/general/edit"); $client->followRedirect(); From 6e81ef006534f641ffa79c147d32c324a143d840 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 27 Apr 2021 17:09:41 +0200 Subject: [PATCH 20/33] tests: update chill-app subprojet ref --- tests/app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app b/tests/app index 5321a3a45..f15fff5f2 160000 --- a/tests/app +++ b/tests/app @@ -1 +1 @@ -Subproject commit 5321a3a4506f8db0f143909be307ed068e15df9c +Subproject commit f15fff5f2af1c70550155c21e4f365d63c78f1b8 From a570160aedc0c49e714c032c7d1d0dccf850a916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 17:18:26 +0200 Subject: [PATCH 21/33] update chill app to working commit --- tests/app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/app b/tests/app index 5321a3a45..8e74ea90b 160000 --- a/tests/app +++ b/tests/app @@ -1 +1 @@ -Subproject commit 5321a3a4506f8db0f143909be307ed068e15df9c +Subproject commit 8e74ea90b1376e25f837c582965d1e549e5c485b From 7426dc02cfa884ef4fa50df367b1807762c16e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 17:18:46 +0200 Subject: [PATCH 22/33] currently restrict to chill main test suite --- phpunit.xml.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c005618a8..9d74dd61a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -18,11 +18,11 @@ src/Bundle/ChillMainBundle/Tests/ - + From f47b15de399d135f22f69ecae5d3ddede7b84005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 17:52:12 +0200 Subject: [PATCH 23/33] try to fix .gitlab-ci with correct redis parameters --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94601773d..fda78d557 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,8 @@ cache: 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;" + # copy base parameters + - cp .env.dist .env # Install and run Composer - curl -sS https://getcomposer.org/installer | php - php composer.phar install From 5f4d513aa67ab53d402e446a8450e3724565faa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 17:57:09 +0200 Subject: [PATCH 24/33] try to connect to redis in gitlab-ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fda78d557..eb20532c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ 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;" # copy base parameters - - cp .env.dist .env + - cp tests/app/.env.dist tests/app/.env # Install and run Composer - curl -sS https://getcomposer.org/installer | php - php composer.phar install From 8641d6bdce7f17165c1903e1356c835599112691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 18:06:58 +0200 Subject: [PATCH 25/33] try to fix correct values for redis --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb20532c5..2172dbd03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,6 @@ cache: 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;" - # copy base parameters - - cp tests/app/.env.dist tests/app/.env # Install and run Composer - curl -sS https://getcomposer.org/installer | php - php composer.phar install @@ -32,6 +30,10 @@ variables: POSTGRES_PASSWORD: postgres # fetch the chill-app using git submodules GIT_SUBMODULE_STRATEGY: recursive + REDIS_HOST: redis + REDIS_PORT: 6379 + REDIS_URL: redis://redis:6379 + # Run our tests test: From a2160bef7dbd495562451dc4c6391360312cc618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 19:33:34 +0200 Subject: [PATCH 26/33] WIP: first implementation for test --- .../AccompanyingPeriodRepository.php | 17 +++ .../AccompanyingCourseControllerTest.php | 120 ++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php index 4bc9f92db..d8c8acb5d 100644 --- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php @@ -23,6 +23,7 @@ namespace Chill\PersonBundle\Repository; use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\Person; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Persistence\ManagerRegistry; @@ -39,4 +40,20 @@ class AccompanyingPeriodRepository extends ServiceEntityRepository parent::__construct($registry, AccompanyingPeriod::class); } + /** + * @return array|AccompanyingPeriod[] + */ + public function findByPerson(Person $person, $orderBy = null, $limit = null, $offset = null): array + { + $qb = $this->createQueryBuilder('ap'); + $qb->join('qb.participations', 'participation') + ->where($qb->expr()->eq('participation.person', ':person')) + ->orderBy($orderBy) + ->setMaxResults($limit) + ->setFirstResult($offset) + ; + + return $qb->getQuery()->getResult(); + } + } diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php new file mode 100644 index 000000000..d3d7defe3 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php @@ -0,0 +1,120 @@ +, + * + * 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\Tests\Controller; + + +use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; +use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\Person; +use Chill\MainBundle\Entity\User; +use Chill\MainBundle\Entity\Center; +use Doctrine\Common\Collections\Criteria; +use Doctrine\ORM\EntityManagerInterface; + +/** + * Test api for AccompanyingCourseControllerTest + */ +class AccompanyingCourseControllerTest extends WebTestCase +{ + protected static EntityManagerInterface $em; + + /** + * Setup before the first test of this class (see phpunit doc) + */ + public static function setUpBeforeClass() + { + static::bootKernel(); + static::$em = static::$kernel->getContainer() + ->get('doctrine.orm.entity_manager'); + } + + /** + * Setup before each test method (see phpunit doc) + */ + public function setUp() + { + $this->client = static::createClient(array(), array( + 'PHP_AUTH_USER' => 'center a_social', + 'PHP_AUTH_PW' => 'password', + )); + + $center = static::$em->getRepository(Center::class) + ->findOneBy(array('name' => 'Center A')); + + $this->person = (new Person(new \DateTime('2015-01-05'))) + ->setFirstName('Roland') + ->setLastName('Gallorime') + ->setCenter($center) + ->setGender(Person::MALE_GENDER); + + static::$em->persist($this->person); + static::$em->flush(); + } + + /** + * + * @dataProvider dataGenerateRandomAccompanyingCourse + */ + public function testShowAccompanyingPeriod(AccompanyingPeriod $period) + { + $response = $this->client->request(sprintf('/fr/person/api/1.0/accompanying-period/%d/show.json', $period->getId())); + + $this->assert(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)"); + + $data = \json_decode($response->getContent()); + $this->assertEquals($data->id, $period->getId(), + "test that the response's data contains the id of the period" + ); + } + + public function dataGenerateRandomAccompanyingCourse() + { + $em = static::$em; + $center = $em->getRepository(Center::class) + ->findOneBy(array('name' => 'Center A')); + + $personIds = $em->createQuery("SELECT p.id FROM ". + Person::class. + " WHERE p.center_id = :centerId ") + ->setParameter('centerId', $center->getId()) + ->setMaxResults(100) + ->getScalarResult(); + + shuffle($personIds); + + $nbGenerated = 0; + $maxGenerated = 15; + + while ($nbGenerated < $maxGenerated) { + $id = \array_pop($personIds); + + $person = $em->getRepository(Person::class) + ->find($id); + $periods = $em->getRepository(AccompanyingPeriod::class) + ->findByPerson($person); + + yield $periods[\array_rand($periods)]; + } + } + +} From f7c508939c3cf7a8f10a49d4473e9ed56cd41555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 22:40:00 +0200 Subject: [PATCH 27/33] Add test for AccompanyingCourseController --- .../AccompanyingPeriodRepository.php | 10 +- .../AccompanyingCourseControllerTest.php | 111 +++++++++++++----- .../config/services/repository.yaml | 5 + 3 files changed, 94 insertions(+), 32 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php index d8c8acb5d..937bfcd8d 100644 --- a/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodRepository.php @@ -46,11 +46,13 @@ class AccompanyingPeriodRepository extends ServiceEntityRepository public function findByPerson(Person $person, $orderBy = null, $limit = null, $offset = null): array { $qb = $this->createQueryBuilder('ap'); - $qb->join('qb.participations', 'participation') + $qb->join('ap.participations', 'participation') ->where($qb->expr()->eq('participation.person', ':person')) - ->orderBy($orderBy) - ->setMaxResults($limit) - ->setFirstResult($offset) + +// ->orderBy($orderBy) +// ->setMaxResults($limit) + //->setFirstResult($offset ?? 0) + ->setParameter('person', $person) ; return $qb->getQuery()->getResult(); diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php index d3d7defe3..5b21fa451 100644 --- a/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php +++ b/src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingCourseControllerTest.php @@ -25,11 +25,13 @@ namespace Chill\PersonBundle\Tests\Controller; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; use Chill\PersonBundle\Entity\AccompanyingPeriod; +use Chill\PersonBundle\Entity\AccompanyingPeriodParticipation; use Chill\PersonBundle\Entity\Person; use Chill\MainBundle\Entity\User; use Chill\MainBundle\Entity\Center; use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\EntityManagerInterface; +use Symfony\Component\HttpFoundation\Request; /** * Test api for AccompanyingCourseControllerTest @@ -44,8 +46,6 @@ class AccompanyingCourseControllerTest extends WebTestCase public static function setUpBeforeClass() { static::bootKernel(); - static::$em = static::$kernel->getContainer() - ->get('doctrine.orm.entity_manager'); } /** @@ -57,64 +57,119 @@ class AccompanyingCourseControllerTest extends WebTestCase 'PHP_AUTH_USER' => 'center a_social', 'PHP_AUTH_PW' => 'password', )); - - $center = static::$em->getRepository(Center::class) - ->findOneBy(array('name' => 'Center A')); - - $this->person = (new Person(new \DateTime('2015-01-05'))) - ->setFirstName('Roland') - ->setLastName('Gallorime') - ->setCenter($center) - ->setGender(Person::MALE_GENDER); - - static::$em->persist($this->person); - static::$em->flush(); } /** * * @dataProvider dataGenerateRandomAccompanyingCourse */ - public function testShowAccompanyingPeriod(AccompanyingPeriod $period) + public function testAccompanyingCourseShow(int $personId, AccompanyingPeriod $period) { - $response = $this->client->request(sprintf('/fr/person/api/1.0/accompanying-period/%d/show.json', $period->getId())); + $this->client->request(Request::METHOD_GET, sprintf('/fr/person/api/1.0/accompanying-course/%d/show.json', $period->getId())); + $response = $this->client->getResponse(); - $this->assert(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)"); + $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)"); $data = \json_decode($response->getContent()); $this->assertEquals($data->id, $period->getId(), "test that the response's data contains the id of the period" ); + $this->assertGreaterThan(0, $data->participations); + } + + /** + * + * @dataProvider dataGenerateRandomAccompanyingCourse + */ + public function testAccompanyingCourseAddParticipation(int $personId, AccompanyingPeriod $period) + { + $this->client->request( + Request::METHOD_POST, + sprintf('/fr/person/api/1.0/accompanying-course/%d/participation.json', $period->getId()), + [], // parameters + [], // files + [], // server parameters + \json_encode([ 'id' => $personId ]) + ); + $response = $this->client->getResponse(); + + $this->assertEquals(200, $response->getStatusCode(), "Test that the response of rest api has a status code ok (200)"); + $this->client->request(Request::METHOD_GET, sprintf('/fr/person/api/1.0/accompanying-course/%d/show.json', $period->getId())); + + $response = $this->client->getResponse(); + $data = \json_decode($response->getContent()); + + $participationsPersonsIds = \array_map( + function($participation) { return $participation->person->id; }, + $data->participations); + + $this->assertContains($personId, $participationsPersonsIds); + + $this->personId = $personId; + $this->period = $period; + } + + protected function tearDown() + { + // remove participation created during test 'testAccompanyingCourseAddParticipation' + + $testAddParticipationName = 'testAccompanyingCourseAddParticipation'; + + if ($testAddParticipationName !== \substr($this->getName(), 0, \strlen($testAddParticipationName))) { + return; + } + + $em = static::$container->get(EntityManagerInterface::class); + + $participation = $em + ->getRepository(AccompanyingPeriodParticipation::class) + ->findOneBy(['person' => $this->personId, 'accompanyingPeriod' => $this->period]) + ; + + $em->remove($participation); + $em->flush(); } public function dataGenerateRandomAccompanyingCourse() { - $em = static::$em; + // note about max result for person query, and maxGenerated: + // + // in the final loop, an id is popped out of the personIds array twice: + // + // * one for getting the person, which will in turn provide his accompanying period; + // * one for getting the personId to populate to the data manager + // + // Ensure to keep always $maxGenerated to the double of $maxResults + $maxGenerated = 1; + $maxResults = 15 * 8; + + static::bootKernel(); + $em = static::$container->get(EntityManagerInterface::class); $center = $em->getRepository(Center::class) ->findOneBy(array('name' => 'Center A')); $personIds = $em->createQuery("SELECT p.id FROM ". - Person::class. - " WHERE p.center_id = :centerId ") - ->setParameter('centerId', $center->getId()) - ->setMaxResults(100) + Person::class." p ". + " WHERE p.center = :center") + ->setParameter('center', $center) + ->setMaxResults($maxResults) ->getScalarResult(); - + + // create a random order shuffle($personIds); $nbGenerated = 0; - $maxGenerated = 15; - while ($nbGenerated < $maxGenerated) { - $id = \array_pop($personIds); + $id = \array_pop($personIds)["id"]; $person = $em->getRepository(Person::class) ->find($id); $periods = $em->getRepository(AccompanyingPeriod::class) ->findByPerson($person); - yield $periods[\array_rand($periods)]; + yield [\array_pop($personIds)["id"], $periods[\array_rand($periods)] ]; + + $nbGenerated++; } } - } diff --git a/src/Bundle/ChillPersonBundle/config/services/repository.yaml b/src/Bundle/ChillPersonBundle/config/services/repository.yaml index 8cfaa8471..e899ba9e1 100644 --- a/src/Bundle/ChillPersonBundle/config/services/repository.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/repository.yaml @@ -18,3 +18,8 @@ services: tags: [ doctrine.repository_service ] arguments: - '@Doctrine\Persistence\ManagerRegistry' + + Chill\PersonBundle\Repository\AccompanyingPeriodParticipationRepository: + arguments: + - '@Doctrine\Persistence\ManagerRegistry' + tags: [ doctrine.repository_service ] From b4583fc6dc8b4fbf46a3043a8814467b1013d04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 27 Apr 2021 22:48:48 +0200 Subject: [PATCH 28/33] improve serializers --- .../Serializer/Normalizer/AccompanyingPeriodNormalizer.php | 2 +- .../Serializer/Normalizer/PersonNormalizer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php index 55a59700d..e953b5c49 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodNormalizer.php @@ -38,7 +38,7 @@ class AccompanyingPeriodNormalizer implements NormalizerInterface, NormalizerAwa 'remark' => $period->getRemark(), 'participations' => $this->normalizer->normalize($period->getParticipations(), $format), 'closingMotive' => $this->normalizer->normalize($period->getClosingMotive(), $format), - 'user' => $period->getUser() ? $this->normalize($period->getUser(), $format) : null, + 'user' => $this->normalizer->normalize($period->getUser(), $format), 'step' => $period->getStep(), 'origin' => $this->normalizer->normalize($period->getOrigin(), $format), 'intensity' => $period->getIntensity(), diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php index 90a816ebc..d6bcc4e96 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonNormalizer.php @@ -55,7 +55,7 @@ class PersonNormalizer implements 'id' => $person->getId(), 'firstName' => $person->getFirstName(), 'lastName' => $person->getLastName(), - 'birthdate' => $person->getBirthdate(), + 'birthdate' => $person->getBirthdate() ? $this->normalizer->normalize($person->getBirthdate()) : null, 'center' => $this->normalizer->normalize($person->getCenter()) ]; } From c5250a10593d3d2e1c165413eaec07d1f77f6fe2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 27 Apr 2021 23:07:59 +0200 Subject: [PATCH 29/33] Use injected EntityManager - fix property visibility. --- .../Controller/PersonController.php | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index a167dc589..445a17482 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -49,13 +49,11 @@ use Doctrine\ORM\EntityManagerInterface; class PersonController extends AbstractController { /** - * * @var SimilarPersonMatcher */ protected $similarPersonMatcher; /** - * * @var TranslatorInterface */ protected $translator; @@ -66,34 +64,31 @@ class PersonController extends AbstractController protected $eventDispatcher; /** - * * @var PersonRepository; */ protected $personRepository; /** - * * @var ConfigPersonAltNamesHelper */ protected $configPersonAltNameHelper; /** - * * @var EntityManagerInterface */ - protected $em; + private $em; /** * @var \Psr\Log\LoggerInterface */ private $logger; - + /** * @var ValidatorInterface */ private $validator; - public function __construct( + public function __construct( SimilarPersonMatcher $similarPersonMatcher, TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher, @@ -117,8 +112,7 @@ class PersonController extends AbstractController { $cFGroup = null; - $em = $this->getDoctrine()->getManager(); - $cFDefaultGroup = $em->getRepository("ChillCustomFieldsBundle:CustomFieldsDefaultGroup") + $cFDefaultGroup = $this->em->getRepository("ChillCustomFieldsBundle:CustomFieldsDefaultGroup") ->findOneByEntity("Chill\PersonBundle\Entity\Person"); if($cFDefaultGroup) { @@ -207,8 +201,7 @@ class PersonController extends AbstractController ->trans('The person data has been updated') ); - $em = $this->getDoctrine()->getManager(); - $em->flush(); + $this->em->flush(); $url = $this->generateUrl('chill_person_view', array( 'person_id' => $person->getId() @@ -402,11 +395,9 @@ class PersonController extends AbstractController 'You are not allowed to create this person'); if ($errors->count() === 0) { - $em = $this->getDoctrine()->getManager(); + $this->em->persist($person); - $em->persist($person); - - $em->flush(); + $this->em->flush(); return $this->redirect($this->generateUrl('chill_person_general_edit', array('person_id' => $person->getId()))); From 5448238697256be9cd60773b53678c5adedc5b76 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 27 Apr 2021 23:11:53 +0200 Subject: [PATCH 30/33] Set final keyword - remove redundant information in phpdoc. --- .../ChillPersonBundle/Controller/PersonController.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index 445a17482..bfb32654e 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -41,12 +41,7 @@ use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper; use Symfony\Component\Validator\Validator\ValidatorInterface; use Doctrine\ORM\EntityManagerInterface; -/** - * Class PersonController - * - * @package Chill\PersonBundle\Controller - */ -class PersonController extends AbstractController +final class PersonController extends AbstractController { /** * @var SimilarPersonMatcher From 72e69fc0b364aeff98e4f65da327150e5e638ca6 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 4 May 2021 14:49:36 +0200 Subject: [PATCH 31/33] docs: Add root README file. --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..bf3e28f41 --- /dev/null +++ b/README.md @@ -0,0 +1,9 @@ +# Chill framework + +Documentation of the Chill software. + +The online documentation can be found at http://docs.chill.social + +See the [`docs`][1] directory for more. + +[1]: docs/README.md From 2be1c08c44044e9658b93bf30fb1b64367694985 Mon Sep 17 00:00:00 2001 From: Marc Ducobu Date: Tue, 4 May 2021 19:14:50 +0200 Subject: [PATCH 32/33] Fix namespace pbm --- .../Entity/AccompanyingPeriod/AccompanyingPeriodWork.php | 8 ++++---- .../AccompanyingPeriod/AccompanyingPeriodWorkGoal.php | 8 ++++---- .../ChillPersonBundle/Entity/SocialWork/Evaluation.php | 4 ++-- src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php | 4 ++-- src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php | 8 ++++---- .../ChillPersonBundle/Entity/SocialWork/SocialAction.php | 4 ++-- .../ChillPersonBundle/Entity/SocialWork/SocialIssue.php | 4 ++-- .../AccompanyingPeriodWorkGoalRepository.php | 4 ++-- .../AccompanyingPeriodWorkRepository.php | 4 ++-- .../Repository/SocialWork/EvaluationRepository.php | 4 ++-- .../Repository/SocialWork/GoalRepository.php | 4 ++-- .../Repository/SocialWork/ResultRepository.php | 4 ++-- .../Repository/SocialWork/SocialActionRepository.php | 4 ++-- .../Repository/SocialWork/SocialIssueRepository.php | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php index 92279be2d..6983f6c0e 100644 --- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php +++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php @@ -1,10 +1,10 @@ Date: Wed, 5 May 2021 11:11:25 +0200 Subject: [PATCH 33/33] Issue #4: Remove obsolete route. --- src/Bundle/ChillMainBundle/config/routes.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Bundle/ChillMainBundle/config/routes.yaml b/src/Bundle/ChillMainBundle/config/routes.yaml index dbf5fa89c..3fd7eafab 100644 --- a/src/Bundle/ChillMainBundle/config/routes.yaml +++ b/src/Bundle/ChillMainBundle/config/routes.yaml @@ -86,7 +86,3 @@ login_check: logout: path: /logout - -chill_main_test: - path: /{_locale}/main/test - controller: Chill\MainBundle\Controller\DefaultController::testAction