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/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/Goal.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Goal.php new file mode 100644 index 000000000..adf59d203 --- /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..5eb3224bc --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php @@ -0,0 +1,187 @@ +socialActions = new ArrayCollection(); + $this->goals = new ArrayCollection(); + $this->accompanyingPeriodWorks = new ArrayCollection(); + $this->accompanyingPeriodWorkGoals = 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; + } + + /** + * @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/Entity/SocialWork/SocialAction.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php new file mode 100644 index 000000000..690764f39 --- /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..d7817de16 --- /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/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 @@ + $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(), @@ -99,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()), @@ -120,45 +114,14 @@ class PersonControllerCreateTest extends WebTestCase * @param Form $form * @depends testAddAPersonPage */ - public function testFirstnameTooLong(Form $form) + public function testForgedNullGender(Form $form) { - $client = $this->getAuthenticatedClient(); - $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 - * @depends testAddAPersonPage - */ - public function testGenderIsNull(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); } /** @@ -171,10 +134,10 @@ 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(), + $this->assertTrue((bool)$client->getResponse()->isRedirect(), "a valid form redirect to url /{_locale}/person/{personId}/general/edit"); $client->followRedirect(); @@ -198,7 +161,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 +175,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 +205,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(); } /** 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); } diff --git a/src/Bundle/ChillPersonBundle/config/services/controller.yaml b/src/Bundle/ChillPersonBundle/config/services/controller.yaml index 893b1cfd3..dc575f320 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: diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php new file mode 100644 index 000000000..177633433 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210426145930.php @@ -0,0 +1,77 @@ +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->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'); + } +} 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'); + } +} 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