Merge pull request #297 from jdgjsag67251/296-after-update-direct-find

#296: After update direct find

README.md

@@ -158,6 +158,8 @@ effectively disable the pre-fetching of documents.
 It is instead recommended to use the collection-wide options (e.g.
 `MyCollection.hookOptions.after.update = {fetchPrevious: false};`).
 
+This hook will always be called with the new documents; even if the updated document gets modified in a way were it would normally not be able to be found because of `before.find` hooks (see https://github.com/Meteor-Community-Packages/meteor-collection-hooks/pull/297).
+
 --------------------------------------------------------------------------------
 
 ### .after.remove(userId, doc)
@@ -193,6 +195,8 @@ test.before.find(function (userId, selector, options) {
 });
 ```
 
+__Important:__ This hook does not get called for `after.update` hooks (see https://github.com/Meteor-Community-Packages/meteor-collection-hooks/pull/297).
+
 --------------------------------------------------------------------------------
 
 ### .after.find(userId, selector, options, cursor)

collection-hooks.js

@@ -140,7 +140,7 @@ CollectionHooks.initOptions = (options, pointcut, method) =>
 CollectionHooks.extendOptions = (source, options, pointcut, method) =>
   ({ ...options, ...source.all.all, ...source[pointcut].all, ...source.all[method], ...source[pointcut][method] })
 
-CollectionHooks.getDocs = function getDocs (collection, selector, options, fetchFields = {}) {
+CollectionHooks.getDocs = function getDocs (collection, selector, options, fetchFields = {}, { useDirect = false } = {}) {
   const findOptions = { transform: null, reactive: false }
 
   if (Object.keys(fetchFields).length > 0) {
@@ -173,7 +173,7 @@ CollectionHooks.getDocs = function getDocs (collection, selector, options, fetch
 
   // Unlike validators, we iterate over multiple docs, so use
   // find instead of findOne:
-  return collection.find(selector, findOptions)
+  return (useDirect ? collection.direct : collection).find(selector, findOptions)
 }
 
 // This function normalizes the selector (converting it to an Object)

tests/common.js

@@ -20,3 +20,4 @@ import './hooks_in_loop.js'
 import './upsert.js'
 import './trycatch.js'
 import './meteor_1_4_id_object.js'
+import './find_after_hooks'

tests/find_after_hooks.js

@@ -0,0 +1,56 @@
+import { Mongo } from 'meteor/mongo'
+import { Tinytest } from 'meteor/tinytest'
+
+Tinytest.addAsync('issue #296 - after update hook always finds all updated', function (test, next) {
+  const collection = new Mongo.Collection(null)
+
+  collection.before.find((userId, selector) => {
+    selector.removedAt = { $exists: false }
+
+    return true
+  })
+
+  let beforeCalled = false
+  collection.before.update(() => {
+    beforeCalled = true
+  })
+
+  let afterCalled = false
+  collection.after.update(() => {
+    afterCalled = true
+  })
+
+  const id = collection.insert({ test: true })
+
+  collection.update(id, { $set: { removedAt: new Date() } }, () => {
+    test.equal(beforeCalled, true)
+    test.equal(afterCalled, true)
+    next()
+  })
+})
+
+Tinytest.addAsync('issue #296 - after insert hook always finds all inserted', function (test, next) {
+  const collection = new Mongo.Collection(null)
+
+  collection.before.find((userId, selector) => {
+    selector.removedAt = { $exists: false }
+
+    return true
+  })
+
+  let beforeCalled = false
+  collection.before.insert(() => {
+    beforeCalled = true
+  })
+
+  let afterCalled = false
+  collection.after.insert(() => {
+    afterCalled = true
+  })
+
+  collection.insert({ removedAt: new Date() }, () => {
+    test.equal(beforeCalled, true)
+    test.equal(afterCalled, true)
+    next()
+  })
+})

update.js

@@ -77,7 +77,7 @@ CollectionHooks.defineAdvice('update', function (userId, _super, instance, aspec
         if (aspectFetchFields || globalFetchFields) {
           Object.assign(fetchFields, globalFetchFields || {}, ...aspectFetchFields.map(a => a.fetchFields))
         }
-        docs = CollectionHooks.getDocs.call(this, instance, { _id: { $in: docIds } }, options, fetchFields).fetch()
+        docs = CollectionHooks.getDocs.call(this, instance, { _id: { $in: docIds } }, options, fetchFields, { useDirect: true }).fetch()
       }
 
       aspects.after.forEach((o) => {