Cleaning Up Updates

Author: AAllport

src/Jenssegers/Mongodb/Relations/BelongsToMany.php

@@ -198,7 +198,32 @@ public function sync($ids, $detaching = true)
      */
     public function updateExistingPivot($id, array $attributes, $touch = true)
     {
-        // Do nothing, we have no pivot table.
+        if ($id instanceof Model) {
+            $model = $id;
+            $id = $model->getKey();
+        } else {
+            if ($id instanceof Collection) {
+                $id = $id->modelKeys();
+            }
+
+            $related = $this->newRelatedQuery()->whereIn($this->related->getKeyName(), (array) $id);
+            $filter = [$this->parentKey => $this->parent->getKey()];
+            $pivot_x = [array_merge($attributes, $filter)];
+
+            //TODO: Put this in a transaction
+            $related->pull($this->getForeignKey(), $this->parent->getKey());
+            $related->pull($this->getForeignKey(), $filter);
+            $related->push($this->getForeignKey(),$pivot_x,true);
+
+        }
+        $filter = [$this->parentKey => $id];
+        $pivot_x = [array_merge($attributes, $filter)];
+
+        //TODO: Put this in a transaction
+        $this->parent->pull($this->getRelatedKey(), $id);
+        $this->parent->pull($this->getRelatedKey(), $filter);
+        $this->parent->push($this->getRelatedKey(), $pivot_x, true);
+
     }
 
     /**
@@ -265,14 +290,12 @@ public function detach($ids = [], $touch = true)
 
         // Prepare the query to select all related objects.
         if (count($ids) > 0) {
-            $query
-                ->whereIn($this->related->getKeyName(), $ids)
-                ->orWhereIn($this->related->getKeyName().'._id', $ids);
+            $query->whereIn($this->related->getKeyName(), $ids);
         }
 
         // Remove the relation to the parent.
         $query->pull($this->foreignPivotKey, $this->parent->getKey());
-        $query->pull($this->foreignPivotKey, ['_id'=>$this->parent->getKey()]);
+        $query->pull($this->foreignPivotKey, [$this->parentKey=>$this->parent->getKey()]);
 
         if ($touch) {
             $this->touchIfTouching();

tests/RelationsTest.php

@@ -263,10 +263,7 @@ public function testBelongsToManyAttachesExistingModels()
         $user->clients()->sync($moreClients);
 
         // Refetch
-//        $user = User::with('clients')->find($user->_id);
-        /** @var User $user */
-        $user = User::find($user->_id);
-        $user->load('clients');
+        $user = User::with('clients')->find($user->_id);
 
         // Assert there are now still 2 client objects in the relationship
         $this->assertCount(2, $user->clients()->get());
@@ -304,7 +301,10 @@ public function testBelongsToManySyncAttrs()
         $client2 = Client::create(['name' => 'Buffet Bar Inc.'])->_id;
 
         // Sync multiple
-        $user->clients()->sync([$client1 => ['fresh_client' => true], $client2 => ['fresh_client' => false]]);
+        $user->clients()->sync([
+            $client1 => ['fresh_client' => true],
+            $client2 => ['fresh_client' => false]
+        ]);
 
         //Check Sync Success
         $this->assertEquals($user->client_ids[0]['_id'], $client1);
@@ -317,11 +317,26 @@ public function testBelongsToManySyncAttrs()
         $clients = $user->clients;
         $this->assertCount(2, $clients);
 
-        foreach ($user->clients()->withPivot('fresh_client')->get() as $item) {
+        foreach ($user->clients()->get() as $item) {
             $this->assertIsArray($item->pivot->toArray());
             $this->assertEquals($item->_id == $client1, $item->pivot->fresh_client);
         }
-        $this->assertTrue(true);
+    }
+
+    public function testBelongsToManyUpdatePivot()
+    {
+        /** @var User $user */
+        $user = User::create(['name' => 'John Doe']);
+        $client1 = Client::create(['name' => 'Pork Pies Ltd.'])->_id;
+        $client2 = Client::create(['name' => 'Buffet Bar Inc.'])->_id;
+
+        // Sync multiple
+        $user->clients()->sync([
+            $client1 => ['fresh_client' => true],
+            $client2 => ['fresh_client' => false]
+        ]);
+        $user->clients()->updateExistingPivot($client1,['fresh_client'=>false]);
+        $this->assertFalse($user->clients()->where('_id',$client1)->first()->pivot->fresh_client);
     }
 
     public function testBelongsToManyAttachArray()