Add listKey argument to DoctrineListRepresentationFactory and Doctrin…

…eNestedListRepresentationFactory (#10)
handcraftedinthealps · Nov 7, 2022 · 841392d · 841392d
1 parent 15506a9
commit 841392d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/ListRepresentation/DoctrineListRepresentationFactory.php b/ListRepresentation/DoctrineListRepresentationFactory.php
@@ -56,10 +56,13 @@ public function createDoctrineListRepresentation(
         array $filters = [],
         array $parameters = [],
         array $includedFields = [],
-        array $groupByFields = []
+        array $groupByFields = [],
+        string $listKey = null
     ): PaginatedRepresentation {
+        $listKey = $listKey ?? $resourceKey;
+
         /** @var DoctrineFieldDescriptor[] $fieldDescriptors */
-        $fieldDescriptors = $this->fieldDescriptorFactory->getFieldDescriptors($resourceKey);
+        $fieldDescriptors = $this->fieldDescriptorFactory->getFieldDescriptors($listKey);
 
         $listBuilder = $this->listBuilderFactory->create($fieldDescriptors['id']->getEntityName());
         $this->restHelper->initializeListBuilder($listBuilder, $fieldDescriptors);

diff --git a/ListRepresentation/DoctrineListRepresentationFactoryInterface.php b/ListRepresentation/DoctrineListRepresentationFactoryInterface.php
@@ -19,6 +19,7 @@ public function createDoctrineListRepresentation(
         array $filters = [],
         array $parameters = [],
         array $includedFields = [],
-        array $groupByFields = []
+        array $groupByFields = [],
+        string $listKey = null
     ): PaginatedRepresentation;
 }
diff --git a/ListRepresentation/DoctrineNestedListRepresentationFactory.php b/ListRepresentation/DoctrineNestedListRepresentationFactory.php
@@ -61,10 +61,13 @@ public function createDoctrineListRepresentation(
         $parentId = null,
         array $expandedIds = [],
         array $includedFields = [],
-        array $groupByFields = []
+        array $groupByFields = [],
+        string $listKey = null
     ): CollectionRepresentation {
+        $listKey = $listKey ?? $resourceKey;
+
         /** @var DoctrineFieldDescriptor[] $fieldDescriptors */
-        $fieldDescriptors = $this->fieldDescriptorFactory->getFieldDescriptors($resourceKey);
+        $fieldDescriptors = $this->fieldDescriptorFactory->getFieldDescriptors($listKey);
         $listBuilder = $this->listBuilderFactory->create($fieldDescriptors['id']->getEntityName());
         $this->restHelper->initializeListBuilder($listBuilder, $fieldDescriptors);
 

diff --git a/ListRepresentation/DoctrineNestedListRepresentationFactoryInterface.php b/ListRepresentation/DoctrineNestedListRepresentationFactoryInterface.php
@@ -23,6 +23,7 @@ public function createDoctrineListRepresentation(
         $parentId = null,
         array $expandedIds = [],
         array $includedFields = [],
-        array $groupByFields = []
+        array $groupByFields = [],
+        string $listKey = null
     ): CollectionRepresentation;
 }