NEXT-1069 - Fix loading nested associations

shopware · Nov 15, 2018 · 343b597 · 343b597
1 parent 6b590af
commit 343b597
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 16 deletions.
diff --git a/Checkout/Order/Aggregate/OrderLineItem/OrderLineItemDefinition.php b/Checkout/Order/Aggregate/OrderLineItem/OrderLineItemDefinition.php
@@ -15,6 +15,8 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToOneAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ObjectField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ReferenceVersionField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\StringField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\TenantIdField;
@@ -58,12 +60,13 @@ public static function defineFields(): FieldCollection
             (new FloatField('unit_price', 'unitPrice'))->setFlags(new Required()),
             (new FloatField('total_price', 'totalPrice'))->setFlags(new Required()),
             new StringField('description', 'description'),
-            new IdField('parent_id', 'parentId'),
+            new ParentField(self::class),
             new StringField('type', 'type'),
             new CreatedAtField(),
             new UpdatedAtField(),
             new ManyToOneAssociationField('order', 'order_id', OrderDefinition::class, false),
             (new OneToManyAssociationField('orderDeliveryPositions', OrderDeliveryPositionDefinition::class, 'order_line_item_id', false, 'id'))->setFlags(new CascadeDelete(), new ReadOnly()),
+            new ParentAssociationField(self::class, false),
         ]);
     }
 

diff --git a/Checkout/Order/Aggregate/OrderLineItem/OrderLineItemStruct.php b/Checkout/Order/Aggregate/OrderLineItem/OrderLineItemStruct.php
@@ -110,6 +110,11 @@ class OrderLineItemStruct extends Entity
      */
     protected $orderDeliveryPositions;
 
+    /**
+     * @var OrderLineItemStruct|null
+     */
+    protected $parent;
+
     public function getOrderId(): string
     {
         return $this->orderId;
@@ -255,7 +260,7 @@ public function getParentId(): ?string
         return $this->parentId;
     }
 
-    public function setParentId(?string $parentId): void
+    public function setParentId(string $parentId): void
     {
         $this->parentId = $parentId;
     }
@@ -309,4 +314,14 @@ public function setOrderDeliveryPositions(OrderDeliveryPositionCollection $order
     {
         $this->orderDeliveryPositions = $orderDeliveryPositions;
     }
+
+    public function getParent(): ?OrderLineItemStruct
+    {
+        return $this->parent;
+    }
+
+    public function setParent(OrderLineItemStruct $parent): void
+    {
+        $this->parent = $parent;
+    }
 }
diff --git a/Content/Category/CategoryDefinition.php b/Content/Category/CategoryDefinition.php
@@ -20,6 +20,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Field\LongTextField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToManyAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToOneAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ReferenceVersionField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\StringField;
@@ -51,7 +52,6 @@ public static function defineFields(): FieldCollection
             new VersionField(),
             new CatalogField(),
 
-            new FkField('parent_id', 'parentId', self::class),
             new ParentField(self::class),
             new ReferenceVersionField(self::class, 'parent_version_id'),
 
@@ -82,7 +82,7 @@ public static function defineFields(): FieldCollection
             new TranslatedField('metaDescription'),
             new TranslatedField('cmsHeadline'),
             new TranslatedField('cmsDescription'),
-            new ManyToOneAssociationField('parent', 'parent_id', self::class, false),
+            new ParentAssociationField(self::class, false),
             new ManyToOneAssociationField('media', 'media_id', MediaDefinition::class, false),
             (new ChildrenAssociationField(self::class))->setFlags(new CascadeDelete()),
             (new TranslationsAssociationField(CategoryTranslationDefinition::class))->setFlags(new Required(), new CascadeDelete()),

diff --git a/Content/Product/ProductDefinition.php b/Content/Product/ProductDefinition.php
@@ -29,6 +29,8 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToManyAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToOneAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\PriceField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\PriceRulesJsonField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ReferenceVersionField;
@@ -75,7 +77,7 @@ public static function defineFields(): FieldCollection
             new VersionField(),
             new CatalogField(),
 
-            new FkField('parent_id', 'parentId', self::class),
+            new ParentField(self::class),
             new ReferenceVersionField(self::class, 'parent_version_id'),
 
             (new IntField('auto_increment', 'autoIncrement'))->setFlags(new ReadOnly()),
@@ -141,7 +143,7 @@ public static function defineFields(): FieldCollection
             (new TranslatedField('packUnit'))->setFlags(new Inherited()),
 
             //parent - child inheritance
-            new ManyToOneAssociationField('parent', 'parent_id', self::class, false),
+            new ParentAssociationField(self::class, false),
             new ChildrenAssociationField(self::class),
 
             //inherited associations

diff --git a/Framework/DataAbstractionLayer/Dbal/EntityReader.php b/Framework/DataAbstractionLayer/Dbal/EntityReader.php
@@ -13,6 +13,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToManyAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToOneAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\SearchKeywordAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\TranslatedField;
 use Shopware\Core\Framework\DataAbstractionLayer\FieldCollection;
@@ -190,7 +191,7 @@ private function joinBasic(string $definition, Context $context, string $root, Q
             }
 
             //self references can not be resolved, otherwise we get an endless loop
