Fix Unit Tests

byjg · Jan 9, 2024 · c419e21 · c419e21
1 parent ffab662
commit c419e21
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -6,6 +6,11 @@
       "ByJG\\AnyDataset\\NoSql\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+    }
+  },
   "prefer-stable": true,
   "minimum-stability": "dev",
   "require": {

diff --git a/src/MongoDbDriver.php b/src/MongoDbDriver.php
@@ -107,7 +107,7 @@ public function getDbConnection(): ?Manager
     public function getDocumentById(string $idDocument, mixed $collection = null): ?NoSqlDocument
     {
         $filter = new IteratorFilter();
-        $filter->addRelation('_id', Relation::EQUAL, $idDocument);
+        $filter->addRelation('_id', Relation::EQUAL, new ObjectID($idDocument));
         $document = $this->getDocuments($filter, $collection);
 
         if (empty($document)) {
@@ -253,14 +253,17 @@ public function save(NoSqlDocument $document): NoSqlDocument
             $idDocument = $data['_id'] ?? null;
         }
 
-        $data['updated'] = new UTCDateTime((new DateTime())->getTimestamp()*1000);
         if (empty($idDocument)) {
             $data['_id'] = $idDocument = new ObjectID();
             $data['created'] = new UTCDateTime((new DateTime())->getTimestamp()*1000);
             $bulkWrite->insert($data);
         } else {
+            if (!($idDocument instanceof ObjectID)) {
+                $idDocument = new ObjectID($idDocument);
+            }
             $data['_id'] = $idDocument;
-            $bulkWrite->update(['_id' => $idDocument], ["\$set" => $data]);
+            $data['updated'] = new UTCDateTime((new DateTime())->getTimestamp()*1000);
+            $bulkWrite->update(['_id' => $idDocument], ['$set' => $data], ['multi' => false, 'upsert' => true]);
         }
 
         $this->mongoManager->executeBulkWrite(

diff --git a/tests/AwsDynamoDbDriverTest.php b/tests/AwsDynamoDbDriverTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests;
+
 use Aws\DynamoDb\Exception\DynamoDbException;
 use ByJG\AnyDataset\NoSql\AwsDynamoDbDriver;
 use ByJG\AnyDataset\NoSql\Factory;

diff --git a/tests/AwsS3DriverTest.php b/tests/AwsS3DriverTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests;
+
 use ByJG\AnyDataset\NoSql\AwsS3Driver;
 use ByJG\AnyDataset\NoSql\Factory;
 use ByJG\Util\Uri;

diff --git a/tests/MongoDbDriverTest.php b/tests/MongoDbDriverTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Tests;
+
 use ByJG\AnyDataset\Core\Enum\Relation;
 use ByJG\AnyDataset\Core\IteratorFilter;
 use ByJG\AnyDataset\NoSql\Factory;
@@ -98,8 +100,7 @@ public function testSaveDocument()
         $data = $document[0]->getDocument();
         $this->assertNotEmpty($data['_id']);
         $this->assertNotEmpty($data['created']);
-        $this->assertNotEmpty($data['updated']);
-        $this->assertEquals($data['created']->toDatetime(), $data['updated']->toDatetime());
+        $this->assertArrayNotHasKey('updated', $data);
         unset($data['_id']);
         unset($data['created']);
         unset($data['updated']);