Merge pull request #25 from jhomarolo/main

fix: update method now uses findOneAndUpdate instead updateOne

Author: jhomarolo

src/repository.js

@@ -81,22 +81,24 @@ module.exports = class Repository {
   *
   * Update entity
   *
-  * @param {type}   entityInstance Entity instance
+  * @param {type} entity Entity instance
   *
   * @return {type}  True when success
   */
-   async update(entityInstance) {
+   async update(entity) {
 
-    const payload = this.dataMapper.collectionFieldsWithValue(entityInstance)
+    const payload = this.dataMapper.collectionFieldsWithValue(entity)
     delete payload._id
+    const collectionIDs = this.dataMapper.collectionIDs()
 
     const instance = await this.runner()
     const ret = await instance.collection(this.collectionQualifiedName)
-      .updateOne({ _id:  new ObjectId(entityInstance._id | entityInstance.id)},
+      .findOneAndUpdate({ _id:  new ObjectId(entity[collectionIDs[0]])},
                  { $set : payload },
-                 { upsert: true })
+                 { upsert: true, returnDocument: 'after'})
 
-    return !!(ret.modifiedCount || ret.upsertedCount)
+    if(ret.ok === 0) return null
+    return this.dataMapper.toEntity(ret.value)
   }
 
 

test/queries/update.js

@@ -1,4 +1,4 @@
-const { entity, field } = require("@herbsjs/gotu")
+const { entity, field, id } = require("@herbsjs/gotu")
 const Repository = require("../../src/repository")
 const assert = require("assert")
 
@@ -7,7 +7,7 @@ describe("Update an Entity", () => {
     const ParentEntity = entity('A Parent Entity', {})
 
     return entity('A entity', {
-      id: field(Number),
+      id: id(String),
       stringTest: field(String),
       booleanTest: field(Boolean),
       entityTest: field(ParentEntity),
@@ -29,9 +29,9 @@ describe("Update an Entity", () => {
       collection: (f) => {
         spy.collectionName = f
         return {
-          updateOne: (p) => {
+          findOneAndUpdate: (p) => {
             spy.payload = p
-            { return { modifiedCount:  1, upsertedCount: 1 } }
+            { return  { ok: '1', value: { _id: "70edc25fc39277307ca9a700", string_test: "test", boolean_test: true } }}
           }
         }
       }
@@ -49,15 +49,15 @@ describe("Update an Entity", () => {
       mongodb: mongodb(spy)
     })
 
-    anEntity.id = 1
+    anEntity.id = "70edc25fc39277307ca9a700"
     anEntity.stringTest = "test"
     anEntity.booleanTest = true
 
     //when
     const ret = await itemRepo.update(anEntity)
 
     //then
-    assert.deepStrictEqual(ret, true)
+    assert.deepStrictEqual(ret.stringTest, "test")
   })
 
 })

testdb/update.js

@@ -75,14 +75,7 @@ describe('Persist Entity', () => {
             //when
             aModifiedInstance.stringTest = "updated"
             const ret = await itemRepo.update(aModifiedInstance)
-
-            //then
-             var findStatement = {}
-             findStatement.string_test = "updated"
-             const collectionConnection = await client.collection(collection)
-             const retDB =  await collectionConnection.findOne(findStatement)
-             assert.deepStrictEqual(retDB.string_test, "updated")
-
+            assert.deepStrictEqual(ret.stringTest, "updated")           
         })
     })
 })