diff --git a/lib/dao.js b/lib/dao.js index d146586a..4c3598c9 100644 --- a/lib/dao.js +++ b/lib/dao.js @@ -1569,7 +1569,8 @@ DataAccessObject.find = function find(query, options, cb) { return cb.promise; } } - function geoCallbackWithoutNotify(err, data) { + + function geoCallback(err, data) { const memory = new Memory(); const modelName = self.modelName; @@ -1588,37 +1589,14 @@ DataAccessObject.find = function find(query, options, cb) { }); }); - // FIXME: apply "includes" and other transforms - see allCb below memory.all(modelName, geoQueryObject, options, allCb); } else { cb(null, []); } } - function geoCallbackWithNotify(err, data) { - if (err) return cb(err); - - async.map(data, function(item, next) { - const context = { - Model: self, - data: item, - isNewInstance: false, - hookState: hookState, - options: options, - }; - - self.notifyObserversOf('loaded', context, function(err) { - if (err) return next(err); - next(null, context.data); - }); - }, function(err, results) { - if (err) return cb(err); - geoCallbackWithoutNotify(null, results); - }); - } function queryGeo(query) { geoQueryObject = query; - const geoCallback = options.notify === false ? geoCallbackWithoutNotify : geoCallbackWithNotify; invokeConnectorMethod(connector, 'all', self, [{}], options, geoCallback); }