model relations

Author: Pooya Parsa

src/Jenssegers/Mongodb/Eloquent/Model.php

@@ -234,17 +234,29 @@ public function getAttribute($key)
 
                 // This attribute matches an embedsOne or embedsMany relation so we need
                 // to return the relation results instead of the interal attributes.
-                if ($relations instanceof EmbedsOneOrMany or $relations instanceof MorphTo) {
+                if ($relations instanceof EmbedsOneOrMany) {
                     // If the key already exists in the relationships array, it just means the
                     // relationship has already been loaded, so we'll just return it out of
                     // here because there is no need to query within the relations twice.
-                    if (array_key_exists($key, $this->relations) && $this->relations[$key] != null) {
+                    if (array_key_exists($key, $this->relations)) {
                         return $this->relations[$key];
                     }
 
                     // Get the relation results.
                     return $this->getRelationshipFromMethod($key, $camelKey);
                 }
+
+                if($relations instanceof Relation) {
+                    // If the key already exists in the relationships array, it just means the
+                    // relationship has already been loaded, so we'll just return it out of
+                    // here because there is no need to query within the relations twice.
+                    if (array_key_exists($key, $this->relations) && $this->relations[$key] !=null)
+                        return $this->relations[$key];
+
+                    // Get the relation results.
+                    return $this->getRelationshipFromMethod($key, $camelKey);
+                }
+
             }
         }
 

tests/RelationsTest.php

@@ -322,8 +322,8 @@ public function testBelongsToManyCustom()
         $this->assertTrue(array_key_exists('groups', $user->getAttributes()));
 
         // Assert they are attached
-        $this->assertTrue(in_array($group->_id, $user->groups));
-        $this->assertTrue(in_array($user->_id, $group->users));
+        $this->assertTrue(in_array($group->_id, $user->groups->pluck('_id')->toArray()));
+        $this->assertTrue(in_array($user->_id, $group->users->pluck('_id')->toArray()));
         $this->assertEquals($group->_id, $user->groups()->first()->_id);
         $this->assertEquals($user->_id, $group->users()->first()->_id);
     }