Add DimensionContentQueryEnhancer service (#190)

* Add DimensionContentQueryEnhancer service * Fix DimensionContentQueryEnhancer * Fix php-cs * Add dimension content query enhancer * Update dimension content query enhancer * Fix PHP CS * Adjustements for dimesion content query enhancer * Update Content/Domain/Model/DimensionContentCollection.php * Fix example repository select constants Co-authored-by: nnatter <niklas.natter@gmail.com>
sulu · Oct 4, 2021 · 9fa38cb · 9fa38cb
1 parent 8d958cc
commit 9fa38cb
Show file tree

Hide file tree

Showing 18 changed files with 1,579 additions and 89 deletions.
diff --git a/Content/Domain/Model/DimensionContentCollection.php b/Content/Domain/Model/DimensionContentCollection.php
@@ -15,6 +15,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
+use Sulu\Component\Util\SortUtils;
 
 /**
  * @implements \IteratorAggregate<DimensionContentInterface>
@@ -26,16 +27,6 @@ class DimensionContentCollection implements \IteratorAggregate, DimensionContent
      */
     private $dimensionContents;
 
-    /**
-     * @var DimensionContentInterface|null
-     */
-    private $unlocalizedDimensionContent;
-
-    /**
-     * @var DimensionContentInterface|null
-     */
-    private $localizedDimensionContent;
-
     /**
      * @var mixed[]
      */
@@ -63,23 +54,14 @@ public function __construct(
         array $dimensionAttributes,
         string $dimensionContentClass
     ) {
-        $this->dimensionContents = new ArrayCollection($dimensionContents);
         $this->dimensionContentClass = $dimensionContentClass;
         $this->defaultDimensionAttributes = $dimensionContentClass::getDefaultDimensionAttributes();
+        $this->dimensionAttributes = $dimensionContentClass::getEffectiveDimensionAttributes($dimensionAttributes);
 
-        $this->unlocalizedDimensionContent = $this->dimensionContents->filter(
-            function(DimensionContentInterface $dimensionContent) {
-                return null === $dimensionContent->getLocale();
-            }
-        )->first() ?: null;
-
-        $this->localizedDimensionContent = $this->dimensionContents->filter(
-            function(DimensionContentInterface $dimensionContent) {
-                return null !== $dimensionContent->getLocale();
-            }
-        )->first() ?: null;
-
-        $this->dimensionAttributes = $dimensionAttributes;
+        $this->dimensionContents = new ArrayCollection(
+            // dimension contents need to be sorted from most specific to least specific when they are merged
+            SortUtils::multisort($dimensionContents, \array_keys($this->dimensionAttributes), 'asc')
+        );
     }
 
     public function getDimensionContentClass(): string

diff --git a/Content/Domain/Model/DimensionContentInterface.php b/Content/Domain/Model/DimensionContentInterface.php
@@ -38,4 +38,11 @@ public function markAsMerged(): void;
      * @return mixed[]
      */
     public static function getDefaultDimensionAttributes(): array;
+
+    /**
+     * @param mixed[] $dimensionAttributes
+     *
+     * @return mixed[]
+     */
+    public static function getEffectiveDimensionAttributes(array $dimensionAttributes): array;
 }
diff --git a/Content/Domain/Model/DimensionContentTrait.php b/Content/Domain/Model/DimensionContentTrait.php
@@ -67,4 +67,19 @@ public static function getDefaultDimensionAttributes(): array
             'stage' => DimensionContentInterface::STAGE_DRAFT,
         ];
     }
+
+    public static function getEffectiveDimensionAttributes(array $dimensionAttributes): array
+    {
+        $defaultValues = static::getDefaultDimensionAttributes();
+
+        // Ignore keys that are not part of the default attributes
+        $dimensionAttributes = \array_intersect_key($dimensionAttributes, $defaultValues);
+
+        $dimensionAttributes = \array_merge(
+            $defaultValues,
+            $dimensionAttributes
+        );
+
+        return $dimensionAttributes;
+    }
 }