refactor EntityListResponse

modules/thunder_gqls/src/Wrappers/EntityListResponse.php

@@ -2,29 +2,62 @@
 
 namespace Drupal\thunder_gqls\Wrappers;
 
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\Query\QueryInterface;
+use Drupal\graphql\GraphQL\Buffers\EntityBuffer;
 use GraphQL\Deferred;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * The thunder entity list response class.
  */
-class EntityListResponse implements EntityListResponseInterface {
+class EntityListResponse implements EntityListResponseInterface, ContainerInjectionInterface {
 
   /**
    * The query interface.
    *
    * @var \Drupal\Core\Entity\Query\QueryInterface
    */
-  protected $query;
+  protected QueryInterface $query;
+
+  /**
+   * The entity buffer.
+   *
+   * @var \Drupal\graphql\GraphQL\Buffers\EntityBuffer
+   */
+  private EntityBuffer $buffer;
 
   /**
    * EntityListResponse constructor.
    *
+   * @param \Drupal\Core\Entity\Query\QueryInterface|\Drupal\graphql\GraphQL\Buffers\EntityBuffer $parameter
+   */
+  public function __construct(QueryInterface|EntityBuffer $parameter) {
+    if ($parameter instanceof QueryInterface) {
+      $this->setQuery($parameter);
+      return;
+    }
+    $this->buffer = $parameter;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public static function create(ContainerInterface $container): self {
+    return new static(
+      $container->get('graphql.buffer.entity'),
+    );
+  }
+
+  /**
+   * Set query.
+   *
    * @param \Drupal\Core\Entity\Query\QueryInterface $query
-   *   The query interface.
+   *   The query.
    */
-  public function __construct(QueryInterface $query) {
+  public function setQuery(QueryInterface $query): EntityListResponse {
     $this->query = $query;
+    return $this;
   }
 
   /**
@@ -51,8 +84,11 @@ public function items() {
       return [];
     }
 
-    $buffer = \Drupal::service('graphql.buffer.entity');
-    $callback = $buffer->add($this->query->getEntityTypeId(), array_values($result));
+    if (empty($this->buffer)) {
+      $this->buffer = \Drupal::service('graphql.buffer.entity');
+    }
+
+    $callback = $this->buffer->add($this->query->getEntityTypeId(), array_values($result));
     return new Deferred(fn() => $callback());
   }