opdavies/oliverdavies.uk-old-sculpin
Archived
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Ensure that only past events can be retrieved

Browse source
This commit is contained in:
Oliver Davies 2019-01-18 21:27:03 +00:00
parent 303162e65d
commit a48d748942
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/TalksBundle/TwigExtension/TalksExtension.php
View file

@ -78,11 +78,9 @@ class TalksExtension extends Twig_Extension
*/
public function getPast($talks, array $eventData = [])
{
return $this->format($talks, $eventData)
->filter(function ($talk) {
return $talk['event']['date'] < $this->today;
})
->sortByDesc('event.date');
return $this->getAll($talks)->filter(function ($talk) {
return collect($talk['events'])->pluck('date')->sort()->last() < $this->today;
});
}
/**

21
tests/TalksBundle/TwigExtension/TalksExtensionTest.php
View file

@ -75,9 +75,26 @@ class TalksExtensionTest extends TestCase
}
/** @test */
public function only_past_events_can_be_retrieved()
public function only_past_talks_can_be_retrieved()
{
$this->markTestIncomplete();
$pastTalk = [
'title' => 'Past talk',
'events' => [
'date' => (new DateTime('-1 day'))->format(TalksExtension::DATE_FORMAT),
]
];
$futureTalk = [
'title' => 'Future talk',
'events' => [
['date' => (new DateTime('+1 day'))->format(TalksExtension::DATE_FORMAT)],
],
];
$result = $this->extension->getPast([$pastTalk, $futureTalk]);
$this->assertCount(1, $result);
$this->assertSame($pastTalk, $result->first());
}
/** @test */