github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-26 17:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

In _summarizeUpdates, allow null users through.

Browse source 
A null value represents a deleted or otherwise missing user record.
This commit is contained in:
Shane Kilkelly 2015-09-10 14:32:47 +01:00
parent 810bddb2cb
commit 8387383cb4
2 changed files with 69 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
services/track-changes/app/coffee/UpdatesManager.coffee
View file

@ -188,14 +188,13 @@ module.exports = UpdatesManager =
for update in updates
earliestUpdate = summarizedUpdates[summarizedUpdates.length - 1]
if earliestUpdate and earliestUpdate.meta.start_ts - update.meta.end_ts < @TIME_BETWEEN_DISTINCT_UPDATES
if update.meta.user?
userExists = false
for user in earliestUpdate.meta.users
if user.id == update.meta.user.id
userExists = true
break
if !userExists
earliestUpdate.meta.users.push update.meta.user
userExists = false
for user in earliestUpdate.meta.users
if (!user and !update.meta.user) or (user.id == update.meta.user?.id)
userExists = true
break
if !userExists
earliestUpdate.meta.users.push update.meta.user
doc_id = update.doc_id.toString()
doc = earliestUpdate.docs[doc_id]
@ -220,11 +219,7 @@ module.exports = UpdatesManager =
newUpdate.docs[update.doc_id.toString()] =
fromV: update.v
toV: update.v
if update.meta.user?
newUpdate.meta.users.push update.meta.user
newUpdate.meta.users.push update.meta.user
summarizedUpdates.push newUpdate
return summarizedUpdates

61
services/track-changes/test/unit/coffee/UpdatesManager/UpdatesManagerTests.coffee
View file

@ -627,3 +627,64 @@ describe "UpdatesManager", ->
start_ts: @now
end_ts: @now + 50
}]
it "should include null user values", ->
result = @UpdatesManager._summarizeUpdates [{
doc_id: "doc-id-1"
meta:
user: @user_1
start_ts: @now + 20
end_ts: @now + 30
v: 5
}, {
doc_id: "doc-id-1"
meta:
user: null
start_ts: @now
end_ts: @now + 10
v: 4
}]
expect(result).to.deep.equal [{
docs:
"doc-id-1":
fromV: 4
toV: 5
meta:
users: [@user_1, null]
start_ts: @now
end_ts: @now + 30
}]
it "should roll several null user values into one", ->
result = @UpdatesManager._summarizeUpdates [{
doc_id: "doc-id-1"
meta:
user: @user_1
start_ts: @now + 20
end_ts: @now + 30
v: 5
}, {
doc_id: "doc-id-1"
meta:
user: null
start_ts: @now
end_ts: @now + 10
v: 4
}, {
doc_id: "doc-id-1"
meta:
user: null
start_ts: @now + 2
end_ts: @now + 4
v: 4
}]
expect(result).to.deep.equal [{
docs:
"doc-id-1":
fromV: 4
toV: 5
meta:
users: [@user_1, null]
start_ts: @now
end_ts: @now + 30
}]