From 9ef40902ca90e47d9b7939d8f256d5ef5b04e740 Mon Sep 17 00:00:00 2001 From: Hayden Faulds Date: Wed, 11 Apr 2018 10:08:15 +0100 Subject: [PATCH] send projectHistoryId with resync requests --- .../Features/DocumentUpdater/DocumentUpdaterHandler.coffee | 4 ++-- .../Features/Project/ProjectEntityUpdateHandler.coffee | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee b/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee index a30ed7bdef..71e99cc67c 100644 --- a/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee +++ b/services/web/app/coffee/Features/DocumentUpdater/DocumentUpdaterHandler.coffee @@ -121,11 +121,11 @@ module.exports = DocumentUpdaterHandler = method: "DELETE" }, project_id, "delete-thread", callback - resyncProjectHistory: (project_id, docs, files, callback) -> + resyncProjectHistory: (project_id, projectHistoryId, docs, files, callback) -> logger.info {project_id, docs, files}, "resyncing project history in doc updater" DocumentUpdaterHandler._makeRequest { path: "/project/#{project_id}/history/resync" - json: { docs, files } + json: { docs, files, projectHistoryId } method: "POST" }, project_id, "resync-project-history", callback diff --git a/services/web/app/coffee/Features/Project/ProjectEntityUpdateHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEntityUpdateHandler.coffee index 788d1b40eb..8815cba100 100644 --- a/services/web/app/coffee/Features/Project/ProjectEntityUpdateHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEntityUpdateHandler.coffee @@ -394,7 +394,8 @@ module.exports = ProjectEntityUpdateHandler = self = ProjectGetter.getProject project_id, rootFolder: true, overleaf: true, (error, project) -> return callback(error) if error? - if !project?.overleaf?.history?.id? + projectHistoryId = project?.overleaf?.history?.id + if !projectHistoryId? error = new Errors.ProjectHistoryDisabledError("project history not enabled for #{project_id}") return callback(error) @@ -410,7 +411,8 @@ module.exports = ProjectEntityUpdateHandler = self = path: file.path url: FileStoreHandler._buildUrl(project_id, file.file._id) - DocumentUpdaterHandler.resyncProjectHistory project_id, docs, files, callback + DocumentUpdaterHandler.resyncProjectHistory project_id, projectHistoryId, docs, files, callback + _cleanUpEntity: (project, entity, entityType, path, userId, callback = (error) ->) -> if(entityType.indexOf("file") != -1) self._cleanUpFile project, entity, path, userId, callback