Update whereDate

Author: GromNaN

CHANGELOG.md

@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file.
 - Remove `Query\Builder::whereAll($column, $values)`. Use `Query\Builder::where($column, 'all', $values)` instead. [#16](https://github.com/GromNaN/laravel-mongodb-private/pull/16) by [@GromNaN](https://github.com/GromNaN).
 - Fix validation of unique values when the validated value is found as part of an existing value. [#21](https://github.com/GromNaN/laravel-mongodb-private/pull/21) by [@GromNaN](https://github.com/GromNaN).
 - Support `%` and `_` in `like` expression [#17](https://github.com/GromNaN/laravel-mongodb-private/pull/17) by [@GromNaN](https://github.com/GromNaN).
-- Fix Query on `whereDate`, `whereDay`, `whereMonth`, `whereYear`, `whereTime` to use MongoDB operators [#2376](https://github.com/jenssegers/laravel-mongodb/pull/2376) by [@Davpyu](https://github.com/Davpyu)
+- Fix Query on `whereDate`, `whereDay`, `whereMonth`, `whereYear`, `whereTime` to use MongoDB operators [#2376](https://github.com/jenssegers/laravel-mongodb/pull/2572) by [@Davpyu](https://github.com/Davpyu) and [@GromNaN](https://github.com/GromNaN)
 
 ## [3.9.2] - 2022-09-01
 

src/Query/Builder.php

@@ -1202,16 +1202,10 @@ protected function compileWhereDate(array $where): array
                 ],
             ],
             'ne' => [
-                '$or' => [
-                    [
-                        $where['column'] => [
-                            '$lt' => $startOfDay,
-                        ],
-                    ],
-                    [
-                        $where['column'] => [
-                            '$gt' => $endOfDay,
-                        ],
+                $where['column'] => [
+                    '$not' => [
+                        '$gte' => $startOfDay,
+                        '$lte' => $endOfDay,
                     ],
                 ],
             ],

tests/Query/BuilderTest.php

@@ -662,9 +662,11 @@ function (Builder $builder) {
         ];
 
         yield 'where date !=' => [
-            ['find' => [['$or' => [
-                ['created_at' => ['$lt' => new UTCDateTime(new DateTimeImmutable('2018-09-30 00:00:00.000 +00:00'))]],
-                ['created_at' => ['$gt' => new UTCDateTime(new DateTimeImmutable('2018-09-30 23:59:59.999 +00:00'))]],
+            ['find' => [['created_at' => [
+                '$not' => [
+                    '$gte' => new UTCDateTime(new DateTimeImmutable('2018-09-30 00:00:00.000 +00:00')),
+                    '$lte' => new UTCDateTime(new DateTimeImmutable('2018-09-30 23:59:59.999 +00:00')),
+                ],
             ]], []]],
             fn (Builder $builder) => $builder->whereDate('created_at', '!=', '2018-09-30'),
         ];

tests/QueryTest.php

@@ -220,7 +220,7 @@ public function testWhereDate(): void
         $this->assertCount(2, $birthdayCount);
 
         $birthdayCount = Birthday::whereDate('birthday', '<>', '2021-05-11')->get();
-        $this->assertCount(5, $birthdayCount);
+        $this->assertCount(6, $birthdayCount);
     }
 
     public function testWhereDay(): void