Change filters into functions

This commit is contained in:
Oliver Davies 2019-12-27 13:56:51 +00:00
parent 7955042ec0
commit 1c3d7f820f
4 changed files with 39 additions and 90 deletions

View file

@ -30,16 +30,9 @@ class TalksExtension extends AbstractExtension
{
return [
new TwigFunction('get_all_talks', [$this, 'getAllTalks']),
];
}
public function getFilters()
{
return [
new TwigFilter('pastEvents', [$this, 'filterPastEvents']),
new TwigFilter('pastTalks', [$this, 'filterPastTalks']),
new TwigFilter('upcomingEvents', [$this, 'filterUpcomingEvents']),
new TwigFilter('upcomingTalks', [$this, 'filterUpcomingTalks']),
new TwigFunction('get_upcoming_talks', [$this, 'getUpcomingTalks']),
new TwigFunction('get_past_talks', [$this, 'getPastTalks']),
new TwigFunction('get_past_talk_count', [$this, 'getPastTalkCount']),
];
}
@ -65,49 +58,47 @@ class TalksExtension extends AbstractExtension
});
}
public function filterUpcomingTalks(Collection $talks): Collection
public function getUpcomingTalks(array $talks): Collection
{
return $talks->filter(function ($talk): bool {
return $this->getAllTalks($talks)->filter(function ($talk): bool {
return $this->getLastDate($talk) >= $this->today;
})->values();
}
public function filterPastTalks(Collection $talks): Collection
public function getPastTalks(array $talks): Collection
{
return $talks->filter(function ($talk): bool {
return $this->getAllTalks($talks)->filter(function ($talk): bool {
return $this->getLastDate($talk) < $this->today;
})->values();
}
public function getAllEvents($talks): Collection
{
return $this->eventsFromTalks($talks);
}
public function getPastEvents($talks): Collection
{
return $this->eventsFromTalks($talks)->filter(function ($event): bool {
return $event['date'] < $this->today;
})->sortBy('date');
}
public function getPastTalkCount($talks): int
{
return $this->getPastEvents($talks)->count();
}
private function getLastDate($talk): string
{
return $this->eventsFromTalks(new Collection([$talk]))
->pluck('date')->max();
}
public function filterUpcomingEvents($talks): Collection
{
return $this->eventsFromTalks($talks)->filter(function ($event): bool {
return $event['date'] >= $this->today;
})->sortBy('date');
}
public function filterPastEvents($talks): Collection
{
return $this->eventsFromTalks($talks)->filter(function ($event): bool {
return $event['date'] < $this->today;
})->sortBy('date');
}
private function eventsFromTalks($talks): Collection
{
return (new Collection($talks))->flatMap(function ($talk): array {
return $talk['events'];
});
}
public function getAllEvents($talks): Collection
{
return $this->eventsFromTalks($talks);
}
}