From fe1f71413e09a25c6ec2e57706002e48485aea67 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 15 Mar 2016 14:12:43 +0000 Subject: [PATCH] Use ProjectGetter, not Project, in ProjectController.loadEditor --- .../app/coffee/Features/Project/ProjectController.coffee | 3 +-- .../UnitTests/coffee/Project/ProjectControllerTests.coffee | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index ae90f291b2..4e1a6acf2c 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -5,7 +5,6 @@ projectDuplicator = require("./ProjectDuplicator") projectCreationHandler = require("./ProjectCreationHandler") editorController = require("../Editor/EditorController") metrics = require('../../infrastructure/Metrics') -Project = require('../../models/Project').Project User = require('../../models/User').User TagsHandler = require("../Tags/TagsHandler") SubscriptionLocator = require("../Subscription/SubscriptionLocator") @@ -195,7 +194,7 @@ module.exports = ProjectController = async.parallel { project: (cb)-> - Project.findOne { _id: project_id }, cb + ProjectGetter.getProject project_id, { name: 1, lastUpdated: 1}, cb user: (cb)-> if user_id == 'openUser' cb null, defaultSettingsForAnonymousUser(user_id) diff --git a/services/web/test/UnitTests/coffee/Project/ProjectControllerTests.coffee b/services/web/test/UnitTests/coffee/Project/ProjectControllerTests.coffee index 54ea831e05..4db3648988 100644 --- a/services/web/test/UnitTests/coffee/Project/ProjectControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Project/ProjectControllerTests.coffee @@ -35,8 +35,6 @@ describe "ProjectController", -> getAllTags: sinon.stub() @NotificationsHandler = getUserNotifications: sinon.stub() - @ProjectModel = - findOne: sinon.stub() @UserModel = findById: sinon.stub() @AuthorizationManager = @@ -51,6 +49,7 @@ describe "ProjectController", -> indexProjectReferences: sinon.stub() @ProjectGetter = findAllUsersProjects: sinon.stub() + getProject: sinon.stub() @ProjectController = SandboxedModule.require modulePath, requires: "settings-sharelatex":@settings "logger-sharelatex": @@ -64,7 +63,6 @@ describe "ProjectController", -> "../Subscription/LimitationsManager": @LimitationsManager "../Tags/TagsHandler":@TagsHandler "../Notifications/NotificationsHandler":@NotificationsHandler - '../../models/Project': Project:@ProjectModel "../../models/User":User:@UserModel "../Authorization/AuthorizationManager":@AuthorizationManager "../InactiveData/InactiveProjectManager":@InactiveProjectManager @@ -296,7 +294,7 @@ describe "ProjectController", -> fontSize:"massive" theme:"sexy" email: "bob@bob.com" - @ProjectModel.findOne.callsArgWith 1, null, @project + @ProjectGetter.getProject.callsArgWith 2, null, @project @UserModel.findById.callsArgWith(1, null, @user) @SubscriptionLocator.getUsersSubscription.callsArgWith(1, null, {}) @AuthorizationManager.getPrivilegeLevelForProject.callsArgWith 2, null, "owner"