From 6bb5f6e0eb1869907b2a9d59321639987eea7d06 Mon Sep 17 00:00:00 2001
From: Stanislav Shupilkin <smolevich90@gmail.com>
Date: Wed, 31 Jul 2019 22:52:50 +0300
Subject: [PATCH 1/2] Revert changes in Builder and Model for id keys, fix test
 for Queue

---
 src/Jenssegers/Mongodb/Eloquent/Model.php | 4 ++--
 src/Jenssegers/Mongodb/Query/Builder.php  | 2 +-
 tests/QueueTest.php                       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Jenssegers/Mongodb/Eloquent/Model.php b/src/Jenssegers/Mongodb/Eloquent/Model.php
index f84c4d66a..0d5aa9228 100644
--- a/src/Jenssegers/Mongodb/Eloquent/Model.php
+++ b/src/Jenssegers/Mongodb/Eloquent/Model.php
@@ -32,7 +32,7 @@ abstract class Model extends BaseModel
      * @var string
      */
     protected $primaryKey = '_id';
-    
+
     /**
      * The primary key type.
      *
@@ -175,7 +175,7 @@ protected function getAttributeFromArray($key)
     public function setAttribute($key, $value)
     {
         // Convert _id to ObjectID.
-        if (($key == '_id' || Str::endsWith($key, '_id')) && is_string($value)) {
+        if ($key == '_id'  && is_string($value)) {
             $builder = $this->newBaseQueryBuilder();
 
             $value = $builder->convertKey($value);
diff --git a/src/Jenssegers/Mongodb/Query/Builder.php b/src/Jenssegers/Mongodb/Query/Builder.php
index 84874ed96..79b034e27 100644
--- a/src/Jenssegers/Mongodb/Query/Builder.php
+++ b/src/Jenssegers/Mongodb/Query/Builder.php
@@ -906,7 +906,7 @@ protected function compileWheres()
             }
 
             // Convert id's.
-            if (isset($where['column']) && ($where['column'] == '_id' || Str::endsWith($where['column'], '_id'))) {
+            if (isset($where['column']) && ($where['column'] == '_id' || Str::endsWith($where['column'], '._id'))) {
                 // Multiple values.
                 if (isset($where['values'])) {
                     foreach ($where['values'] as &$value) {
diff --git a/tests/QueueTest.php b/tests/QueueTest.php
index f3ebc94f6..7502ce6f7 100644
--- a/tests/QueueTest.php
+++ b/tests/QueueTest.php
@@ -24,6 +24,7 @@ public function testQueueJobLifeCycle()
             'displayName' => 'test',
             'job' => 'test',
             'maxTries' => null,
+            'delay' => null,
             'timeout' => null,
             'data' => ['action' => 'QueueJobLifeCycle'],
         ]), $job->getRawBody());

From 0bde2e703e712ee171e7bb3b8b8d10b6814694d1 Mon Sep 17 00:00:00 2001
From: Stanislav Shupilkin <smolevich90@gmail.com>
Date: Wed, 31 Jul 2019 22:57:19 +0300
Subject: [PATCH 2/2] Fix format in Model

---
 src/Jenssegers/Mongodb/Eloquent/Model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Jenssegers/Mongodb/Eloquent/Model.php b/src/Jenssegers/Mongodb/Eloquent/Model.php
index 0d5aa9228..de77b07bc 100644
--- a/src/Jenssegers/Mongodb/Eloquent/Model.php
+++ b/src/Jenssegers/Mongodb/Eloquent/Model.php
@@ -175,7 +175,7 @@ protected function getAttributeFromArray($key)
     public function setAttribute($key, $value)
     {
         // Convert _id to ObjectID.
-        if ($key == '_id'  && is_string($value)) {
+        if ($key == '_id' && is_string($value)) {
             $builder = $this->newBaseQueryBuilder();
 
             $value = $builder->convertKey($value);