Fix graphql support for relationship fieldtype

Author: bryannielsen

CHANGELOG.md

@@ -9,7 +9,11 @@
 
 - Filesystem errors on some Windows environments when running coilpack install command
 - GraphQL fieldtype modifier registration bug
-- Use coding standard
+- GraphQL support for relationship fieldtype
+
+### Changed
+
+- Use Laravel coding standard
 - Improved typehints
 
 ## [0.0.1] - 2022-12-29

src/Api/Graph/Queries/ChannelEntriesQuery.php

@@ -26,6 +26,9 @@ public function args(): array
             'channel' => [
                 'type' => Type::string(),
             ],
+            'title' => [
+                'type' => Type::string(),
+            ],
             'status' => [
                 'type' => Type::string(),
             ],
@@ -45,14 +48,19 @@ public function resolve($root, array $args, $context, ResolveInfo $info, \Closur
 
         $entries = ChannelEntry::select($select)->with($with);
 
-        // Filter by Channel name
+        // Filter by Channel Name
         $entries->when($args['channel'] ?? false, function ($query) use ($args) {
             $query->whereHas('channel', function ($query) use ($args) {
                 $query->where('channel_name', $args['channel']);
             });
         });
 
-        // Filter by status
+        // Filter by Entry Title
+        $entries->when($args['title'] ?? false, function ($query) use ($args) {
+            $query->where('title', $args['title']);
+        });
+
+        // Filter by Status
         $entries->when($args['status'] ?? false, function ($query) use ($args) {
             $query->where('status', $args['status']);
         });

src/FieldtypeOutput.php

@@ -62,6 +62,11 @@ public function toJson()
 
     public function getIterator(): \Traversable
     {
+        // If we have an object set and it is iterable we will prefer to use that
+        if ($this->object && method_exists($this->object, 'getIterator')) {
+            return $this->object->getIterator();
+        }
+
         if (is_object($this->array) && method_exists($this->array, 'getIterator')) {
             return $this->array->getIterator();
         }
@@ -129,6 +134,10 @@ public function __toString()
 
     public function __get($key)
     {
+        if ($this->object && property_exists($this->object, $key)) {
+            return $this->object->$key;
+        }
+
         if (array_key_exists($key, (array) $this->array)) {
             return $this->array[$key];
         }

src/Fieldtypes/Relationship.php

@@ -46,10 +46,6 @@ protected function loadData(FieldContent $content)
 
     public function graphType()
     {
-        return \Rebing\GraphQL\Support\Facades\GraphQL::type('ChannelEntry');
-
-        return \GraphQL\Type\Definition\Type::listOf(
-            \Rebing\GraphQL\Support\Facades\GraphQL::type('ChannelEntry')
-        );
+        return 'ChannelEntry';
     }
 }

tests/Graphql/ChannelEntriesTest.php

@@ -133,6 +133,29 @@ public function test_entries_grid_field_image_modifier()
         ->assertJsonFragment(['width' => 100]);
     }
 
+    public function test_entries_relationship()
+    {
+        $this->postJson('graphql', [
+            'query' => <<<GQL
+            {
+                channel_entries(title:"Test Fieldtypes" limit:1){
+                    entry_id
+                    test_relationships {
+                        title
+                        blog_audio {
+                            id
+                            type
+                        }
+                    }
+                }
+            }
+          GQL
+        ])
+        ->assertJsonFragment(['title' => 'Entry with SoundCloud audio'])
+        ->assertJsonFragment(['id' => '164768245'])
+        ->assertJsonFragment(['type' => 'soundcloud']);
+    }
+
     public function test_entries_text_field_modifier()
     {
         $this->postJson('graphql', [