make ProjectEntityHandler._clean* argument signatures consistent

services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee

@@ -423,7 +423,7 @@ module.exports = ProjectEntityHandler =
 			return callback(error) if error?
 			projectLocator.findElement {project: project, element_id: entity_id, type: entityType}, (error, entity, path)=>
 				return callback(error) if error?
-				ProjectEntityHandler._cleanUpEntity project, userId, entity, entityType, path.fileSystem, (error) ->
+				ProjectEntityHandler._cleanUpEntity project, entity, entityType, path.fileSystem, userId, (error) ->
 					return callback(error) if error?
 					tpdsUpdateSender.deleteEntity project_id:project_id, path:path.fileSystem, project_name:project.name, (error) ->
 						return callback(error) if error?
@@ -456,17 +456,17 @@ module.exports = ProjectEntityHandler =
 							return callback(error) if error?
 							DocumentUpdaterHandler.updateProjectStructure project_id, userId, {oldDocs, newDocs, oldFiles, newFiles}, callback
 
-	_cleanUpEntity: (project, userId, entity, entityType, path, callback = (error) ->) ->
+	_cleanUpEntity: (project, entity, entityType, path, userId, callback = (error) ->) ->
 		if(entityType.indexOf("file") != -1)
-			ProjectEntityHandler._cleanUpFile project, userId, entity, path, callback
+			ProjectEntityHandler._cleanUpFile project, entity, path, userId, callback
 		else if (entityType.indexOf("doc") != -1)
-			ProjectEntityHandler._cleanUpDoc project, userId, entity, path, callback
+			ProjectEntityHandler._cleanUpDoc project, entity, path, userId, callback
 		else if (entityType.indexOf("folder") != -1)
-			ProjectEntityHandler._cleanUpFolder project, userId, entity, path, callback
+			ProjectEntityHandler._cleanUpFolder project, entity, path, userId, callback
 		else
 			callback()
 
-	_cleanUpDoc: (project, userId, doc, path, callback = (error) ->) ->
+	_cleanUpDoc: (project, doc, path, userId, callback = (error) ->) ->
 		project_id = project._id.toString()
 		doc_id = doc._id.toString()
 		unsetRootDocIfRequired = (callback) =>
@@ -486,7 +486,7 @@ module.exports = ProjectEntityHandler =
 						changes = oldDocs: [ {doc, path} ]
 						DocumentUpdaterHandler.updateProjectStructure project_id, userId, changes, callback
 
-	_cleanUpFile: (project, userId, file, path, callback = (error) ->) ->
+	_cleanUpFile: (project, file, path, userId, callback = (error) ->) ->
 		project_id = project._id.toString()
 		file_id = file._id.toString()
 		FileStoreHandler.deleteFile project_id, file_id, (error) ->
@@ -494,22 +494,22 @@ module.exports = ProjectEntityHandler =
 			changes = oldFiles: [ {file, path} ]
 			DocumentUpdaterHandler.updateProjectStructure project_id, userId, changes, callback
 
-	_cleanUpFolder: (project, userId, folder, folderPath, callback = (error) ->) ->
+	_cleanUpFolder: (project, folder, folderPath, userId, callback = (error) ->) ->
 		jobs = []
 		for doc in folder.docs
 			do (doc) ->
 				docPath = path.join(folderPath, doc.name)
-				jobs.push (callback) -> ProjectEntityHandler._cleanUpDoc project, userId, doc, docPath, callback
+				jobs.push (callback) -> ProjectEntityHandler._cleanUpDoc project, doc, docPath, userId, callback
 
 		for file in folder.fileRefs
 			do (file) ->
 				filePath = path.join(folderPath, file.name)
-				jobs.push (callback) -> ProjectEntityHandler._cleanUpFile project, userId, file, filePath, callback
+				jobs.push (callback) -> ProjectEntityHandler._cleanUpFile project, file, filePath, userId, callback
 
 		for childFolder in folder.folders
 			do (childFolder) ->
 				folderPath = path.join(folderPath, childFolder.name)
-				jobs.push (callback) -> ProjectEntityHandler._cleanUpFolder project, userId, childFolder, folderPath, callback
+				jobs.push (callback) -> ProjectEntityHandler._cleanUpFolder project, childFolder, folderPath, userId, callback
 
 		async.series jobs, callback
 

services/web/test/unit/coffee/Project/ProjectEntityHandlerTests.coffee

