Merge pull request #59 from thekid/refactor/modify

Use Collection::modify() instead of invoking "findAndModify"

Author: thekid

composer.json

@@ -18,7 +18,7 @@
     "xp-forge/yaml": "^8.0",
     "xp-forge/hashing": "^2.1",
     "xp-forge/inject": "^5.4",
-    "xp-forge/mongodb": "^2.0"
+    "xp-forge/mongodb": "^2.2"
   },
 
   "require-dev": {

src/main/php/de/thekid/dialog/Modification.php

@@ -1,6 +1,6 @@
 <?php namespace de\thekid\dialog;
 
-use com\mongodb\result\{Cursor, Update};
+use com\mongodb\result\{Cursor, Update, Modification};
 use com\mongodb\{Database, Document};
 use text\hash\Hashing;
 use util\{Date, Secret};
@@ -155,13 +155,11 @@ public function children(string $slug): Cursor {
 
   /** Replace an entry identified by a given slug with a given entity */
   public function replace(string $slug, array<string, mixed> $entity): Modification {
-    $arguments= [
-      'query'  => ['slug' => $slug],
-      'update' => ['$set' => ['slug' => $slug, ...$entity]],
-      'new'    => true,  // Return modified document
-      'upsert' => true,
-    ];
-    return new Modification($this->database->collection('entries')->run('findAndModify', $arguments)->value());
+    return $this->database->collection('entries')->modify(
+      ['slug' => $slug],
+      ['$set' => ['slug' => $slug, ...$entity]],
+      upsert: true,
+    );
   }
 
   /** Modify an entry identified by a given slug with MongoDB statements */

src/main/php/de/thekid/dialog/Repository.php

@@ -35,11 +35,11 @@ public function create(#[Value] $user, string $id, #[Entity] array<string, mixed
     ]);
 
     // Ensure storage directory is created
-    if ($result->created()) {
+    if ($result->upserted()) {
       $this->storage->folder($id)->create();
     }
 
-    return $result->entry();
+    return $result->document();
   }
 
   #[Put('/{id:.+(/.+)?}/images/{name}')]