+
personRender = $personRender;
$this->relationshipRepository = $relationshipRepository;
@@ -214,6 +214,14 @@ class PersonDocGenNormalizer implements
$data['relations'] = [];
}
+ if ($context['docgen:person:with-budget'] ?? false) {
+ $data['budget']['person'] = $this->summaryBudget->getSummaryForPerson(null);
+
+ if ($context['docgen:person:with-household'] ?? false) {
+ $data['budget']['household'] = $this->summaryBudget->getSummaryForHousehold(null);
+ }
+ }
+
return $data;
}
}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index ae95c9321..41c06e9ec 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -208,8 +208,8 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
'birthdate' => $this->normalizer->normalize($person->getBirthdate(), $format, $context),
'deathdate' => $this->normalizer->normalize($person->getDeathdate(), $format, $context),
'age' => $this->normalizer->normalize($person->getAge(), $format, $context),
- 'phonenumber' => $this->normalizer->normalize($person->getPhonenumber()),
- 'mobilenumber' => $this->normalizer->normalize($person->getMobilenumber()),
+ 'phonenumber' => $this->normalizer->normalize($person->getPhonenumber(), $format, $context),
+ 'mobilenumber' => $this->normalizer->normalize($person->getMobilenumber(), $format, $context),
'email' => $person->getEmail(),
'gender' => $person->getGender(),
];
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
index 08034978e..94a0ac243 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php
@@ -65,7 +65,7 @@ final class HouseholdApiControllerTest extends WebTestCase
}
$reference = $em->createQueryBuilder()->select('ar')->from(AddressReference::class, 'ar')
- ->setFirstResult(random_int(0, $nbReference))
+ ->setFirstResult(random_int(0, $nbReference - 1))
->setMaxResults(1)
->getQuery()->getSingleResult();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
index 6799f882b..7cf8af3e5 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Entity/Household/HouseholdTest.php
@@ -75,6 +75,7 @@ final class HouseholdTest extends TestCase
$lastAddress = new Address();
$lastAddress->setValidFrom($yesterday = new DateTime('yesterday'));
+ $lastAddress->setValidTo(new DateTime('tomorrow'));
$household->addAddress($lastAddress);
$this->assertNull($lastAddress->getValidTo());
@@ -82,6 +83,7 @@ final class HouseholdTest extends TestCase
$previousAddress = new Address();
$previousAddress->setValidFrom($oneMonthAgo = new DateTime('1 month ago'));
+ $previousAddress->setValidTo(new DateTime('now'));
$household->addAddress($previousAddress);
$addresses = $household->getAddressesOrdered();
@@ -95,6 +97,7 @@ final class HouseholdTest extends TestCase
$futureAddress = new Address();
$futureAddress->setValidFrom($tomorrow = new DateTime('tomorrow'));
+ $futureAddress->setValidTo(new DateTime('2150-01-01'));
$household->addAddress($futureAddress);
$addresses = $household->getAddressesOrdered();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
index 65199dabf..77eeed387 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Household/MembersEditorTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
namespace Chill\PersonBundle\Tests\Household;
use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
use Chill\PersonBundle\Entity\Household\Position;
use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Event\Person\PersonAddressMoveEvent;
@@ -39,6 +40,122 @@ final class MembersEditorTest extends TestCase
$this->factory = $this->buildMembersEditorFactory();
}
+ public function testAddingParticipationNotSharingHouseholdCloseTheOldOnes()
+ {
+ $person = new Person();
+ $position = (new Position())->setShareHousehold(false);
+ $household = new Household();
+
+ // set a first time the person in position
+ $factory = $this->buildMembersEditorFactory();
+ $editor = $factory->createEditor($household);
+
+ $editor->addMovement($aMonthAgo = new DateTimeImmutable('1 month ago'), $person, $position);
+
+ // set a second time the person in position
+ $factory = $this->buildMembersEditorFactory();
+ $editor = $factory->createEditor($household);
+
+ $editor->addMovement($yesterday = new DateTimeImmutable('yesterday'), $person, $position);
+
+ $this->assertCount(2, $person->getHouseholdParticipationsNotShareHousehold());
+
+ $startDates = [];
+ $endDates = [];
+
+ foreach ($person->getHouseholdParticipationsNotShareHousehold() as $participation) {
+ $startDates[] = $participation->getStartDate();
+ $endDates[] = $participation->getEndDate();
+ }
+
+ $this->assertContains($aMonthAgo, $startDates);
+ $this->assertContains($yesterday, $startDates);
+ $this->assertContains($yesterday, $endDates);
+ $this->assertContains(null, $endDates);
+ }
+
+ /**
+ * We test here a move for a person:.
+ *
+ * * which was in a position "sharing household"
+ * * which move to the another household, in a position "not sharing household"
+ *
+ * The person should stays in the two households
+ */
+ public function testMoveFromSharingHouseholdToNotSharingHousehouldInDifferentHousehold()
+ {
+ $person = new Person();
+ $household = new Household();
+ $positionSharing = (new Position())->setShareHousehold(true);
+ $positionNotSharing = (new Position())->setShareHousehold(false);
+ $factory = $this->buildMembersEditorFactory();
+ $editor = $factory->createEditor($household);
+
+ // we add the member to the household
+ $editor->addMovement(new DateTimeImmutable('1 month ago'), $person, $positionSharing);
+
+ // double check that the person is in the household
+ $this->assertContains($person, $household->getCurrentPersons());
+
+ // we do the move to the position not sharing household
+ $editor = $factory->createEditor($household2 = new Household());
+ $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+
+ $sharings = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
+ return $m->getShareHousehold();
+ });
+ $notSharing = $household2->getCurrentMembers()->filter(static function (HouseholdMember $m) {
+ return !$m->getShareHousehold();
+ });
+
+ $this->assertCount(1, $notSharing);
+ $this->assertCount(1, $sharings);
+
+ $getPerson = static function (HouseholdMember $m) { return $m->getPerson(); };
+
+ $this->assertContains($person, $notSharing->map($getPerson));
+ }
+
+ /**
+ * We test here a move for a person:.
+ *
+ * * which was in a position "sharing household"
+ * * which move to the same household, in a position "not sharing household"
+ */
+ public function testMoveFromSharingHouseholdToNotSharingHousehouldInSamehousehold()
+ {
+ $person = new Person();
+ $household = new Household();
+ $positionSharing = (new Position())->setShareHousehold(true);
+ $positionNotSharing = (new Position())->setShareHousehold(false);
+ $factory = $this->buildMembersEditorFactory();
+ $editor = $factory->createEditor($household);
+
+ // we add the member to the household
+ $editor->addMovement(new DateTimeImmutable('1 month ago'), $person, $positionSharing);
+
+ // double check that the person is in the household
+ $this->assertContains($person, $household->getCurrentPersons());
+
+ // we do the move to the position not sharing household
+ $editor = $factory->createEditor($household);
+ $editor->addMovement(new DateTimeImmutable('yesterday'), $person, $positionNotSharing);
+
+ $sharings = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
+ return $m->getShareHousehold();
+ });
+ $notSharing = $household->getCurrentMembers()->filter(static function (HouseholdMember $m) {
+ return !$m->getShareHousehold();
+ });
+
+ $this->assertCount(1, $notSharing);
+ $this->assertCount(0, $sharings);
+
+ $getPerson = static function (HouseholdMember $m) { return $m->getPerson(); };
+
+ $this->assertContains($person, $notSharing->map($getPerson));
+ }
+
public function testMovePersonWithoutSharedHousehold()
{
$person = new Person();
@@ -126,7 +243,7 @@ final class MembersEditorTest extends TestCase
$this->assertEquals($date, $membership1->getEndDate());
}
- public function testPostMove()
+ public function testPostMoveToAPositionNotSharingHousehold()
{
$person = new Person();
$position = (new Position())
@@ -134,6 +251,86 @@ final class MembersEditorTest extends TestCase
$household1 = new Household();
$household2 = new Household();
$eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+ $eventDispatcher
+ ->dispatch(Argument::type(PersonAddressMoveEvent::class))
+ ->shouldNotBeCalled();
+ $factory = $this->buildMembersEditorFactory(
+ $eventDispatcher->reveal(),
+ null
+ );
+ $editor = $factory->createEditor($household1);
+
+ $editor->addMovement(new DateTimeImmutable('now'), $person, $position);
+
+ $editor->postMove();
+ }
+
+ public function testPostMoveToAPositionSharingHouseholdAndSameHousehold()
+ {
+ $person = new Person();
+ $position = (new Position())
+ ->setShareHousehold(true);
+ $position2 = (new Position())
+ ->setShareHousehold(true);
+ $household1 = new Household();
+
+ // set into the first household
+ $editor = $this->buildMembersEditorFactory()
+ ->createEditor($household1);
+ $editor->addMovement(new DateTimeImmutable('1 year ago'), $person, $position);
+
+ // prepare for next move
+ $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+ $eventDispatcher
+ ->dispatch(Argument::type(PersonAddressMoveEvent::class))
+ ->shouldNotBeCalled();
+ $factory = $this->buildMembersEditorFactory(
+ $eventDispatcher->reveal(),
+ null
+ );
+ $editor = $factory->createEditor($household1);
+
+ $editor->addMovement(new DateTimeImmutable('now'), $person, $position2);
+
+ $editor->postMove();
+ }
+
+ public function testPostMoveToAPositionSharingHouseholdFromDifferentHousehold()
+ {
+ $person = new Person();
+ $position = (new Position())
+ ->setShareHousehold(true);
+ $household1 = new Household();
+ $household2 = new Household();
+
+ // set into the first household
+ $editor = $this->buildMembersEditorFactory()
+ ->createEditor($household1);
+ $editor->addMovement(new DateTimeImmutable('1 year ago'), $person, $position);
+
+ // perform now the movement
+ $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+ $eventDispatcher
+ ->dispatch(Argument::type(PersonAddressMoveEvent::class))
+ ->shouldBeCalled();
+ $factory = $this->buildMembersEditorFactory(
+ $eventDispatcher->reveal(),
+ null
+ );
+ $editor = $factory->createEditor($household2);
+
+ $editor->addMovement(new DateTimeImmutable('now'), $person, $position);
+
+ $editor->postMove();
+ }
+
+ public function testPostMoveToAPositionSharingHouseholdFromNoHousehold()
+ {
+ $person = new Person();
+ $position = (new Position())
+ ->setShareHousehold(true);
+ $household1 = new Household();
+ $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
$eventDispatcher
->dispatch(Argument::type(PersonAddressMoveEvent::class))
->shouldBeCalled();
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
index c19533e08..deef94525 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonDocGenNormalizerTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
namespace Serializer\Normalizer;
+use Chill\BudgetBundle\Service\Summary\SummaryBudgetInterface;
use Chill\MainBundle\Templating\TranslatableStringHelper;
use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
use Chill\PersonBundle\Entity\Household\Household;
@@ -72,6 +73,17 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
$this->normalizer = self::$container->get(NormalizerInterface::class);
}
+ public function dataGeneratorNormalizationNullOrNotNullHaveSameKeys(): iterable
+ {
+ yield [['docgen:expects' => Person::class, 'groups' => ['docgen:read']]];
+
+ yield [['docgen:expects' => Person::class, 'groups' => ['docgen:read'], 'docgen:person:with-household' => true]];
+
+ yield [['docgen:expects' => Person::class, 'groups' => ['docgen:read'], 'docgen:person:with-relations' => true]];
+
+ yield [['docgen:expects' => Person::class, 'groups' => ['docgen:read'], 'docgen:person:with-budget' => true]];
+ }
+
public function generateData()
{
$person = new Person();
@@ -90,12 +102,16 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
yield [null, self::BLANK, 'normalization for a null person'];
}
- public function testNormalizationNullOrNotNullHaveSameKeys()
+ /**
+ * @dataProvider dataGeneratorNormalizationNullOrNotNullHaveSameKeys
+ *
+ * @param mixed $context
+ */
+ public function testNormalizationNullOrNotNullHaveSameKeys($context)
{
- $this->markTestSkipped();
$period = new Person();
- $notNullData = $this->buildPersonNormalizer()->normalize($period, 'docgen', ['docgen:expects' => Person::class]);
- $nullData = $this->buildPersonNormalizer()->normalize(null, 'docgen', ['docgen:expects' => Person::class]);
+ $notNullData = $this->buildPersonNormalizer()->normalize($period, 'docgen', $context);
+ $nullData = $this->buildPersonNormalizer()->normalize(null, 'docgen', $context);
$this->assertEqualsCanonicalizing(
array_keys($notNullData),
@@ -131,7 +147,6 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
public function testNormalizePersonWithHousehold()
{
- $this->markTestSkipped();
$household = new Household();
$person = new Person();
$person
@@ -172,7 +187,6 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
public function testNormalizePersonWithRelationships()
{
- $this->markTestSkipped();
$person = (new Person())->setFirstName('Renaud')->setLastName('megane');
$father = (new Person())->setFirstName('Clément')->setLastName('megane');
$mother = (new Person())->setFirstName('Mireille')->setLastName('Mathieu');
@@ -235,13 +249,25 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
?RelationshipRepository $relationshipRepository = null,
?TranslatorInterface $translator = null,
?TranslatableStringHelper $translatableStringHelper = null,
- ?NormalizerInterface $normalizer = null
+ ?NormalizerInterface $normalizer = null,
+ ?SummaryBudgetInterface $summaryBudget = null
): PersonDocGenNormalizer {
+ if (null === $summaryBudget) {
+ $summaryBudget = $this->prophesize(SummaryBudgetInterface::class);
+ $summaryBudget->getSummaryForHousehold(Argument::any())->willReturn(
+ ['resources' => [], 'charges' => []]
+ );
+ $summaryBudget->getSummaryForPerson(Argument::any())->willReturn(
+ ['resources' => [], 'charges' => []]
+ );
+ }
+
$personDocGenNormalizer = new PersonDocGenNormalizer(
$personRender ?? self::$container->get(PersonRender::class),
$relationshipRepository ?? self::$container->get(RelationshipRepository::class),
$translator ?? self::$container->get(TranslatorInterface::class),
- $translatableStringHelper ?? self::$container->get(TranslatableStringHelperInterface::class)
+ $translatableStringHelper ?? self::$container->get(TranslatableStringHelperInterface::class),
+ $summaryBudget->reveal(),
);
if (null === $normalizer) {
@@ -259,13 +285,31 @@ final class PersonDocGenNormalizerTest extends KernelTestCase
?PersonRender $personRender = null,
?RelationshipRepository $relationshipRepository = null,
?TranslatorInterface $translator = null,
- ?TranslatableStringHelper $translatableStringHelper = null
+ ?TranslatableStringHelper $translatableStringHelper = null,
+ ?SummaryBudgetInterface $summaryBudget = null
): PersonDocGenNormalizer {
+ if (null === $relationshipRepository) {
+ $relationshipRepository = $this->prophesize(RelationshipRepository::class);
+ $relationshipRepository->findByPerson(Argument::type(Person::class))->willReturn([]);
+ $relationshipRepository = $relationshipRepository->reveal();
+ }
+
+ if (null === $summaryBudget) {
+ $summaryBudget = $this->prophesize(SummaryBudgetInterface::class);
+ $summaryBudget->getSummaryForHousehold(Argument::any())->willReturn(
+ ['resources' => [], 'charges' => []]
+ );
+ $summaryBudget->getSummaryForPerson(Argument::any())->willReturn(
+ ['resources' => [], 'charges' => []]
+ );
+ }
+
$normalizer = new PersonDocGenNormalizer(
$personRender ?? self::$container->get(PersonRender::class),
- $relationshipRepository ?? self::$container->get(RelationshipRepository::class),
+ $relationshipRepository,
$translator ?? self::$container->get(TranslatorInterface::class),
- $translatableStringHelper ?? self::$container->get(TranslatableStringHelperInterface::class)
+ $translatableStringHelper ?? self::$container->get(TranslatableStringHelperInterface::class),
+ $summaryBudget->reveal()
);
$normalizerManager = $this->prophesize(NormalizerInterface::class);
$normalizerManager->supportsNormalization(Argument::any(), 'docgen', Argument::any())->willReturn(true);
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index 16260ec97..f060c4bfb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -762,7 +762,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface
*/
public function setEmail($email = null)
{
- $this->email = $email;
+ $this->email = trim((string) $email);
return $this;
}
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
index 2a57a2f55..f67417767 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
@@ -34,6 +34,12 @@ final class ThirdPartyACLAwareRepository implements ThirdPartyACLAwareRepository
{
$qb = $this->thirdPartyRepository->createQueryBuilder('tp');
+ $qb->leftJoin('tp.parent', 'parent')
+ ->andWhere($qb->expr()->andX(
+ 'tp.active = \'TRUE\'',
+ $qb->expr()->orX($qb->expr()->isNull('parent'), 'parent.active = \'TRUE\'')
+ ));
+
if (null !== $filterString) {
$qb->andWhere($qb->expr()->like('tp.canonicalized', 'LOWER(UNACCENT(:filterString))'))
->setParameter('filterString', '%' . $filterString . '%');
diff --git a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
index e4b7f43af..f43a6eda2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
+++ b/src/Bundle/ChillThirdPartyBundle/Search/ThirdPartyApiSearch.php
@@ -109,14 +109,15 @@ class ThirdPartyApiSearch implements SearchApiInterface
}
$query
- ->setSelectPertinence(implode(' + ', $pertinence), array_merge(
+ ->setSelectPertinence(implode(' + ', $pertinence) . ' + 1', array_merge(
[],
...$pertinenceArgs
))
- ->andWhereClause(implode(' OR ', $wheres), array_merge(
- [],
- ...$whereArgs
- ));
+ ->andWhereClause(implode(' AND ', $wheres)
+ . ' AND tparty.active IS TRUE and (parent.active IS TRUE OR parent IS NULL)', array_merge(
+ [],
+ ...$whereArgs
+ ));
return $query;
}
diff --git a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
index 87bfb6995..5eb8895b3 100644
--- a/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
+++ b/src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php
@@ -63,7 +63,7 @@ class ThirdPartyNormalizer implements NormalizerAwareInterface, NormalizerInterf
}, $thirdParty->getTypesAndCategories()),
'profession' => $this->normalizer->normalize($thirdParty->getProfession(), $format, $context),
'address' => $this->normalizer->normalize($thirdParty->getAddress(), $format, ['address_rendering' => 'short']),
- 'telephone' => $this->normalizer->normalize($thirdParty->getTelephone()),
+ 'telephone' => $this->normalizer->normalize($thirdParty->getTelephone(), $format, $context),
'email' => $thirdParty->getEmail(),
'isChild' => $thirdParty->isChild(),
'parent' => $this->normalizer->normalize($thirdParty->getParent(), $format, $context),
diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
index cec9dee7d..4fe3da927 100644
--- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
+++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php
@@ -71,13 +71,13 @@ class ThirdPartyRender extends AbstractChillEntityRender
$civility = '';
}
- if (!empty($entity->getAcronym())) {
+ if ('' !== (string) $entity->getAcronym()) {
$acronym = ' (' . $entity->getAcronym() . ')';
} else {
$acronym = '';
}
- $firstname = empty($entity->getFirstname()) ? '' : $entity->getFirstname();
+ $firstname = ('' === $entity->getFirstname()) ? '' : $entity->getFirstname();
return $civility . $firstname . ' ' . $entity->getName() . $acronym;
}