Merge pull request #1454 from RomM1/queueable-relationships

fix serialize embedded relationships

src/Jenssegers/Mongodb/Eloquent/Model.php

@@ -11,6 +11,8 @@ use Illuminate\Support\Str;
 use Jenssegers\Mongodb\Query\Builder as QueryBuilder;
 use MongoDB\BSON\ObjectID;
 use MongoDB\BSON\UTCDateTime;
+use Illuminate\Contracts\Queue\QueueableEntity;
+use Illuminate\Contracts\Queue\QueueableCollection;
 
 abstract class Model extends BaseModel
 {
@@ -420,6 +422,52 @@ abstract class Model extends BaseModel
         return $key;
     }
 
+    /**
+     * Get the queueable relationships for the entity.
+     *
+     * @return array
+     */
+    public function getQueueableRelations()
+    {
+        $relations = [];
+
+        foreach ($this->getRelationsWithoutParent() as $key => $relation) {
+            if (method_exists($this, $key)) {
+                $relations[] = $key;
+            }
+
+            if ($relation instanceof QueueableCollection) {
+                foreach ($relation->getQueueableRelations() as $collectionValue) {
+                    $relations[] = $key.'.'.$collectionValue;
+                }
+            }
+
+            if ($relation instanceof QueueableEntity) {
+                foreach ($relation->getQueueableRelations() as $entityKey => $entityValue) {
+                    $relations[] = $key.'.'.$entityValue;
+                }
+            }
+        }
+
+        return array_unique($relations);
+    }
+
+    /**
+     * Get loaded relations for the instance without parent.
+     *
+     * @return array
+     */
+    protected function getRelationsWithoutParent()
+    {
+        $relations = $this->getRelations();
+
+        if ($parentRelation = $this->getParentRelation()) {
+            unset($relations[$parentRelation->getQualifiedForeignKeyName()]);
+        }
+
+        return $relations;
+    }
+
     /**
      * @inheritdoc
      */

src/Jenssegers/Mongodb/Relations/EmbedsOneOrMany.php

@@ -393,4 +393,14 @@ abstract class EmbedsOneOrMany extends Relation
 
         return $results;
     }
+
+    /**
+     * Get the foreign key for the relationship.
+     *
+     * @return string
+     */
+    public function getQualifiedForeignKeyName()
+    {
+        return $this->foreignKey;
+    }
 }

tests/EmbeddedRelationsTest.php

@@ -765,4 +765,23 @@ class EmbeddedRelationsTest extends TestCase
         $this->assertEquals(2, $results->count());
         $this->assertEquals(3, $results->total());
     }
+
+    public function testGetQueueableRelationsEmbedsMany()
+    {
+        $user = User::create(['name' => 'John Doe']);
+        $user->addresses()->save(new Address(['city' => 'New York']));
+        $user->addresses()->save(new Address(['city' => 'Paris']));
+
+        $this->assertEquals(['addresses'], $user->getQueueableRelations());
+        $this->assertEquals([], $user->addresses->getQueueableRelations());
+    }
+
+    public function testGetQueueableRelationsEmbedsOne()
+    {
+        $user = User::create(['name' => 'John Doe']);
+        $user->father()->save(new User(['name' => 'Mark Doe']));
+
+        $this->assertEquals(['father'], $user->getQueueableRelations());
+        $this->assertEquals([], $user->father->getQueueableRelations());
+    }
 }