Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix person last address (from @loophp on old framagit repo)

Browse Source 
See https://framagit.org/Chill-project/Chill-Person/-/merge_requests/13
This commit is contained in:
Julien Fastré 2021-04-30 00:24:21 +02:00
parent 1b6aa7f1a1
commit 7d130277d6
2 changed files with 62 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Bundle/ChillPersonBundle/Entity/Person.php
View File

@ -1022,18 +1022,20 @@ class Person implements HasCenterInterface
*/ */
public function getLastAddress(\DateTime $date = null) public function getLastAddress(\DateTime $date = null)
{ {
if ($date === null) { $from ??= new DateTime('now');
$date = new \DateTime('now');
}
$addresses = $this->getAddresses(); /** @var ArrayIterator $addressesIterator */
$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 = iterator_to_array($addressesIterator)) ?
} null :
current($addresses);
return $addresses->first();
} }
/** /**

76
src/Bundle/ChillPersonBundle/Tests/Entity/PersonTest.php
View File

@ -25,6 +25,10 @@ namespace Chill\PersonBundle\Tests\Entity;
use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person;
use Chill\PersonBundle\Entity\AccompanyingPeriod; use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\Address;
use DateInterval;
use DateTime;
use Generator;
/** /**
* Unit tests for the person Entity * Unit tests for the person Entity
@ -153,46 +157,52 @@ class PersonTest extends \PHPUnit\Framework\TestCase
$this->assertEquals($r['result'], Person::ERROR_ADDIND_PERIOD_AFTER_AN_OPEN_PERIOD); $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); yield [(DateTime::createFromFormat('Y-m-d', '2021-01-05'))->settime(0, 0)];
$date1 = (\DateTime::createFromFormat('Y-m-d', '2021-03-05'))->settime(0,0); yield [(DateTime::createFromFormat('Y-m-d', '2021-02-05'))->settime(0, 0)];
$date2 = (\DateTime::createFromFormat('Y-m-d', '2021-04-05'))->settime(0,0); yield [(DateTime::createFromFormat('Y-m-d', '2021-03-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)); /**
* @dataProvider dateProvider
*/
public function testGetLastAddress(DateTime $date)
{
$p = new Person($date);
// add some address // Make sure that there is no last address.
$add1 = (new Address())->setValidFrom($date1); $this::assertNull($p->getLastAddress());
// no address with date 2
$add3 = (new Address())->setValidFrom($date3);
// no address with date 4
$add5 = (new Address())->setValidFrom($date5);
$p->addAddress($add1); // Take an arbitrary date before the $date in parameter.
$addressDate = clone $date;
// test that, if only one address, that does work: // 1. Smoke test: Test that the first address added is the last one.
$this->assertSame($add1, $p->getLastAddress($date1)); $address1 = (new Address())->setValidFrom($addressDate->sub(new DateInterval('PT180M')));
$this->assertSame($add1, $p->getLastAddress($date2)); $p->addAddress($address1);
$this->assertSame($add1, $p->getLastAddress());
// adress before the date should not work $this::assertCount(1, $p->getAddresses());
$this->assertNull($p->getLastAddress($date0)); $this::assertSame($address1, $p->getLastAddress());
// add addresses // 2. Add an older address, which should not be the last address.
$p->addAddress($add3); $addressDate2 = clone $addressDate;
$p->addAddress($add5); $address2 = (new Address())->setValidFrom($addressDate2->sub(new DateInterval('PT30M')));
$p->addAddress($address2);
// test retrieval of address $this::assertCount(2, $p->getAddresses());
$this->assertSame($add1, $p->getLastAddress($date2)); $this::assertSame($address1, $p->getLastAddress());
//$this->assertSame($add3, $p->getLastAddress($date3));
dump($p->getLastAddress($date4), $add3); // 3. Add a newer address, which should be the last address.
$this->assertSame($add3, $p->getLastAddress($date4)); $addressDate3 = clone $addressDate;
//$this->assertSame($add5, $p->getLastAddress($date5)); $address3 = (new Address())->setValidFrom($addressDate3->add(new DateInterval('PT30M')));
$this->assertSame($add5, $p->getLastAddress($date6)); $p->addAddress($address3);
$this::assertCount(3, $p->getAddresses());
$this::assertSame($address3, $p->getLastAddress());
// 4. Get the last address from a specific date.
$this::assertEquals($address1, $p->getLastAddress($addressDate));
$this::assertEquals($address2, $p->getLastAddress($addressDate2));
$this::assertEquals($address3, $p->getLastAddress($addressDate3));
} }
} }