diff --git a/services/docstore/app/coffee/DocManager.coffee b/services/docstore/app/coffee/DocManager.coffee index 2e215567fb..2cdfda17fb 100644 --- a/services/docstore/app/coffee/DocManager.coffee +++ b/services/docstore/app/coffee/DocManager.coffee @@ -22,7 +22,7 @@ module.exports = DocManager = if err? logger.err err:err, project_id:project_id, doc_id:doc_id, "error unarchiving doc" return callback(err) - MongoManager.findDoc doc_id, callback + DocManager.getDoc project_id, doc_id, callback else callback err, doc diff --git a/services/docstore/test/unit/coffee/DocManagerTests.coffee b/services/docstore/test/unit/coffee/DocManagerTests.coffee index 1aef029ddf..64551da527 100644 --- a/services/docstore/test/unit/coffee/DocManagerTests.coffee +++ b/services/docstore/test/unit/coffee/DocManagerTests.coffee @@ -45,21 +45,28 @@ describe "DocManager", -> done() describe "when the doc is deleted", -> + beforeEach -> + @doc = { _id: @doc_id, lines: ["mock-lines"] } + @s3doc = { _id: @doc_id, inS3: true } + @MongoManager.findDoc = sinon.stub() + @MongoManager.findDoc.callsArgWith(1, null, @s3doc) + @MongoManager.findDoc.callsArgWith(1, null, @doc) + spy = sinon.spy @DocManager.getDoc + @DocArchiveManager.unarchiveDoc = sinon.stub().callsArgWith(2) + @DocManager.getDoc @project_id, @doc_id, @callback + + it "should call the DocArchive to unarchive the doc", -> + @DocArchiveManager.unarchiveDoc.calledWith(@project_id, @doc_id).should.equal true + + it "should return the doc", -> + @callback.calledWith(null, @doc).should.equal true + + describe "when the doc is in s3", -> beforeEach -> @MongoManager.findDoc = sinon.stub().callsArgWith(1, null, @doc) @DocManager.getDoc @project_id, @doc_id, @callback - it "should try to find the doc in the docs collection", -> - @MongoManager.findDoc - .calledWith(@doc_id) - .should.equal true - - it "should return the doc", -> - @callback - .calledWith(null, @doc) - .should.equal true - describe "when the doc does not exist anywhere", -> beforeEach -> @MongoManager.findDoc = sinon.stub().callsArgWith(1, null, null)