Revert changes in Builder and Model for id keys, fix test for Queue (#1795)

* Revert changes in Builder and Model for id keys, fix test for Queue

* Fix format in Model

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 @@ abstract class Model extends BaseModel
     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);

src/Jenssegers/Mongodb/Query/Builder.php

@@ -906,7 +906,7 @@ class Builder extends BaseBuilder
             }
 
             // 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) {

tests/QueueTest.php

@@ -24,6 +24,7 @@ class QueueTest extends TestCase
             'displayName' => 'test',
             'job' => 'test',
             'maxTries' => null,
+            'delay' => null,
             'timeout' => null,
             'data' => ['action' => 'QueueJobLifeCycle'],
         ]), $job->getRawBody());