@toa.io/storages.mongodb 1.0.0-alpha.228 → 1.0.0-alpha.230

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/storages.mongodb",
-  "version": "1.0.0-alpha.228",
+  "version": "1.0.0-alpha.230",
   "description": "Toa MongoDB Storage Connector",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -27,5 +27,5 @@
     "openspan": "1.0.0-alpha.173",
     "saslprep": "1.0.3"
   },
-  "gitHead": "2c5ad2211fc9bbf411a812cb8b240d8f1d9484e0"
+  "gitHead": "ce845ae0216591ae88cb053fd0f7a7cadb29b7df"
 }

package/src/storage.js

@@ -35,6 +35,11 @@ class Storage extends Connector {
   async get (query) {
     const { criteria, options } = translate(query)
 
+    // identity lookups must return deleted records, so that callers
+    // can tell a deleted entity from a missing one
+    if (query?.id === undefined && query?.options?.deleted !== true)
+      criteria._deleted = null
+
     this.debug('findOne', { criteria, options })
 
     const record = await this.#collection.findOne(criteria, options)
@@ -70,6 +75,9 @@ class Storage extends Connector {
   async stream (query = undefined) {
     const { criteria, options } = translate(query)
 
+    if (query?.options?.deleted !== true)
+      criteria._deleted = null
+
     this.debug('find (stream)', { criteria, options })
 
     return this.#collection.find(criteria, options).stream({ transform: from })

package/test/storage.test.js

@@ -0,0 +1,73 @@
+'use strict'
+
+const { Storage } = require('../src/storage')
+
+let collection
+let storage
+
+beforeEach(async () => {
+  collection = {
+    collectionName: 'test',
+    findOne: jest.fn(async () => null),
+    find: jest.fn(() => ({ stream: () => null }))
+  }
+
+  const client = {
+    collection,
+    link: () => null
+  }
+
+  storage = new Storage(client, { schema: { properties: {} } })
+
+  await storage.open()
+})
+
+describe('get', () => {
+  it('should filter deleted', async () => {
+    await storage.get({})
+
+    expect(collection.findOne).toHaveBeenCalledWith({ _deleted: null }, {})
+  })
+
+  it('should filter deleted with sort', async () => {
+    await storage.get({ options: { sort: [['_created', 'desc']] } })
+
+    expect(collection.findOne)
+      .toHaveBeenCalledWith({ _deleted: null }, { sort: [['_created', -1]] })
+  })
+
+  it('should not filter deleted if queried by id', async () => {
+    const id = 'bcb6780f50e243348cad40ed6b5ef575'
+
+    await storage.get({ id })
+
+    expect(collection.findOne).toHaveBeenCalledWith({ _id: id }, {})
+  })
+
+  it('should not filter deleted if requested', async () => {
+    await storage.get({ options: { deleted: true } })
+
+    expect(collection.findOne).toHaveBeenCalledWith({}, {})
+  })
+})
+
+describe('stream', () => {
+  it('should filter deleted', async () => {
+    await storage.stream()
+
+    expect(collection.find).toHaveBeenCalledWith({ _deleted: null }, {})
+  })
+
+  it('should filter deleted with sort', async () => {
+    await storage.stream({ options: { sort: [['_created', 'desc']] } })
+
+    expect(collection.find)
+      .toHaveBeenCalledWith({ _deleted: null }, { sort: [['_created', -1]] })
+  })
+
+  it('should not filter deleted if requested', async () => {
+    await storage.stream({ options: { deleted: true } })
+
+    expect(collection.find).toHaveBeenCalledWith({}, {})
+  })
+})