-            if ($field instanceof AssociationInterface && $field->getReferenceClass() === $definition) {
+            if ($field instanceof AssociationInterface && $field->getReferenceClass() === $definition && !$field instanceof ParentAssociationField) {
                 continue;
             }
 
@@ -769,6 +770,10 @@ private function loadManyToManyWithCriteria(Criteria $fieldCriteria, ManyToManyA
 
         $read = new ReadCriteria($ids);
 
+        foreach ($fieldCriteria->getAssociations() as $fieldName => $associationCriteria) {
+            $read->addAssociation($fieldName, $associationCriteria);
+        }
+
         $referenceClass = $association->getReferenceDefinition();
         $collectionClass = $referenceClass::getCollectionClass();
         $data = $this->_read($read, $referenceClass, $context, $referenceClass::getStructClass(), new $collectionClass(), $referenceClass::getFields()->filterBasic());
@@ -885,6 +890,10 @@ private function hasCriteriaElements(Criteria $criteria): bool
             return true;
         }
 
+        if (!empty($criteria->getAssociations())) {
+            return true;
+        }
+
         return false;
     }
 

diff --git a/Framework/DataAbstractionLayer/EntityDefinition.php b/Framework/DataAbstractionLayer/EntityDefinition.php
@@ -168,11 +168,6 @@ public static function getDefaults(EntityExistence $existence): array
         return [];
     }
 
-    public static function allowInheritance(): bool
-    {
-        return false;
-    }
-
     public static function isChildrenAware(): bool
     {
         return static::getFields()->get('children') instanceof ChildrenAssociationField;
@@ -185,7 +180,7 @@ public static function isChildCountAware(): bool
 
     public static function isInheritanceAware(): bool
     {
-        return static::allowInheritance() && static::getFields()->get('parent') instanceof ManyToOneAssociationField;
+        return false;
     }
 
     public static function isVersionAware(): bool

diff --git a/Framework/DataAbstractionLayer/Field/ParentAssociationField.php b/Framework/DataAbstractionLayer/Field/ParentAssociationField.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\Framework\DataAbstractionLayer\Field;
+
+class ParentAssociationField extends ManyToOneAssociationField
+{
+    public function __construct(
+        string $referenceClass,
+        bool $loadInBasic,
+        string $referenceField = 'id'
+    ) {
+        parent::__construct('parent', 'parent_id', $referenceClass, $loadInBasic, $referenceField);
+    }
+}
diff --git a/Framework/DataAbstractionLayer/Field/ParentField.php b/Framework/DataAbstractionLayer/Field/ParentField.php
@@ -7,6 +7,5 @@ class ParentField extends FkField
     public function __construct(string $referenceClass)
     {
         parent::__construct('parent_id', 'parentId', $referenceClass);
-        $this->referenceClass = $referenceClass;
     }
 }
diff --git a/Framework/DataAbstractionLayer/FieldSerializer/ParentAssociationFieldSerializer.php b/Framework/DataAbstractionLayer/FieldSerializer/ParentAssociationFieldSerializer.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer;
+
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentAssociationField;
+
+class ParentAssociationFieldSerializer extends ManyToOneAssociationFieldSerializer
+{
+    public function getFieldClass(): string
+    {
+        return ParentAssociationField::class;
+    }
+}
diff --git a/Framework/DependencyInjection/data-abstraction-layer.xml b/Framework/DependencyInjection/data-abstraction-layer.xml
@@ -1173,5 +1173,10 @@
         <service class="Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\VersionFieldSerializer" id="Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\VersionFieldSerializer">
             <tag name="shopware.field_serializer" />
         </service>
+
+        <service class="Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\ParentAssociationFieldSerializer" id="Shopware\Core\Framework\DataAbstractionLayer\FieldSerializer\ParentAssociationFieldSerializer">
+            <argument type="service" id="Shopware\Core\Framework\DataAbstractionLayer\Write\WriteCommandExtractor"/>
+            <tag name="shopware.field_serializer" />
+        </service>
     </services>
 </container>
diff --git a/Framework/Test/DataAbstractionLayer/Reader/EntityReaderTest.php b/Framework/Test/DataAbstractionLayer/Reader/EntityReaderTest.php
@@ -681,7 +681,6 @@ public function testLoadManyToManyNotLoadedAutomatically(): void
 
     public function testLoadNestedAssociation(): void
     {
-        static::markTestIncomplete('this test should be green if NEXT-1069 is resolved');
         $id1 = Uuid::uuid4()->getHex();
         $id2 = Uuid::uuid4()->getHex();
 

diff --git a/System/Language/LanguageDefinition.php b/System/Language/LanguageDefinition.php
@@ -23,6 +23,7 @@
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToManyAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ManyToOneAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\OneToManyAssociationField;
+use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentAssociationField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\ParentField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\StringField;
 use Shopware\Core\Framework\DataAbstractionLayer\Field\TenantIdField;
@@ -64,7 +65,7 @@ public static function defineFields(): FieldCollection
             (new StringField('name', 'name'))->setFlags(new Required()),
             new CreatedAtField(),
             new UpdatedAtField(),
-            new ManyToOneAssociationField('parent', 'parent_id', LanguageDefinition::class, false),
+            new ParentAssociationField(self::class, false),
             new ManyToOneAssociationField('locale', 'locale_id', LocaleDefinition::class, true),
             new ChildrenAssociationField(self::class),
             new OneToManyAssociationField('salesChannelDefaultAssignments', SalesChannelDefinition::class, 'language_id', false, 'id'),