Merge pull request #89 from BurningDog/feature/relationships-data-meta

Bug: data.meta ignored in relationships

Author: JaZo

src/Item.php

@@ -142,15 +142,22 @@ public function getRelationships(): array
                         'type' => $relation->getIncluded()->getType(),
                         'id' => $relation->getIncluded()->getId(),
                     ];
+                    if ($relation->getIncluded()->getMeta()) {
+                        $relationships[$name]['data']['meta'] = $relation->getIncluded()->getMeta()->toArray();
+                    }
                 }
             } elseif ($relation instanceof ManyRelationInterface) {
                 $relationships[$name]['data'] = [];
 
                 foreach ($relation->getIncluded() as $item) {
-                    $relationships[$name]['data'][] = [
+                    $data = [
                         'type' => $item->getType(),
                         'id' => $item->getId(),
                     ];
+                    if ($item->getMeta()) {
+                        $data['meta'] = $item->getMeta()->toArray();
+                    }
+                    $relationships[$name]['data'][] = $data;
                 }
             }
 

src/Parsers/ItemParser.php

@@ -191,6 +191,11 @@ function ($identifier) {
             throw new ValidationException(sprintf('ResourceIdentifier property "id" MUST be a string, "%s" given.', gettype($data->id)));
         }
 
-        return $this->getItemInstance($data->type)->setId($data->id);
+        $item = $this->getItemInstance($data->type)->setId($data->id);
+        if (property_exists($data, 'meta')) {
+            $item->setMeta($this->metaParser->parse($data->meta));
+        }
+
+        return $item;
     }
 }

tests/ItemTest.php

@@ -511,7 +511,9 @@ public function itCanGetAllRelationships()
         $masterItem = new MasterItem();
         $childItem = new ChildItem();
         $childItem->setId('1');
+        $childItem->setMeta(new Meta(['foo' => 'bar']));
         $masterItem->child()->associate($childItem);
+        $masterItem->children()->associate(new Collection([$childItem]));
 
         $relations = $masterItem->getRelationships();
 
@@ -520,6 +522,20 @@ public function itCanGetAllRelationships()
                 'data' => [
                     'type' => 'child',
                     'id' => '1',
+                    'meta' => [
+                        'foo' => 'bar',
+                    ],
+                ],
+            ],
+            'children' => [
+                'data' => [
+                    [
+                        'type' => 'child',
+                        'id' => '1',
+                        'meta' => [
+                            'foo' => 'bar',
+                        ],
+                    ],
                 ],
             ],
         ], $relations);

tests/Parsers/ItemParserTest.php

@@ -645,6 +645,25 @@ public function itParsesMeta()
         static::assertEquals(new Meta(['foo' => 'bar']), $item->getMeta());
     }
 
+    /**
+     * @test
+     */
+    public function itParsesMetaInData()
+    {
+        $typeMapper = new TypeMapper();
+        $typeMapper->setMapping('child', ChildItem::class);
+        $typeMapper->setMapping('master', MasterItem::class);
+        $parser = $this->getItemParser($typeMapper);
+
+        $item = $parser->parse($this->getJsonApiItemMock('master', '1'));
+
+        $dataMeta = $item->getRelation('childwithdatameta')->getIncluded()->getMeta();
+        static::assertInstanceOf(Meta::class, $dataMeta);
+
+        $image = $dataMeta->imageDerivatives->links->header->href;
+        $this->assertEquals('https://example.com/image/header/about-us.jpeg', $image);
+    }
+
     /**
      * @param \Swis\JsonApi\Client\Interfaces\TypeMapperInterface|null $typeMapper
      *
@@ -766,6 +785,30 @@ private function getJsonApiItemMock($type, $id)
                         'foo' => 'bar',
                     ],
                 ],
+                'childwithdatameta' => [
+                    'data' => [
+                        'type' => 'child',
+                        'id' => '9',
+                        'meta' => [
+                          'alt' => '',
+                          'width' => 1920,
+                          'height' => 1280,
+                          'imageDerivatives' => [
+                            'links' => [
+                              'header' => [
+                                'href' => 'https://example.com/image/header/about-us.jpeg',
+                                'meta' => [
+                                  'rel' => 'drupal://jsonapi/extensions/consumer_image_styles/links/relation-types/#derivative',
+                                ],
+                              ],
+                            ],
+                          ],
+                        ],
+                    ],
+                    'links' => [
+                        'self' => 'http://example.com/'.$type.'/'.$id.'/relationships/childwithdatameta',
+                    ],
+                ],
                 'empty' => [
                     'data' => null,
                 ],