Syncing

Author: AAllport

src/Jenssegers/Mongodb/Relations/BelongsTo.php

@@ -3,6 +3,7 @@
 namespace Jenssegers\Mongodb\Relations;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 
 class BelongsTo extends \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -26,7 +27,9 @@ public function addConstraints()
             // For belongs to relationships, which are essentially the inverse of has one
             // or has many relationships, we need to actually query on the primary key
             // of the related models matching on the foreign key that's on a parent.
-            $this->query->where($this->getOwnerKey(), '=', $this->parent->{$this->foreignKey});
+            $this->query
+                ->where($this->getOwnerKey(), '=', $this->parent->{$this->foreignKey})
+                ->orWhere($this->getOwnerKey().'._id', '=', $this->parent->{$this->foreignKey});
         }
     }
 
@@ -72,4 +75,34 @@ protected function whereInMethod(EloquentModel $model, $key)
     {
         return 'whereIn';
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function match(array $models, Collection $results, $relation)
+    {
+        $foreign = $this->foreignKey;
+
+        $owner = $this->ownerKey;
+
+        // First we will get to build a dictionary of the child models by their primary
+        // key of the relationship, then we can easily match the children back onto
+        // the parents using that dictionary and the primary key of the children.
+        $dictionary = [];
+
+        foreach ($results as $result) {
+            $dictionary[$result->getAttribute($owner)] = $result;
+        }
+
+        // Once we have the dictionary constructed, we can loop through all the parents
+        // and match back onto their children using these keys of the dictionary and
+        // the primary key of the children to map them onto the correct instances.
+        foreach ($models as $model) {
+            if (isset($dictionary[(string)$model->{$foreign}])) {
+                $model->setRelation($relation, $dictionary[(string)$model->{$foreign}]);
+            }
+        }
+
+        return $models;
+    }
 }

src/Jenssegers/Mongodb/Relations/BelongsToMany.php

@@ -141,8 +141,9 @@ public function sync($ids, $detaching = true)
         if ($current instanceof Collection) {
             $current = $ids->modelKeys();
         } elseif (is_array($current)) {
+
             foreach ($current as $key => $value) {
-                if ($value['_id']) {
+                if (is_array($value) && $value['_id']) {
                     $current[$key] = $value['_id'];
                 }
             }
@@ -201,18 +202,20 @@ public function attach($id, array $attributes = [], $touch = true)
             $id = $model->getKey();
 
             // Attach the new parent id to the related model.
-            $model->push($this->foreignPivotKey, array_merge($attributes, ['_id' => $this->parent->getKey()]), true);
+            $model->push($this->foreignPivotKey, [array_merge($attributes, ['_id' => $this->parent->getKey()])], true);
         } else {
             if ($id instanceof Collection) {
                 $id = $id->modelKeys();
             }
 
             $query = $this->newRelatedQuery();
 
-            $query->whereIn($this->related->getKeyName(), (array) $id);
+            $query
+                ->whereIn($this->related->getKeyName(), (array)$id)
+                ->orWhereIn($this->related->getKeyName().'._id', (array)$id);
 
             // Attach the new parent id to the related model.
-            $query->push($this->foreignPivotKey, array_merge($attributes, ['_id' => $this->parent->getKey()]), true);
+            $query->push($this->foreignPivotKey, [array_merge($attributes, ['_id' => $this->parent->getKey()])], true);
         }
 
         //Pivot Collection
@@ -246,14 +249,19 @@ public function detach($ids = [], $touch = true)
         $ids = (array) $ids;
 
         // Detach all ids from the parent model.
-        $this->parent->pull($this->getRelatedKey(), ['_id'=>$ids]);
+        // Legacy Support
+        $this->parent->pull($this->getRelatedKey(), $ids);
+        $this->parent->pull($this->getRelatedKey(), ['_id'=>['$in'=>$ids]]);
 
         // Prepare the query to select all related objects.
         if (count($ids) > 0) {
-            $query->whereIn($this->related->getKeyName(), $ids);
+            $query
+                ->whereIn($this->related->getKeyName(), $ids)
+                ->orWhereIn($this->related->getKeyName().'._id', $ids);
         }
 
         // Remove the relation to the parent.
+        $query->pull($this->foreignPivotKey, $this->parent->getKey());
         $query->pull($this->foreignPivotKey, ['_id'=>$this->parent->getKey()]);
 
         if ($touch) {

src/Jenssegers/Mongodb/Relations/HasMany.php

@@ -3,8 +3,8 @@
 namespace Jenssegers\Mongodb\Relations;
 
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Relations\HasMany as EloquentHasMany;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
+use Illuminate\Database\Eloquent\Relations\HasMany as EloquentHasMany;
 
 class HasMany extends EloquentHasMany
 {
@@ -76,7 +76,9 @@ public function getRelationQuery(Builder $query, Builder $parent, $columns = ['*
 
         $key = $this->wrap($this->getQualifiedParentKeyName());
 
-        return $query->where($this->getHasCompareKey(), 'exists', true);
+        return $query
+            ->where($this->getHasCompareKey(), 'exists', true)
+            ->orWhere($this->getHasCompareKey().'._id', 'exists', true);
     }
 
     /**

tests/RelationsTest.php

@@ -224,7 +224,7 @@ public function testBelongsToMany()
 
     public function testBelongsToManyAttachesExistingModels()
     {
-        $user = User::create(['name' => 'John Doe', 'client_ids' => ['1234523']]);
+        $user = User::create(['name' => 'John Doe', 'client_ids' => [['_id'=>'1234523']]]);
 
         $clients = [
             Client::create(['name' => 'Pork Pies Ltd.'])->_id,
@@ -239,7 +239,8 @@ public function testBelongsToManyAttachesExistingModels()
         // Sync multiple records
         $user->clients()->sync($clients);
 
-        $user = User::with('clients')->find($user->_id);
+//        $user = User::with('clients')->find($user->_id);
+        $user = User::find($user->_id);
 
         // Assert non attached ID's are detached succesfully
         $this->assertNotContains('1234523', $user->client_ids);
@@ -543,20 +544,20 @@ public function testDoubleSaveManyToMany()
         $user->save();
 
         $this->assertEquals(1, $user->clients()->count());
-        $this->assertEquals([$user->_id], $client->user_ids);
-        $this->assertEquals([$client->_id], $user->client_ids);
+        $this->assertEquals([['_id' =>$user->_id]], $client->user_ids);
+        $this->assertEquals([['_id' => $client->_id]], $user->client_ids);
 
         $user = User::where('name', 'John Doe')->first();
         $client = Client::where('name', 'Admins')->first();
         $this->assertEquals(1, $user->clients()->count());
-        $this->assertEquals([$user->_id], $client->user_ids);
-        $this->assertEquals([$client->_id], $user->client_ids);
+        $this->assertEquals([['_id' =>$user->_id]], $client->user_ids);
+        $this->assertEquals([['_id' => $client->_id]], $user->client_ids);
 
         $user->clients()->save($client);
         $user->clients()->save($client);
         $user->save();
         $this->assertEquals(1, $user->clients()->count());
-        $this->assertEquals([$user->_id], $client->user_ids);
-        $this->assertEquals([$client->_id], $user->client_ids);
+        $this->assertEquals([['_id' =>$user->_id]], $client->user_ids);
+        $this->assertEquals([['_id' => $client->_id]], $user->client_ids);
     }
 }