From 418bc10a189cfb2f7a15e7050e477fd6aba24649 Mon Sep 17 00:00:00 2001 From: Brian Gough Date: Mon, 24 Sep 2018 16:04:23 +0100 Subject: [PATCH] allow getting doc paths by project id --- .../Features/Project/ProjectEntityHandler.coffee | 6 ++++++ .../Features/Project/ProjectRootDocManager.coffee | 2 +- .../Project/ProjectRootDocManagerTests.coffee | 14 +++++++------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee index 5994521b8e..2160fbc419 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee @@ -65,6 +65,12 @@ module.exports = ProjectEntityHandler = self = files.push({path: path.join(folderPath, file.name), file:file}) callback null, docs, files + getAllDocPathsFromProjectById: (project_id, callback) -> + ProjectGetter.getProjectWithoutDocLines project_id, (err, project) -> + return callback(err) if err? + return callback(Errors.NotFoundError("no project")) if !project? + self.getAllDocPathsFromProject project, callback + getAllDocPathsFromProject: (project, callback) -> logger.log project:project, "getting all docs for project" self._getAllFoldersFromProject project, (err, folders = {}) -> diff --git a/services/web/app/coffee/Features/Project/ProjectRootDocManager.coffee b/services/web/app/coffee/Features/Project/ProjectRootDocManager.coffee index d9e1d745df..b331c38aa6 100644 --- a/services/web/app/coffee/Features/Project/ProjectRootDocManager.coffee +++ b/services/web/app/coffee/Features/Project/ProjectRootDocManager.coffee @@ -33,7 +33,7 @@ module.exports = ProjectRootDocManager = callback() setRootDocFromName: (project_id, rootDocName, callback = (error) ->) -> - ProjectEntityHandler.getAllDocPathsFromProject project_id, (error, docPaths) -> + ProjectEntityHandler.getAllDocPathsFromProjectById project_id, (error, docPaths) -> return callback(error) if error? # find the root doc from the filename root_doc_id = null diff --git a/services/web/test/unit/coffee/Project/ProjectRootDocManagerTests.coffee b/services/web/test/unit/coffee/Project/ProjectRootDocManagerTests.coffee index 8ced7d8d98..d65b92043a 100644 --- a/services/web/test/unit/coffee/Project/ProjectRootDocManagerTests.coffee +++ b/services/web/test/unit/coffee/Project/ProjectRootDocManagerTests.coffee @@ -83,12 +83,12 @@ describe 'ProjectRootDocManager', -> "doc-id-2": "/main.tex" "doc-id-3": "/nested/chapter1a.tex" "doc-id-4": "/nested/chapter1b.tex" - @ProjectEntityHandler.getAllDocPathsFromProject = sinon.stub().callsArgWith(1, null, @docPaths) + @ProjectEntityHandler.getAllDocPathsFromProjectById = sinon.stub().callsArgWith(1, null, @docPaths) @ProjectEntityUpdateHandler.setRootDoc = sinon.stub().callsArgWith(2) @ProjectRootDocManager.setRootDocFromName @project_id, '/main.tex', done it "should check the docs of the project", -> - @ProjectEntityHandler.getAllDocPathsFromProject.calledWith(@project_id) + @ProjectEntityHandler.getAllDocPathsFromProjectById.calledWith(@project_id) .should.equal true it "should set the root doc to main.tex", -> @@ -102,12 +102,12 @@ describe 'ProjectRootDocManager', -> "doc-id-2": "/main.tex" "doc-id-3": "/nested/chapter1a.tex" "doc-id-4": "/nested/chapter1b.tex" - @ProjectEntityHandler.getAllDocPathsFromProject = sinon.stub().callsArgWith(1, null, @docPaths) + @ProjectEntityHandler.getAllDocPathsFromProjectById = sinon.stub().callsArgWith(1, null, @docPaths) @ProjectEntityUpdateHandler.setRootDoc = sinon.stub().callsArgWith(2) @ProjectRootDocManager.setRootDocFromName @project_id, 'main.tex', done it "should check the docs of the project", -> - @ProjectEntityHandler.getAllDocPathsFromProject.calledWith(@project_id) + @ProjectEntityHandler.getAllDocPathsFromProjectById.calledWith(@project_id) .should.equal true it "should set the root doc to main.tex", -> @@ -121,12 +121,12 @@ describe 'ProjectRootDocManager', -> "doc-id-2": "/main.tex" "doc-id-3": "/nested/chapter1a.tex" "doc-id-4": "/nested/chapter1b.tex" - @ProjectEntityHandler.getAllDocPathsFromProject = sinon.stub().callsArgWith(1, null, @docPaths) + @ProjectEntityHandler.getAllDocPathsFromProjectById = sinon.stub().callsArgWith(1, null, @docPaths) @ProjectEntityUpdateHandler.setRootDoc = sinon.stub().callsArgWith(2) @ProjectRootDocManager.setRootDocFromName @project_id, 'chapter1a.tex', done it "should check the docs of the project", -> - @ProjectEntityHandler.getAllDocPathsFromProject.calledWith(@project_id) + @ProjectEntityHandler.getAllDocPathsFromProjectById.calledWith(@project_id) .should.equal true it "should set the root doc using the basename", -> @@ -140,7 +140,7 @@ describe 'ProjectRootDocManager', -> "doc-id-2": "/main.tex" "doc-id-3": "/nested/chapter1a.tex" "doc-id-4": "/nested/chapter1b.tex" - @ProjectEntityHandler.getAllDocPathsFromProject = sinon.stub().callsArgWith(1, null, @docPaths) + @ProjectEntityHandler.getAllDocPathsFromProjectById = sinon.stub().callsArgWith(1, null, @docPaths) @ProjectEntityUpdateHandler.setRootDoc = sinon.stub().callsArgWith(2) @ProjectRootDocManager.setRootDocFromName @project_id, "other.tex", done