From 719e0291aa77a6b6e58fc6762782eace4e9a3c63 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Wed, 6 Apr 2016 14:27:44 +0100 Subject: [PATCH] consider all packs for processing to allow finalisation of old head packs --- .../track-changes/app/coffee/PackManager.coffee | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/services/track-changes/app/coffee/PackManager.coffee b/services/track-changes/app/coffee/PackManager.coffee index 596df06b70..70b094d654 100644 --- a/services/track-changes/app/coffee/PackManager.coffee +++ b/services/track-changes/app/coffee/PackManager.coffee @@ -277,10 +277,13 @@ module.exports = PackManager = packs.push(last) if last.finalised # it's finalised so we push it back to archive it callback(null, packs) - # findPacks: (project_id, doc_id, queryFilter, callback) -> - # query = { doc_id: ObjectId(doc_id.toString()) } - # query = _.defaults query, queryFilter if queryFilter? - # db.docHistory.find(query, {pack:false}).sort {v:1}, callback + findPacks: (project_id, doc_id, callback) -> + query = { doc_id: ObjectId(doc_id.toString()), expiresAt: {$exists:false} } + db.docHistory.find(query, {pack:false}).sort {v:1}, (err, packs) -> + return callback(err) if err? + return callback() if not packs? + return callback() if not packs?.length + callback(null, packs) findUnindexedPacks: (project_id, doc_id, callback) -> PackManager.getIndexWithKeys doc_id, (err, indexResult) -> @@ -361,7 +364,7 @@ module.exports = PackManager = # Extra methods to test archive/unarchive for a doc_id pushOldPacks: (project_id, doc_id, callback) -> - PackManager.findCompletedPacks project_id, doc_id, (err, packs) -> + PackManager.findPacks project_id, doc_id, (err, packs) -> return callback(err) if err? return callback() if not packs?.length PackManager.processOldPack project_id, doc_id, packs[0]._id, callback