From 9f3b2d2cdc9e9778394f7bfef1e373e17fb3d931 Mon Sep 17 00:00:00 2001
From: Eric Mc Sween <eric.mcsween@overleaf.com>
Date: Mon, 16 Mar 2020 07:31:10 -0400
Subject: [PATCH] Merge pull request #2670 from
 overleaf/em-convert-doc-to-file-rev

Adjust the file rev when converting a doc to a file

GitOrigin-RevId: 6765bcac1fcd4f4db35f9ce88af1f201f5da509a
---
 .../app/src/Features/Project/ProjectEntityUpdateHandler.js   | 2 +-
 .../test/unit/src/Project/ProjectEntityUpdateHandlerTests.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
index 4a8a355d6e..b5b975641f 100644
--- a/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
+++ b/services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
@@ -1555,7 +1555,7 @@ const ProjectEntityUpdateHandler = {
                         }
                         FileStoreHandler.uploadFileFromDisk(
                           projectId,
-                          { name: doc.name },
+                          { name: doc.name, rev: rev + 1 },
                           fsPath,
                           (err, fileStoreUrl, fileRef) => {
                             if (err) {
diff --git a/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js b/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js
index 2330211f58..3aebca8e06 100644
--- a/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js
+++ b/services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js
@@ -2073,6 +2073,7 @@ describe('ProjectEntityUpdateHandler', function() {
       this.tmpFilePath = '/tmp/file'
       this.fileStoreUrl = 'http://filestore/file'
       this.folder = { _id: new ObjectId() }
+      this.rev = 3
       this.ProjectLocator.findElement
         .withArgs({
           project_id: this.project._id,
@@ -2089,7 +2090,7 @@ describe('ProjectEntityUpdateHandler', function() {
         .yields(null, this.file, this.docPath, this.folder)
       this.DocstoreManager.getDoc
         .withArgs(this.project._id, this.doc._id)
-        .yields(null, this.docLines)
+        .yields(null, this.docLines, this.rev)
       this.FileWriter.writeLinesToDisk.yields(null, this.tmpFilePath)
       this.FileStoreHandler.uploadFileFromDisk.yields(
         null,
@@ -2124,7 +2125,7 @@ describe('ProjectEntityUpdateHandler', function() {
           this.FileStoreHandler.uploadFileFromDisk
         ).to.have.been.calledWith(
           this.project._id,
-          { name: this.doc.name },
+          { name: this.doc.name, rev: this.rev + 1 },
           this.tmpFilePath
         )
       })