Fixes #236

Author: jenssegers

src/Jenssegers/Mongodb/Model.php

@@ -222,7 +222,7 @@ public function getTable()
     public function getAttribute($key)
     {
         // Check if the key is an array dot notation.
-        if (strpos($key, '.') !== false)
+        if (str_contains($key, '.'))
         {
             $attributes = array_dot($this->attributes);
 
@@ -274,7 +274,7 @@ protected function getAttributeFromArray($key)
             return $this->attributes[$key];
         }
 
-        else if (strpos($key, '.') !== false)
+        elseif (str_contains($key, '.'))
         {
             $attributes = array_dot($this->attributes);
 
@@ -302,6 +302,17 @@ public function setAttribute($key, $value)
             $value = $builder->convertKey($value);
         }
 
+        // Support keys in dot notation.
+        elseif (str_contains($key, '.'))
+        {
+            if (in_array($key, $this->getDates()) && $value)
+            {
+                $value = $this->fromDateTime($value);
+            }
+
+            array_set($this->attributes, $key, $value); return;
+        }
+
         parent::setAttribute($key, $value);
     }
 

src/Jenssegers/Mongodb/Relations/HasMany.php

@@ -20,4 +20,14 @@ public function getRelationCountQuery(Builder $query, Builder $parent)
         return $query->select($this->getHasCompareKey())->where($this->getHasCompareKey(), 'exists', true);
     }
 
+    /**
+     * Get the plain foreign key.
+     *
+     * @return string
+     */
+    public function getPlainForeignKey()
+    {
+        return $this->getForeignKey();
+    }
+
 }

src/Jenssegers/Mongodb/Relations/HasOne.php

@@ -20,4 +20,14 @@ public function getRelationCountQuery(Builder $query, Builder $parent)
         return $query->select($this->getHasCompareKey())->where($this->getHasCompareKey(), 'exists', true);
     }
 
+    /**
+     * Get the plain foreign key.
+     *
+     * @return string
+     */
+    public function getPlainForeignKey()
+    {
+        return $this->getForeignKey();
+    }
+
 }

tests/RelationsTest.php

@@ -131,6 +131,7 @@ public function testEasyRelation()
         $items = $user->items;
         $this->assertEquals(1, count($items));
         $this->assertInstanceOf('Item', $items[0]);
+        $this->assertEquals($user->_id, $items[0]->user_id);
 
         // Has one
         $user = User::create(array('name' => 'John Doe'));
@@ -141,6 +142,7 @@ public function testEasyRelation()
         $role = $user->role;
         $this->assertInstanceOf('Role', $role);
         $this->assertEquals('admin', $role->type);
+        $this->assertEquals($user->_id, $role->user_id);
     }
 
     public function testBelongsToMany()
@@ -415,6 +417,9 @@ public function testNestedKeys()
 
         $address = $client->addresses->first();
         $this->assertEquals('Paris', $address->data['city']);
+
+        $client = Client::with('addresses')->first();
+        $this->assertEquals('Paris', $client->addresses->first()->data['city']);
     }
 
     public function testDoubleSaveOneToMany()

tests/models/Client.php

@@ -19,6 +19,6 @@ public function photo()
 
     public function addresses()
     {
-        return $this->hasMany('Address', 'data.client_id', 'data.address_id');
+        return $this->hasMany('Address', 'data.address_id', 'data.client_id');
     }
 }