From 42a1deaacad320a7b269236f539e334f78225d9c Mon Sep 17 00:00:00 2001 From: Hayden Faulds Date: Mon, 13 Nov 2017 11:16:54 +0000 Subject: [PATCH] pass userId into ProjectEntityHandler.addFile --- .../coffee/Features/Editor/EditorController.coffee | 2 +- .../Features/Project/ProjectCreationHandler.coffee | 2 +- .../Features/Project/ProjectEntityHandler.coffee | 4 ++-- .../unit/coffee/Editor/EditorControllerTests.coffee | 6 +++--- .../coffee/Project/ProjectCreationHandlerTests.coffee | 5 +++-- .../coffee/Project/ProjectEntityHandlerTests.coffee | 11 ++++++----- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/services/web/app/coffee/Features/Editor/EditorController.coffee b/services/web/app/coffee/Features/Editor/EditorController.coffee index a43d6f0447..438711105e 100644 --- a/services/web/app/coffee/Features/Editor/EditorController.coffee +++ b/services/web/app/coffee/Features/Editor/EditorController.coffee @@ -52,7 +52,7 @@ module.exports = EditorController = fileName = fileName.trim() logger.log {project_id, folder_id, fileName, path}, "sending new file to project" Metrics.inc "editor.add-file" - ProjectEntityHandler.addFile project_id, folder_id, fileName, path, (err, fileRef, folder_id)=> + ProjectEntityHandler.addFile project_id, folder_id, fileName, path, null, (err, fileRef, folder_id)=> if err? logger.err err:err, project_id:project_id, folder_id:folder_id, fileName:fileName, "error adding file without lock" return callback(err) diff --git a/services/web/app/coffee/Features/Project/ProjectCreationHandler.coffee b/services/web/app/coffee/Features/Project/ProjectCreationHandler.coffee index a38b214a9e..7fef1a8a54 100644 --- a/services/web/app/coffee/Features/Project/ProjectCreationHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectCreationHandler.coffee @@ -77,7 +77,7 @@ module.exports = ProjectCreationHandler = callback(error) (callback) -> universePath = Path.resolve(__dirname + "/../../../templates/project_files/universe.jpg") - ProjectEntityHandler.addFile project._id, project.rootFolder[0]._id, "universe.jpg", universePath, callback + ProjectEntityHandler.addFile project._id, project.rootFolder[0]._id, "universe.jpg", universePath, owner_id, callback ], (error) -> callback(error, project) diff --git a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee index 4bfbc0e30c..db88b44ba4 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee @@ -193,12 +193,12 @@ module.exports = ProjectEntityHandler = return callback(error) if error? ProjectEntityHandler.addDoc project_id, null, name, lines, callback - addFile: (project_id, folder_id, fileName, path, callback = (error, fileRef, folder_id) ->)-> + addFile: (project_id, folder_id, fileName, path, userId, callback = (error, fileRef, folder_id) ->)-> ProjectGetter.getProjectWithOnlyFolders project_id, (err, project) -> if err? logger.err project_id:project_id, err:err, "error getting project for add file" return callback(err) - ProjectEntityHandler.addFileWithProject project, folder_id, fileName, path, null, callback + ProjectEntityHandler.addFileWithProject project, folder_id, fileName, path, userId, callback addFileWithProject: (project, folder_id, fileName, path, userId, callback = (error, fileRef, folder_id) ->)-> project_id = project._id diff --git a/services/web/test/unit/coffee/Editor/EditorControllerTests.coffee b/services/web/test/unit/coffee/Editor/EditorControllerTests.coffee index ae5e8d79e3..f84dc04c10 100644 --- a/services/web/test/unit/coffee/Editor/EditorControllerTests.coffee +++ b/services/web/test/unit/coffee/Editor/EditorControllerTests.coffee @@ -196,13 +196,13 @@ describe "EditorController", -> @stream = new ArrayBuffer() it 'should add the folder using the project entity handler', (done)-> - @ProjectEntityHandler.addFile = sinon.stub().callsArgWith(4) + @ProjectEntityHandler.addFile = sinon.stub().callsArgWith(5) @EditorController.addFileWithoutLock @project_id, @folder_id, @fileName, @stream, @source, => @ProjectEntityHandler.addFile.calledWith(@project_id, @folder_id).should.equal true done() it 'should send the update of a new folder out to the users in the project', (done)-> - @ProjectEntityHandler.addFile = sinon.stub().callsArgWith(4, null, @file, @folder_id) + @ProjectEntityHandler.addFile = sinon.stub().callsArgWith(5, null, @file, @folder_id) @EditorController.addFileWithoutLock @project_id, @folder_id, @fileName, @stream, @source, => @EditorRealTimeController.emitToRoom @@ -211,7 +211,7 @@ describe "EditorController", -> done() it "should return the file in the callback", (done) -> - @ProjectEntityHandler.addFile = sinon.stub().callsArgWith(4, null, @file, @folder_id) + @ProjectEntityHandler.addFile = sinon.stub().callsArgWith(5, null, @file, @folder_id) @EditorController.addFileWithoutLock @project_id, @folder_id, @fileName, @stream, @source, (error, file) => file.should.equal @file done() diff --git a/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee b/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee index 5c32db63d3..1b010a035c 100644 --- a/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee +++ b/services/web/test/unit/coffee/Project/ProjectCreationHandlerTests.coffee @@ -34,7 +34,7 @@ describe 'ProjectCreationHandler', -> {@name} = options @ProjectEntityHandler = addDoc: sinon.stub().callsArgWith(4, null, {_id: docId}) - addFile: sinon.stub().callsArg(4) + addFile: sinon.stub().callsArg(5) setRootDoc: sinon.stub().callsArg(2) @ProjectDetailsHandler = validateProjectName: sinon.stub().yields() @@ -192,7 +192,8 @@ describe 'ProjectCreationHandler', -> @ProjectEntityHandler.addFile .calledWith( project_id, rootFolderId, "universe.jpg", - Path.resolve(__dirname + "/../../../../app/templates/project_files/universe.jpg") + Path.resolve(__dirname + "/../../../../app/templates/project_files/universe.jpg"), + ownerId ) .should.equal true diff --git a/services/web/test/unit/coffee/Project/ProjectEntityHandlerTests.coffee b/services/web/test/unit/coffee/Project/ProjectEntityHandlerTests.coffee index ca968f10a0..22e2926934 100644 --- a/services/web/test/unit/coffee/Project/ProjectEntityHandlerTests.coffee +++ b/services/web/test/unit/coffee/Project/ProjectEntityHandlerTests.coffee @@ -534,7 +534,7 @@ describe 'ProjectEntityHandler', -> filePath.should.equal @filePath done() - @ProjectEntityHandler.addFile project_id, folder_id, fileName, @filePath, (err, fileRef, parentFolder)-> + @ProjectEntityHandler.addFile project_id, folder_id, fileName, @filePath, userId, (err, fileRef, parentFolder)-> it 'should put file into folder by calling put element', (done)-> @ProjectEntityHandler._putElement = (passedProject, passedFolder_id, passedFileRef, passedType, callback)-> @@ -544,10 +544,10 @@ describe 'ProjectEntityHandler', -> passedType.should.equal 'file' done() - @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, (err, fileRef, parentFolder)-> + @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, userId, (err, fileRef, parentFolder)-> it 'should return doc and parent folder', (done)-> - @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, (err, fileRef, parentFolder)-> + @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, userId, (err, fileRef, parentFolder)-> parentFolder.should.equal folder_id fileRef.name.should.equal fileName done() @@ -567,11 +567,12 @@ describe 'ProjectEntityHandler', -> options.rev.should.equal 0 done() - @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, (err, fileRef, parentFolder)-> + @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, userId, (err, fileRef, parentFolder)-> it "should should send the change in project structure to the doc updater", (done) -> @documentUpdaterHandler.updateProjectStructure = (project_id, user_id, oldDocs, newDocs, oldFiles, newFiles) => project_id.should.equal project_id + user_id.should.equal user_id newFiles.length.should.equal 1 newFile = newFiles[0] newFile.file.name.should.equal fileName @@ -579,7 +580,7 @@ describe 'ProjectEntityHandler', -> newFile.url.should.equal @fileUrl done() - @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, () -> + @ProjectEntityHandler.addFile project_id, folder_id, fileName, {}, userId, () -> describe 'replacing a file', ->