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

Delete the notification being replaced when forceCreate.

Browse source 
Prevent growth of the collection with stale documents when users
resend project invites
This commit is contained in:
Shane Kilkelly 2016-08-17 14:10:36 +01:00
parent 264ff806fc
commit c9a9ab93ec
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/notifications/app/coffee/Notifications.coffee
View file

@ -24,7 +24,7 @@ module.exports =
logger.log number:number, user_id:user_id, key:notification.key, "alredy has notification key for user"
return callback(number)
else if number > 0 and notification.forceCreate
self.removeNotificationKey user_id, notification.key, callback
self.deleteNotificationByKeyOnly notification.key, callback
else
callback()
@ -73,3 +73,9 @@ module.exports =
updateOperation =
"$unset": {templateKey:true}
db.notifications.update searchOps, updateOperation, callback
# hard delete of doc, rather than removing the templateKey
deleteNotificationByKeyOnly: (notification_key, callback)->
searchOps =
key: notification_key
db.notifications.remove searchOps, {justOne: true}, callback

22
services/notifications/test/unit/coffee/NotificationsTests.coffee
View file

@ -18,6 +18,7 @@ describe 'Notifications Tests', ->
@insertStub = sinon.stub()
@countStub = sinon.stub()
@updateStub = sinon.stub()
@removeStub = sinon.stub()
@mongojs = =>
notifications:
update: self.mongojsUpdate
@ -25,6 +26,7 @@ describe 'Notifications Tests', ->
insert: @insertStub
count: @countStub
update: @updateStub
remove: @removeStub
@mongojs.ObjectId = ObjectId
@notifications = SandboxedModule.require modulePath, requires:
@ -60,6 +62,8 @@ describe 'Notifications Tests', ->
messageOpts:"some info",
templateKey:"template-key"
}
@notifications.deleteNotificationByKeyOnly = sinon.stub()
@notifications.deleteNotificationByKeyOnly.callsArgWith(1, null)
it 'should insert the notification into the collection', (done)->
@insertStub.callsArgWith(1, null)
@ -72,20 +76,19 @@ describe 'Notifications Tests', ->
it 'should fail insert of existing notification key', (done)->
@insertStub.callsArgWith(1, null)
@countStub.callsArgWith(1, null, 1)
@notifications.removeNotificationKey = sinon.stub()
@notifications.addNotification user_id, @stubbedNotification, (err)=>
@insertStub.calledWith(@expectedDocument).should.equal false
done()
describe "when key already exists but forceCreate is passed", (done)->
it "should delete the old key and insert the new one", ->
it "should delete the old key and insert the new one", (done) ->
@insertStub.callsArgWith(1, null)
@countStub.callsArgWith(1, null, 1)
@stubbedNotification.forceCreate = true
@notifications.addNotification user_id, @stubbedNotification, (err)=>
assert.deepEqual(@insertStub.lastCall.args[0], @expectedDocument)
@notifications.removeNotificationKey.calledWith(user_id, @stubbedNotification.key).should.equal true
@notifications.deleteNotificationByKeyOnly.calledWith(@stubbedNotification.key).should.equal true
done()
describe 'when the notification is set to expire', () ->
@ -183,3 +186,16 @@ describe 'Notifications Tests', ->
assert.deepEqual(@updateStub.args[0][0], searchOps)
assert.deepEqual(@updateStub.args[0][1], updateOperation)
done()
describe 'deleteNotificationByKeyOnly', ->
it 'should completely remove the notification', (done)->
@removeStub.callsArgWith(2, null)
@notifications.deleteNotificationByKeyOnly notification_key, (err)=>
searchOps =
key: notification_key
opts =
justOne: true
assert.deepEqual(@removeStub.args[0][0], searchOps)
assert.deepEqual(@removeStub.args[0][1], opts)
done()