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 #2603 from overleaf/jpa-ns-cmg-binary-upload

Browse source 
[ProjectEntityUpdateHandler] handle entity changes on upsert

GitOrigin-RevId: 134e2c8909db5a336bce62460e46b3e625463c6f
This commit is contained in:
nate stemen 2020-03-18 10:27:33 -04:00 committed by Copybot
parent 3b027eba22
commit 31b95e8617
2 changed files with 187 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
services/web/app/src/Features/Project/ProjectEntityUpdateHandler.js
View file

@ -877,14 +877,84 @@ const ProjectEntityUpdateHandler = {
if (folder == null) {
return callback(new Error("Couldn't find folder"))
}
let existingFile = null
for (let fileRef of folder.fileRefs) {
if (fileRef.name === fileName) {
existingFile = fileRef
break
}
}
if (existingFile != null) {
const existingFile = folder.fileRefs.find(
({ name }) => name === fileName
)
const existingDoc = folder.docs.find(({ name }) => name === fileName)
if (existingDoc) {
ProjectLocator.findElement(
{
project_id: projectId,
element_id: existingDoc._id,
type: 'doc'
},
(err, doc, path) => {
if (err) {
return callback(new Error('coudnt find existing file'))
}
ProjectEntityMongoUpdateHandler.replaceDocWithFile(
projectId,
existingDoc._id,
newFileRef,
(err, project) => {
if (err) {
return callback(err)
}
const projectHistoryId =
project.overleaf &&
project.overleaf.history &&
project.overleaf.history.id
TpdsUpdateSender.addFile(
{
project_id: project._id,
file_id: newFileRef._id,
path: path.fileSystem,
rev: newFileRef.rev,
project_name: project.name
},
err => {
if (err) {
return callback(err)
}
DocumentUpdaterHandler.updateProjectStructure(
projectId,
projectHistoryId,
userId,
{
oldDocs: [
{ doc: existingDoc, path: path.fileSystem }
],
newFiles: [
{
file: newFileRef,
path: path.fileSystem,
url: fileStoreUrl
}
],
newProject: project
},
err => {
if (err) {
return callback(err)
}
EditorRealTimeController.emitToRoom(
projectId,
'removeEntity',
existingDoc._id,
'convertDocToFile'
)
callback(null, newFileRef, true, existingFile)
}
)
}
)
}
)
}
)
} else if (existingFile) {
// this calls directly into the replaceFile main task (without the beforeLock part)
return ProjectEntityUpdateHandler.replaceFile.mainTask(
projectId,

120
services/web/test/unit/src/Project/ProjectEntityUpdateHandlerTests.js
View file

@ -1020,7 +1020,7 @@ describe('ProjectEntityUpdateHandler', function() {
describe('updating an existing file', function() {
beforeEach(function() {
this.existingFile = { _id: fileId, name: this.fileName }
this.folder = { _id: folderId, fileRefs: [this.existingFile] }
this.folder = { _id: folderId, fileRefs: [this.existingFile], docs: [] }
this.ProjectLocator.findElement.yields(null, this.folder)
this.ProjectEntityUpdateHandler.replaceFile = {
mainTask: sinon.stub().yields(null, this.newFile)
@ -1038,15 +1038,15 @@ describe('ProjectEntityUpdateHandler', function() {
})
it('replaces the file', function() {
this.ProjectEntityUpdateHandler.replaceFile.mainTask
.calledWith(
projectId,
fileId,
this.fileSystemPath,
this.linkedFileData,
userId
)
.should.equal(true)
expect(
this.ProjectEntityUpdateHandler.replaceFile.mainTask
).to.be.calledWith(
projectId,
fileId,
this.fileSystemPath,
this.linkedFileData,
userId
)
})
it('returns the file', function() {
@ -1056,7 +1056,7 @@ describe('ProjectEntityUpdateHandler', function() {
describe('creating a new file', function() {
beforeEach(function() {
this.folder = { _id: folderId, fileRefs: [] }
this.folder = { _id: folderId, fileRefs: [], docs: [] }
this.newFile = { _id: fileId }
this.ProjectLocator.findElement.yields(null, this.folder)
this.ProjectEntityUpdateHandler.addFile = {
@ -1127,6 +1127,104 @@ describe('ProjectEntityUpdateHandler', function() {
this.callback.calledWithMatch(errorMatcher).should.equal(true)
})
})
describe('upserting file on top of a doc', function() {
beforeEach(function(done) {
this.path = '/path/to/doc'
this.existingDoc = { _id: new ObjectId(), name: this.fileName }
this.folder = {
_id: folderId,
fileRefs: [],
docs: [this.existingDoc]
}
this.ProjectLocator.findElement
.withArgs({
project_id: this.project._id.toString(),
element_id: folderId,
type: 'folder'
})
.yields(null, this.folder)
this.ProjectLocator.findElement
.withArgs({
project_id: this.project._id.toString(),
element_id: this.existingDoc._id,
type: 'doc'
})
.yields(null, this.existingDoc, { fileSystem: this.path })
this.newFileUrl = 'new-file-url'
this.newFile = {
_id: newFileId,
name: 'dummy-upload-filename',
rev: 0,
linkedFileData: this.linkedFileData
}
this.newProject = {
name: 'new project',
overleaf: { history: { id: projectHistoryId } }
}
this.FileStoreHandler.uploadFileFromDisk.yields(
null,
this.newFileUrl,
this.newFile
)
this.ProjectEntityMongoUpdateHandler.replaceDocWithFile.yields(
null,
this.newProject
)
this.ProjectEntityUpdateHandler.upsertFile(
projectId,
folderId,
this.fileName,
this.fileSystemPath,
this.linkedFileData,
userId,
done
)
})
it('replaces the existing doc with a file', function() {
expect(
this.ProjectEntityMongoUpdateHandler.replaceDocWithFile
).to.have.been.calledWith(projectId, this.existingDoc._id, this.newFile)
})
it('updates the doc structure', function() {
const oldDocs = [
{
doc: this.existingDoc,
path: this.path
}
]
const newFiles = [
{
file: this.newFile,
path: this.path,
url: this.newFileUrl
}
]
const updates = {
oldDocs,
newFiles,
newProject: this.newProject
}
expect(
this.DocumentUpdaterHandler.updateProjectStructure
).to.have.been.calledWith(projectId, projectHistoryId, userId, updates)
})
it('tells everyone in the room the doc is removed', function() {
expect(
this.EditorRealTimeController.emitToRoom
).to.have.been.calledWith(
projectId,
'removeEntity',
this.existingDoc._id,
'convertDocToFile'
)
})
})
})
describe('upsertDocWithPath', function() {