fix resolve on connection edge

nuwave · Aug 28, 2016 · 0f44dd6 · 0f44dd6
1 parent bb57e25
commit 0f44dd6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/Schema/Registrars/EdgeRegistrar.php b/src/Schema/Registrars/EdgeRegistrar.php
@@ -3,14 +3,17 @@
 namespace Nuwave\Lighthouse\Schema\Registrars;
 
 use ReflectionClass;
+use GraphQL\Type\Definition\ObjectType;
 use Nuwave\Lighthouse\Schema\Registrars\BaseRegistrar;
 use Nuwave\Lighthouse\Schema\Generators\EdgeTypeGenerator;
 use Nuwave\Lighthouse\Support\Interfaces\ConnectionEdge;
 use Nuwave\Lighthouse\Support\Definition\Fields\EdgeField;
-use GraphQL\Type\Definition\ObjectType;
+use Nuwave\Lighthouse\Support\Traits\GlobalIdTrait;
 
 class EdgeRegistrar extends BaseRegistrar
 {
+    use GlobalIdTrait;
+
     /**
      * Collection of registered type instances.
      *
@@ -52,7 +55,7 @@ public function instance($name, $fresh = false, ObjectType $type = null)
         }
 
         if ($name instanceof ConnectionEdge) {
-            $intance = $this->createEdge($name);
+            $instance = $this->createEdge($name);
             $this->instances->put($instanceName, $instance);
 
             return $instance;
@@ -91,8 +94,12 @@ protected function createEdge(ConnectionEdge $edge)
 
         return new EdgeField([
             'type' => $this->createInstance($edge->name(), $graphqlType),
-            'resolve' => function ($payload) {
-                return call_user_func_array([$edge, 'cursor'], [$payload]);
+            'resolve' => function ($payload) use ($edge) {
+                $model = $edge->edge($payload);
+                $cursor = call_user_func_array([$edge, 'cursor'], [$payload]);
+                $model->relayCursor = $this->encodeGlobalId('arrayconnection', $cursor);
+
+                return $model;
             },
         ]);
     }

diff --git a/src/Support/Interfaces/ConnectionEdge.php b/src/Support/Interfaces/ConnectionEdge.php
@@ -18,6 +18,14 @@ public function name();
      */
     public function type();
 
+    /**
+     * Extract edge from payload.
+     *
+     * @param  mixed $payload
+     * @return mixed
+     */
+    public function edge($payload);
+
     /**
      * Resolve cursor.
      *