Refactor

modules/opd_presentations/opd_presentations.services.yml

@@ -1,3 +1,6 @@
 services:
   Drupal\opd_presentations\PresentationCounter:
     autowire: true
+  Drupal\opd_presentations\Repository\PresentationNodeRepository:
+    autowire: true
+  Drupal\opd_presentations\Repository\PresentationRepositoryInterface: '@Drupal\opd_presentations\Repository\PresentationNodeRepository'

modules/opd_presentations/src/PresentationCounter.php

@@ -4,26 +4,15 @@ declare(strict_types=1);
 
 namespace Drupal\opd_presentations;
 
-use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\opd_presentations\Repository\PresentationRepositoryInterface;
-use Drupal\node\NodeInterface;
 
 final class PresentationCounter {
 
-  public function __construct(private EntityTypeManagerInterface $entityTypeManager) {
+  public function __construct(private PresentationRepositoryInterface $presentationRepository) {
   }
 
   public function getPastCount(): int {
-    $nodeStorage = $this->entityTypeManager->getStorage('node');
+    $presentations = $this->presentationRepository->getPublished();
-
-    $query = $nodeStorage->getQuery();
-    $query->condition('status', NodeInterface::PUBLISHED);
-    $query->condition('type', Presentation::NODE_TYPE);
-    $query->accessCheck();
-
-    $nodeIds = $query->execute();
-
-    /** @var Presentation[] */
-    $presentations = $nodeStorage->loadMultiple($nodeIds);
 
     return array_reduce(
       array: $presentations,

modules/opd_presentations/src/Repository/PresentationNodeRepository.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\opd_presentations\Repository;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\node\NodeInterface;
+use Drupal\opd_presentations\Presentation;
+
+final class PresentationNodeRepository implements PresentationRepositoryInterface {
+
+  public function __construct(private EntityTypeManagerInterface $entityTypeManager) {
+  }
+
+  public function getPublished(): array {
+    $nodeStorage = $this->entityTypeManager->getStorage('node');
+
+    $query = $nodeStorage->getQuery();
+    $query->accessCheck();
+    $query->condition('status', NodeInterface::PUBLISHED);
+    $query->condition('type', Presentation::NODE_TYPE);
+
+    $nodeIds = $query->execute();
+
+    return $nodeStorage->loadMultiple($nodeIds);
+  }
+
+}

modules/opd_presentations/src/Repository/PresentationRepositoryInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Drupal\opd_presentations\Repository;
+
+interface PresentationRepositoryInterface {
+
+  /**
+   * @return Presentation[]
+   */
+  public function getPublished(): array;
+
+}

modules/opd_presentations/tests/src/Functional/PresentationCounterTest.php

@@ -9,6 +9,7 @@ use Drupal\Tests\opd_presentations\Traits\PresentationCreationTrait;
 use Drupal\opd_presentations\Date;
 use Drupal\opd_presentations\Events;
 use Drupal\opd_presentations\PresentationCounter;
+use Drupal\opd_presentations\Repository\PresentationRepositoryInterface;
 use weitzman\DrupalTestTraits\ExistingSiteBase;
 
 final class PresentationCounterTest extends ExistingSiteBase {