github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

changed inactive to active as its more effienct query in mongo

Browse source
This commit is contained in:
Henry Oswald 2015-08-19 11:54:30 +01:00
parent d3499acd7b
commit 50fc886c94
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/web/app/coffee/Features/InactiveData/InactiveProjectManager.coffee
View file

@ -10,13 +10,13 @@ MILISECONDS_IN_DAY = 86400000
module.exports = InactiveProjectManager = module.exports = InactiveProjectManager =
reactivateProjectIfRequired: (project_id, callback)-> reactivateProjectIfRequired: (project_id, callback)->
ProjectGetter.getProject project_id, {inactive:true}, (err, project)-> ProjectGetter.getProject project_id, {active:true}, (err, project)->
if err? if err?
logger.err err:err, project_id:project_id, "error getting project" logger.err err:err, project_id:project_id, "error getting project"
return callback(err) return callback(err)
logger.log project_id:project_id, inactive:project.inactive, "seeing if need to reactivate project" logger.log project_id:project_id, active:project.active, "seeing if need to reactivate project"
if !project.inactive if project.active
return callback() return callback()
DocstoreManager.unarchiveProject project_id, (err)-> DocstoreManager.unarchiveProject project_id, (err)->
@ -30,7 +30,7 @@ module.exports = InactiveProjectManager =
logger.log oldProjectDate:oldProjectDate, limit:limit, daysOld:daysOld, "starting process of deactivating old projects" logger.log oldProjectDate:oldProjectDate, limit:limit, daysOld:daysOld, "starting process of deactivating old projects"
Project.find() Project.find()
.where("lastOpened").lt(oldProjectDate) .where("lastOpened").lt(oldProjectDate)
.where("inactive").ne(true) .where("active").equals(true)
.select("_id") .select("_id")
.limit(limit) .limit(limit)
.exec (err, projects)-> .exec (err, projects)->

4
services/web/app/coffee/Features/Project/ProjectUpdateHandler.coffee
View file

@ -19,14 +19,14 @@ module.exports =
markAsInactive: (project_id, callback)-> markAsInactive: (project_id, callback)->
conditions = {_id:project_id} conditions = {_id:project_id}
update = {inactive:true} update = {active:false}
Project.update conditions, update, {}, (err)-> Project.update conditions, update, {}, (err)->
if callback? if callback?
callback() callback()
markAsActive: (project_id, callback)-> markAsActive: (project_id, callback)->
conditions = {_id:project_id} conditions = {_id:project_id}
update = { $unset: { inactive: true }} update = {active:true}
Project.update conditions, update, {}, (err)-> Project.update conditions, update, {}, (err)->
if callback? if callback?
callback() callback()

2
services/web/app/coffee/models/Project.coffee
View file

@ -18,7 +18,7 @@ ProjectSchema = new Schema
name : {type:String, default:'new project'} name : {type:String, default:'new project'}
lastUpdated : {type:Date, default: () -> new Date()} lastUpdated : {type:Date, default: () -> new Date()}
lastOpened : {type:Date} lastOpened : {type:Date}
inactive : { type: Boolean } active : { type: Boolean, default: true }
owner_ref : {type:ObjectId, ref:'User'} owner_ref : {type:ObjectId, ref:'User'}
collaberator_refs : [ type:ObjectId, ref:'User' ] collaberator_refs : [ type:ObjectId, ref:'User' ]
readOnly_refs : [ type:ObjectId, ref:'User' ] readOnly_refs : [ type:ObjectId, ref:'User' ]

6
services/web/test/UnitTests/coffee/InactiveData/InactiveProjectManagerTests.coffee
View file

@ -33,7 +33,7 @@ describe "InactiveProjectManager", ->
describe "reactivateProjectIfRequired", -> describe "reactivateProjectIfRequired", ->
beforeEach -> beforeEach ->
@project = {inactive:true} @project = {active:false}
@ProjectGetter.getProject.callsArgWith(2, null, @project) @ProjectGetter.getProject.callsArgWith(2, null, @project)
@ProjectUpdateHandler.markAsActive.callsArgWith(1) @ProjectUpdateHandler.markAsActive.callsArgWith(1)
@ -53,8 +53,8 @@ describe "InactiveProjectManager", ->
done() done()
it "should not call unarchiveProject if it is not inactive", (done)-> it "should not call unarchiveProject if it is active", (done)->
delete @project.inactive @project.active = true
@DocstoreManager.unarchiveProject.callsArgWith(1) @DocstoreManager.unarchiveProject.callsArgWith(1)
@InactiveProjectManager.reactivateProjectIfRequired @project_id, (err)=> @InactiveProjectManager.reactivateProjectIfRequired @project_id, (err)=>
@DocstoreManager.unarchiveProject.calledWith(@project_id).should.equal false @DocstoreManager.unarchiveProject.calledWith(@project_id).should.equal false

4
services/web/test/UnitTests/coffee/Project/ProjectUpdateHandlerTests.coffee
View file

@ -42,7 +42,7 @@ describe 'ProjectUpdateHandler', ->
@handler.markAsInactive project_id, (err)=> @handler.markAsInactive project_id, (err)=>
args = @ProjectModel.update.args[0] args = @ProjectModel.update.args[0]
args[0]._id.should.equal project_id args[0]._id.should.equal project_id
args[1].inactive.should.equal true args[1].active.should.equal false
done() done()
describe "markAsActive", -> describe "markAsActive", ->
@ -51,7 +51,7 @@ describe 'ProjectUpdateHandler', ->
@handler.markAsActive project_id, (err)=> @handler.markAsActive project_id, (err)=>
args = @ProjectModel.update.args[0] args = @ProjectModel.update.args[0]
args[0]._id.should.equal project_id args[0]._id.should.equal project_id
args[1]["$unset"].inactive.should.equal true args[1].active.should.equal true
done() done()