[Updated PR#1796] Add Attributes to the Pivot Embed

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
@@ -25,7 +26,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});
         }
     }
 
@@ -69,4 +72,29 @@ 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

@@ -33,7 +33,13 @@ public function getRelationExistenceQuery(Builder $query, Builder $parentQuery,
      */
     protected function hydratePivotRelation(array $models)
     {
-        // Do nothing.
+        foreach ($models as $model) {
+            $keyToUse = $this->getTable() == $model->getTable() ? $this->getForeignKey() : $this->getRelatedKey();
+            $pcontent = $model->getAttributes()[$keyToUse];
+            $model->setRelation($this->accessor, $this->newExistingPivot(
+                is_string($pcontent[0]) ? ['_id' => $pcontent] : $pcontent[0]
+            ));
+        }
     }
 
     /**
@@ -71,8 +77,10 @@ public function addConstraints()
     protected function setWhere()
     {
         $foreign = $this->getForeignKey();
-
-        $this->query->where($foreign, '=', $this->parent->getKey());
+        $key = $this->parent->getKey();
+        $this->query
+            ->where($foreign, '=', $key)
+            ->orWhereRaw([$foreign.'._id' => $key]);
 
         return $this;
     }
@@ -129,6 +137,12 @@ public function sync($ids, $detaching = true)
         // See issue #256.
         if ($current instanceof Collection) {
             $current = $ids->modelKeys();
+        } elseif (is_array($current)) {
+            foreach ($current as $key => $value) {
+                if (is_array($value) && $value['_id']) {
+                    $current[$key] = $value['_id'];
+                }
+            }
         }
 
         $records = $this->formatSyncList($ids);
@@ -171,7 +185,30 @@ 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);
     }
 
     /**
@@ -185,22 +222,30 @@ public function attach($id, array $attributes = [], $touch = true)
             $id = $model->getKey();
 
             // Attach the new parent id to the related model.
-            $model->push($this->foreignPivotKey, $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, $this->parent->getKey(), true);
+            $query->push($this->foreignPivotKey, [array_merge($attributes, ['_id' => $this->parent->getKey()])], true);
+        }
+
+        //Pivot Collection
+        $pivot_x = [];
+        foreach ((array) $id as $item) {
+            $pivot_x[] = array_merge($attributes, ['_id' => $item]);
         }
 
         // Attach the new ids to the parent model.
-        $this->parent->push($this->getRelatedKey(), (array) $id, true);
+        $this->parent->push($this->getRelatedKey(), $pivot_x, true);
 
         if ($touch) {
             $this->touchIfTouching();
@@ -224,7 +269,9 @@ public function detach($ids = [], $touch = true)
         $ids = (array) $ids;
 
         // Detach all ids from the parent model.
+        // 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) {
@@ -233,6 +280,7 @@ public function detach($ids = [], $touch = true)
 
         // Remove the relation to the parent.
         $query->pull($this->foreignPivotKey, $this->parent->getKey());
+        $query->pull($this->foreignPivotKey, [$this->parentKey => $this->parent->getKey()]);
 
         if ($touch) {
             $this->touchIfTouching();
@@ -255,7 +303,11 @@ protected function buildDictionary(Collection $results)
 
         foreach ($results as $result) {
             foreach ($result->$foreign as $item) {
-                $dictionary[$item][] = $result;
+                if (is_array($item)) {
+                    $dictionary[$item['_id']][] = $result;
+                } else {
+                    $dictionary[$item][] = $result;
+                }
             }
         }
 
@@ -342,4 +394,15 @@ protected function whereInMethod(EloquentModel $model, $key)
     {
         return 'whereIn';
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function addEagerConstraints(array $models)
+    {
+        $keys = $this->getKeys($models, $this->parentKey);
+        $this->query
+            ->whereIn($this->getQualifiedForeignPivotKeyName(), $keys)
+            ->orWhereRaw([$this->getQualifiedForeignPivotKeyName().'._id' => ['$in' => $keys]]);
+    }
 }

src/Jenssegers/Mongodb/Relations/HasMany.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;
 use Illuminate\Database\Eloquent\Relations\HasMany as EloquentHasMany;
 
@@ -71,7 +72,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);
     }
 
     /**
@@ -84,4 +87,13 @@ protected function whereInMethod(EloquentModel $model, $key)
     {
         return 'whereIn';
     }
+
+    protected function buildDictionary(Collection $results)
+    {
+        $foreign = $this->getForeignKeyName();
+
+        return $results->mapToDictionary(function ($result) use ($foreign) {
+            return [(string) $result->{$foreign} => $result];
+        })->all();
+    }
 }

src/Jenssegers/Mongodb/Relations/HasOne.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;
 use Illuminate\Database\Eloquent\Relations\HasOne as EloquentHasOne;
 
@@ -84,4 +85,16 @@ protected function whereInMethod(EloquentModel $model, $key)
     {
         return 'whereIn';
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function buildDictionary(Collection $results)
+    {
+        $foreign = $this->getForeignKeyName();
+
+        return $results->mapToDictionary(function ($result) use ($foreign) {
+            return [(string) $result->{$foreign} => $result];
+        })->all();
+    }
 }

src/Jenssegers/Mongodb/Relations/MorphMany.php

@@ -2,6 +2,7 @@
 
 namespace Jenssegers\Mongodb\Relations;
 
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 use Illuminate\Database\Eloquent\Relations\MorphMany as EloquentMorphMany;
 
@@ -19,4 +20,16 @@ protected function whereInMethod(EloquentModel $model, $key)
     {
         return 'whereIn';
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function buildDictionary(Collection $results)
+    {
+        $foreign = $this->getForeignKeyName();
+
+        return $results->mapToDictionary(function ($result) use ($foreign) {
+            return [(string) $result->{$foreign} => $result];
+        })->all();
+    }
 }

src/Jenssegers/Mongodb/Relations/MorphTo.php

@@ -2,6 +2,7 @@
 
 namespace Jenssegers\Mongodb\Relations;
 
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model as EloquentModel;
 use Illuminate\Database\Eloquent\Relations\MorphTo as EloquentMorphTo;
 
@@ -53,4 +54,16 @@ protected function whereInMethod(EloquentModel $model, $key)
     {
         return 'whereIn';
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function buildDictionary(Collection $models)
+    {
+        foreach ($models as $model) {
+            if ($model->{$this->morphType}) {
+                $this->dictionary[$model->{$this->morphType}][(string) $model->{$this->foreignKey}][] = $model;
+            }
+        }
+    }
 }