@toa.io/storages.mongodb 1.0.0-alpha.2 → 1.0.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/storages.mongodb",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.4",
   "description": "Toa MongoDB Storage Connector",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -19,13 +19,13 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@toa.io/console": "1.0.0-alpha.2",
-    "@toa.io/conveyor": "1.0.0-alpha.2",
-    "@toa.io/core": "1.0.0-alpha.2",
-    "@toa.io/generic": "1.0.0-alpha.2",
-    "@toa.io/pointer": "1.0.0-alpha.2",
+    "@toa.io/console": "1.0.0-alpha.4",
+    "@toa.io/conveyor": "1.0.0-alpha.4",
+    "@toa.io/core": "1.0.0-alpha.4",
+    "@toa.io/generic": "1.0.0-alpha.4",
+    "@toa.io/pointer": "1.0.0-alpha.4",
     "mongodb": "6.3.0",
     "saslprep": "1.0.3"
   },
-  "gitHead": "7688e6e980a65c82ac2e459be4e355eebf406cd0"
+  "gitHead": "80a91c0d9c167484247a91e69a0c0a3c344f90d0"
 }

package/src/record.js

@@ -5,9 +5,12 @@
  * @returns {toa.mongodb.Record}
  */
 const to = (entity) => {
-  const { id, _version, ...rest } = entity
+  const {
+    id,
+    ...rest
+  } = entity
 
-  return /** @type {toa.mongodb.Record} */ { _id: id, _version: _version + 1, ...rest }
+  return /** @type {toa.mongodb.Record} */ { _id: id, ...rest }
 }
 
 /**
@@ -17,7 +20,10 @@ const to = (entity) => {
 const from = (record) => {
   if (record === undefined || record === null) return null
 
-  const { _id, ...rest } = record
+  const {
+    _id,
+    ...rest
+  } = record
 
   return { id: _id, ...rest }
 }

package/src/storage.js

@@ -3,7 +3,10 @@
 const { Connector } = require('@toa.io/core')
 
 const { translate } = require('./translate')
-const { to, from } = require('./record')
+const {
+  to,
+  from
+} = require('./record')
 
 /**
  * @implements {toa.core.Storage}
@@ -24,7 +27,10 @@ class Storage extends Connector {
   }
 
   async get (query) {
-    const { criteria, options } = translate(query)
+    const {
+      criteria,
+      options
+    } = translate(query)
 
     const record = await this.#connection.get(criteria, options)
 
@@ -32,7 +38,10 @@ class Storage extends Connector {
   }
 
   async find (query) {
-    const { criteria, options } = translate(query)
+    const {
+      criteria,
+      options
+    } = translate(query)
     const recordset = await this.#connection.find(criteria, options)
 
     return recordset.map((item) => from(item))
@@ -45,28 +54,44 @@ class Storage extends Connector {
   }
 
   async set (entity) {
-    const criteria = { _id: entity.id, _version: entity._version }
+    const criteria = {
+      _id: entity.id,
+      _version: entity._version - 1
+    }
     const result = await this.#connection.replace(criteria, to(entity))
 
     return result !== null
   }
 
   async store (entity) {
-    if (entity._version === 0) return this.add(entity)
-    else return this.set(entity)
+    if (entity._version === 1) {
+      return this.add(entity)
+    } else {
+      return this.set(entity)
+    }
   }
 
   async upsert (query, changeset, insert) {
-    const { criteria, options } = translate(query)
-    const update = { $set: { ...changeset }, $inc: { _version: 1 } }
+    const {
+      criteria,
+      options
+    } = translate(query)
+
+    const update = {
+      $set: { ...changeset },
+      $inc: { _version: 1 }
+    }
 
     if (insert !== undefined) {
       delete insert._version
 
       options.upsert = true
 
-      if (criteria._id !== undefined) insert._id = criteria._id
-      else return null // this shouldn't ever happen
+      if (criteria._id !== undefined) {
+        insert._id = criteria._id
+      } else {
+        return null
+      } // this shouldn't ever happen
 
       if (Object.keys(insert) > 0) update.$setOnInsert = insert
     }

package/test/record.test.js

@@ -1,12 +1,17 @@
 'use strict'
 
-const { to, from } = require('../src/record')
-const { random } = require('@toa.io/generic')
+const {
+  to,
+  from
+} = require('../src/record')
 
 describe('to', () => {
   it('should rename id to _id', () => {
     /** @type {toa.core.storages.Record} */
-    const entity = { id: '1', _version: 0 }
+    const entity = {
+      id: '1',
+      _version: 0
+    }
     const record = to(entity)
 
     expect(record).toMatchObject({ _id: '1' })
@@ -14,37 +19,47 @@ describe('to', () => {
 
   it('should not modify argument', () => {
     /** @type {toa.core.storages.Record} */
-    const entity = { id: '1', _version: 0 }
+    const entity = {
+      id: '1',
+      _version: 0
+    }
 
     to(entity)
 
-    expect(entity).toStrictEqual({ id: '1', _version: 0 })
-  })
-
-  it('should increment _version', () => {
-    /** @type {toa.core.storages.Record} */
-    const entity = { id: '1', _version: random() }
-    const record = to(entity)
-
-    expect(record).toMatchObject({ _version: entity._version + 1 })
+    expect(entity).toStrictEqual({
+      id: '1',
+      _version: 0
+    })
   })
 })
 
 describe('from', () => {
   it('should rename _id to id', () => {
     /** @type {toa.mongodb.Record} */
-    const record = { _id: '1', _version: 0 }
+    const record = {
+      _id: '1',
+      _version: 0
+    }
     const entity = from(record)
 
-    expect(entity).toStrictEqual({ id: '1', _version: 0 })
+    expect(entity).toStrictEqual({
+      id: '1',
+      _version: 0
+    })
   })
 
   it('should not modify argument', () => {
     /** @type {toa.mongodb.Record} */
-    const record = { _id: '1', _version: 0 }
+    const record = {
+      _id: '1',
+      _version: 0
+    }
 
     from(record)
 
-    expect(record).toStrictEqual({ _id: '1', _version: 0 })
+    expect(record).toStrictEqual({
+      _id: '1',
+      _version: 0
+    })
   })
 })