From 501763bb4e0fb449fa8f26353be92d0b97255fa4 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Tue, 15 Dec 2015 13:27:41 +0000 Subject: [PATCH] changed add doc to use ligher mongo call (folders only) --- .../app/coffee/Features/Project/ProjectDuplicator.coffee | 2 +- .../app/coffee/Features/Project/ProjectEntityHandler.coffee | 5 +++-- .../UnitTests/coffee/Project/ProjectDuplicatorTests.coffee | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee b/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee index 69f9eb309a..f9aa18b74e 100644 --- a/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee +++ b/services/web/app/coffee/Features/Project/ProjectDuplicator.coffee @@ -35,7 +35,7 @@ module.exports = return (callback)-> content = docContents[doc._id.toString()] return callback(new Error("doc_id not found: #{doc._id}")) if !content? - projectEntityHandler.addDoc newProject, newParentFolder._id, doc.name, content.lines, (err, newDoc)-> + projectEntityHandler.addDoc newProject._id, newParentFolder._id, doc.name, content.lines, (err, newDoc)-> if originalRootDoc? and newDoc.name == originalRootDoc.name setRootDoc newDoc._id callback() diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee index f78a638c14..6f69cb5032 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee @@ -110,8 +110,9 @@ module.exports = ProjectEntityHandler = options = {} DocstoreManager.getDoc project_id, doc_id, options, callback - addDoc: (project_or_id, folder_id, docName, docLines, callback = (error, doc, folder_id) ->)=> - Project.getProject project_or_id, "", (err, project) -> + addDoc: (project_id, folder_id, docName, docLines, callback = (error, doc, folder_id) ->)=> + console.log project_id + ProjectGetter.getProjectWithOnlyFolders project_id, (err, project) -> logger.log project: project._id, folder_id: folder_id, doc_name: docName, "adding doc" return callback(err) if err? confirmFolder project, folder_id, (folder_id)=> diff --git a/services/web/test/UnitTests/coffee/Project/ProjectDuplicatorTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectDuplicatorTests.coffee index c8577cb4dd..fa7be3c94b 100644 --- a/services/web/test/UnitTests/coffee/Project/ProjectDuplicatorTests.coffee +++ b/services/web/test/UnitTests/coffee/Project/ProjectDuplicatorTests.coffee @@ -132,9 +132,9 @@ describe 'ProjectDuplicator', -> it 'should copy all the docs', (done)-> @duplicator.duplicate @owner, @project_id, "", (err, newProject)=> @DocstoreManager.getAllDocs.calledWith(@project_id).should.equal true - @entityHandler.addDoc.calledWith(@stubbedNewProject, @stubbedNewProject.rootFolder[0]._id, @doc0.name, @doc0_lines).should.equal true - @entityHandler.addDoc.calledWith(@stubbedNewProject, @newFolder._id, @doc1.name, @doc1_lines).should.equal true - @entityHandler.addDoc.calledWith(@stubbedNewProject, @newFolder._id, @doc2.name, @doc2_lines).should.equal true + @entityHandler.addDoc.calledWith(@stubbedNewProject._id, @stubbedNewProject.rootFolder[0]._id, @doc0.name, @doc0_lines).should.equal true + @entityHandler.addDoc.calledWith(@stubbedNewProject._id, @newFolder._id, @doc1.name, @doc1_lines).should.equal true + @entityHandler.addDoc.calledWith(@stubbedNewProject._id, @newFolder._id, @doc2.name, @doc2_lines).should.equal true done() it 'should copy all the files', (done)->