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

Merge pull request #4 from sharelatex/flush-ops-from-redis

Browse source 
push ops to track changes when document is flushed
This commit is contained in:
Brian Gough 2015-11-30 10:46:21 +00:00
commit 529a061567
6 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/document-updater/app/coffee/DocumentManager.coffee
View file

@ -4,6 +4,7 @@ DocOpsManager = require "./DocOpsManager"
DiffCodec = require "./DiffCodec" DiffCodec = require "./DiffCodec"
logger = require "logger-sharelatex" logger = require "logger-sharelatex"
Metrics = require "./Metrics" Metrics = require "./Metrics"
TrackChangesManager = require "./TrackChangesManager"
module.exports = DocumentManager = module.exports = DocumentManager =
getDoc: (project_id, doc_id, _callback = (error, lines, version) ->) -> getDoc: (project_id, doc_id, _callback = (error, lines, version) ->) ->
@ -89,6 +90,8 @@ module.exports = DocumentManager =
else else
logger.log project_id: project_id, doc_id: doc_id, version: version, "flushing doc" logger.log project_id: project_id, doc_id: doc_id, version: version, "flushing doc"
PersistenceManager.setDoc project_id, doc_id, lines, version, (error) -> PersistenceManager.setDoc project_id, doc_id, lines, version, (error) ->
return callback(error) if error?
TrackChangesManager.flushDocChanges project_id, doc_id, (error) ->
return callback(error) if error? return callback(error) if error?
callback null callback null

1
services/document-updater/test/unit/coffee/DocumentManager/flushAndDeleteDocTests.coffee
View file

@ -8,6 +8,7 @@ describe "DocumentUpdater - flushAndDeleteDoc", ->
beforeEach -> beforeEach ->
@DocumentManager = SandboxedModule.require modulePath, requires: @DocumentManager = SandboxedModule.require modulePath, requires:
"./RedisManager": @RedisManager = {} "./RedisManager": @RedisManager = {}
"./TrackChangesManager": @TrackChangesManager = {}
"./PersistenceManager": @PersistenceManager = {} "./PersistenceManager": @PersistenceManager = {}
"logger-sharelatex": @logger = {log: sinon.stub()} "logger-sharelatex": @logger = {log: sinon.stub()}
"./DocOpsManager" :{} "./DocOpsManager" :{}

2
services/document-updater/test/unit/coffee/DocumentManager/flushDocTests.coffee
View file

@ -8,6 +8,7 @@ describe "DocumentUpdater - flushDocIfLoaded", ->
beforeEach -> beforeEach ->
@DocumentManager = SandboxedModule.require modulePath, requires: @DocumentManager = SandboxedModule.require modulePath, requires:
"./RedisManager": @RedisManager = {} "./RedisManager": @RedisManager = {}
"./TrackChangesManager": @TrackChangesManager = {}
"./PersistenceManager": @PersistenceManager = {} "./PersistenceManager": @PersistenceManager = {}
"./DocOpsManager": @DocOpsManager = {} "./DocOpsManager": @DocOpsManager = {}
"logger-sharelatex": @logger = {log: sinon.stub()} "logger-sharelatex": @logger = {log: sinon.stub()}
@ -23,6 +24,7 @@ describe "DocumentUpdater - flushDocIfLoaded", ->
describe "when the doc is in Redis", -> describe "when the doc is in Redis", ->
beforeEach -> beforeEach ->
@RedisManager.getDoc = sinon.stub().callsArgWith(1, null, @lines, @version) @RedisManager.getDoc = sinon.stub().callsArgWith(1, null, @lines, @version)
@TrackChangesManager.flushDocChanges = sinon.stub().callsArg(2)
@PersistenceManager.setDoc = sinon.stub().callsArgWith(4) @PersistenceManager.setDoc = sinon.stub().callsArgWith(4)
@DocumentManager.flushDocIfLoaded @project_id, @doc_id, @callback @DocumentManager.flushDocIfLoaded @project_id, @doc_id, @callback

1
services/document-updater/test/unit/coffee/DocumentManager/getDocAndRecentOpsTests.coffee
View file

@ -8,6 +8,7 @@ describe "DocumentUpdater - getDocAndRecentOps", ->
beforeEach -> beforeEach ->
@DocumentManager = SandboxedModule.require modulePath, requires: @DocumentManager = SandboxedModule.require modulePath, requires:
"./RedisManager": @RedisManager = {} "./RedisManager": @RedisManager = {}
"./TrackChangesManager": @TrackChangesManager = {}
"./PersistenceManager": @PersistenceManager = {} "./PersistenceManager": @PersistenceManager = {}
"./DocOpsManager": @DocOpsManager = {} "./DocOpsManager": @DocOpsManager = {}
"logger-sharelatex": @logger = {log: sinon.stub()} "logger-sharelatex": @logger = {log: sinon.stub()}

1
services/document-updater/test/unit/coffee/DocumentManager/getDocTests.coffee
View file

@ -8,6 +8,7 @@ describe "DocumentUpdater - getDoc", ->
beforeEach -> beforeEach ->
@DocumentManager = SandboxedModule.require modulePath, requires: @DocumentManager = SandboxedModule.require modulePath, requires:
"./RedisManager": @RedisManager = {} "./RedisManager": @RedisManager = {}
"./TrackChangesManager": @TrackChangesManager = {}
"./PersistenceManager": @PersistenceManager = {} "./PersistenceManager": @PersistenceManager = {}
"./DocOpsManager": @DocOpsManager = {} "./DocOpsManager": @DocOpsManager = {}
"logger-sharelatex": @logger = {log: sinon.stub()} "logger-sharelatex": @logger = {log: sinon.stub()}

1
services/document-updater/test/unit/coffee/DocumentManager/setDocTests.coffee
View file

@ -8,6 +8,7 @@ describe "DocumentManager - setDoc", ->
beforeEach -> beforeEach ->
@DocumentManager = SandboxedModule.require modulePath, requires: @DocumentManager = SandboxedModule.require modulePath, requires:
"./RedisManager": @RedisManager = {} "./RedisManager": @RedisManager = {}
"./TrackChangesManager": @TrackChangesManager = {}
"./PersistenceManager": @PersistenceManager = {} "./PersistenceManager": @PersistenceManager = {}
"./DiffCodec": @DiffCodec = {} "./DiffCodec": @DiffCodec = {}
"./DocOpsManager":{} "./DocOpsManager":{}