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

Add TalkCollection, move logic for getting events

Browse source 
Add a `TalkCollection` which extends Laravel/Tighten's, and add a method
there for getting the events from the talks. This makes this logic more
reusable and also makes the code in the `TalkCounter` service simpler.
This commit is contained in:
Oliver Davies 2021-02-10 07:54:43 +00:00
parent 1f0926ac16
commit 0c1321fed5
3 changed files with 30 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
web/modules/custom/talks/src/Repository/TalkRepository.php
View file

@ -7,8 +7,7 @@ namespace Drupal\opdavies_talks\Repository;
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\node\NodeInterface;
use Drupal\opdavies_talks\Entity\Node\Talk;
use Tightenco\Collect\Support\Collection;
use Drupal\opdavies_talks\Collection\TalkCollection;
final class TalkRepository {
@ -18,19 +17,13 @@ final class TalkRepository {
$this->nodeStorage = $entityTypeManager->getStorage('node');
}
/**
* @return Collection|Talk[]
*/
public function findAll(): Collection {
public function findAll(): TalkCollection {
$talks = $this->nodeStorage->loadByProperties($this->defaultProperties());
return new Collection($talks);
return new TalkCollection($talks);
}
/**
* @return Collection|Talk[]
*/
public function findAllPublished(): Collection {
public function findAllPublished(): TalkCollection {
$talks = $this->nodeStorage->loadByProperties(array_merge(
$this->defaultProperties(),
[
@ -38,7 +31,7 @@ final class TalkRepository {
],
));
return new Collection($talks);
return new TalkCollection($talks);
}
private function defaultProperties(): array {