move deleteProject from collab manager to editor controller

This commit is contained in:
Henry Oswald
2014-04-04 16:21:20 +01:00
parent 68271b04f9
commit 3983e77b73
4 changed files with 18 additions and 6 deletions

View File

@@ -237,6 +237,11 @@ module.exports = EditorController =
EditorRealTimeController.emitToRoom(project_id, 'projectDescriptionUpdated', description)
callback()
deleteProject: (project_id, callback)->
Metrics.inc "editor.delete-project"
logger.log project_id:project_id, "recived message to delete project"
ProjectHandler.deleteProject project_id, callback
p:
notifyProjectUsersOfNewFolder: (project_id, folder_id, folder, callback = (error)->)->
logger.log project_id:project_id, folder:folder, parentFolder_id:folder_id, "sending newly created folder out to users"

View File

@@ -15,11 +15,6 @@ EditorRealTimeController = require('../Features/Editor/EditorRealTimeController'
module.exports = class CollaberationManager
constructor: (@io)->
deleteProject: (project_id, callback)->
metrics.inc "editor.delete-project"
logger.log project_id:project_id, "recived message to delete project"
projectHandler.deleteProject project_id, callback
renameEntity: (project_id, entity_id, entityType, newName, callback)->
newName = sanitize.escape(newName)
metrics.inc "editor.rename-entity"

View File

@@ -311,7 +311,7 @@ module.exports = class Router
client.on 'deleteProject', (callback)->
AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) =>
collaberationManager.deleteProject(project_id, callback)
EditorController.deleteProject(project_id, callback)
client.on 'setPublicAccessLevel', (newAccessLevel, callback)->
AuthorizationManager.ensureClientCanAdminProject client, (error, project_id) =>

View File

@@ -609,3 +609,15 @@ describe "EditorController", ->
done()
describe "deleteProject", ->
beforeEach ->
@err = "errro"
@ProjectHandler::deleteProject = sinon.stub().callsArgWith(1, @err)
it "should call the project handler", (done)->
@EditorController.deleteProject @project_id, (err)=>
err.should.equal @err
@ProjectHandler::deleteProject.calledWith(@project_id).should.equal true
done()