@@ -182,7 +182,7 @@ describe 'ProjectEntityHandler', ->
 
 			it "should clean up the entity from the rest of the system", ->
 				@ProjectEntityHandler._cleanUpEntity
-					.calledWith(@project, userId, @entity, @type, @path.fileSystem)
+					.calledWith(@project, @entity, @type, @path.fileSystem, userId)
 					.should.equal true
 
 	describe "_cleanUpEntity", ->
@@ -195,7 +195,7 @@ describe 'ProjectEntityHandler', ->
 			beforeEach (done) ->
 				@path = "/file/system/path.png"
 				@entity = _id: @entity_id
-				@ProjectEntityHandler._cleanUpEntity @project, userId, @entity, 'file', @path, done
+				@ProjectEntityHandler._cleanUpEntity @project, @entity, 'file', @path, userId, done
 
 			it "should delete the file from FileStoreHandler", ->
 				@FileStoreHandler.deleteFile.calledWith(project_id, @entity_id).should.equal true
@@ -214,11 +214,11 @@ describe 'ProjectEntityHandler', ->
 				@path = "/file/system/path.tex"
 				@ProjectEntityHandler._cleanUpDoc = sinon.stub().callsArg(4)
 				@entity = {_id: @entity_id}
-				@ProjectEntityHandler._cleanUpEntity @project, userId, @entity, 'doc', @path, done
+				@ProjectEntityHandler._cleanUpEntity @project, @entity, 'doc', @path, userId, done
 
 			it "should clean up the doc", ->
 				@ProjectEntityHandler._cleanUpDoc
-					.calledWith(@project, userId, @entity, @path)
+					.calledWith(@project, @entity, @path, userId)
 					.should.equal true
 
 		describe "a folder", ->
@@ -236,22 +236,22 @@ describe 'ProjectEntityHandler', ->
 				@ProjectEntityHandler._cleanUpDoc = sinon.stub().callsArg(4)
 				@ProjectEntityHandler._cleanUpFile = sinon.stub().callsArg(4)
 				path = "/folder"
-				@ProjectEntityHandler._cleanUpEntity @project, userId, @folder, "folder", path, done
+				@ProjectEntityHandler._cleanUpEntity @project, @folder, "folder", path, userId, done
 
 			it "should clean up all sub files", ->
 				@ProjectEntityHandler._cleanUpFile
-					.calledWith(@project, userId, @file1, "/folder/subfolder/file-name-1")
+					.calledWith(@project, @file1, "/folder/subfolder/file-name-1", userId)
 					.should.equal true
 				@ProjectEntityHandler._cleanUpFile
-					.calledWith(@project, userId, @file2, "/folder/file-name-2")
+					.calledWith(@project, @file2, "/folder/file-name-2", userId)
 					.should.equal true
 
 			it "should clean up all sub docs", ->
 				@ProjectEntityHandler._cleanUpDoc
-					.calledWith(@project, userId, @doc1, "/folder/subfolder/doc-name-1")
+					.calledWith(@project, @doc1, "/folder/subfolder/doc-name-1", userId)
 					.should.equal true
 				@ProjectEntityHandler._cleanUpDoc
-					.calledWith(@project, userId, @doc2, "/folder/doc-name-2")
+					.calledWith(@project, @doc2, "/folder/doc-name-2", userId)
 					.should.equal true
 
 	describe 'moveEntity', ->
@@ -1146,7 +1146,7 @@ describe 'ProjectEntityHandler', ->
 		describe "when the doc is the root doc", ->
 			beforeEach ->
 				@project.rootDoc_id = @doc._id
-				@ProjectEntityHandler._cleanUpDoc @project, userId, @doc, @path, @callback
+				@ProjectEntityHandler._cleanUpDoc @project, @doc, @path, userId, @callback
 
 			it "should unset the root doc", ->
 				@ProjectEntityHandler.unsetRootDoc
@@ -1179,7 +1179,7 @@ describe 'ProjectEntityHandler', ->
 		describe "when the doc is not the root doc", ->
 			beforeEach ->
 				@project.rootDoc_id = ObjectId()
-				@ProjectEntityHandler._cleanUpDoc @project, userId, @doc, @path, @callback
+				@ProjectEntityHandler._cleanUpDoc @project, @doc, @path, userId, @callback
 
 			it "should not unset the root doc", ->
 				@ProjectEntityHandler.unsetRootDoc.called.should.equal false