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 #3655 from overleaf/jpa-change-write-path-doc-deletion

Browse source 
[ProjectEntityUpdateHandler] change write path for doc deletion

GitOrigin-RevId: 7d7ece8fe25c1d59b3469c136d92c4c81e9f0f81
This commit is contained in:
Jakob Ackermann 2021-04-06 13:13:06 +02:00 committed by Copybot
parent 75dabdd299
commit 9692392bf8
4 changed files with 5 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
View file

@ -70,7 +70,6 @@ module.exports = {
'changes'
]),
createNewFolderStructure: callbackify(wrapWithLock(createNewFolderStructure)),
_insertDeletedDocReference: callbackify(_insertDeletedDocReference),
_insertDeletedFileReference: callbackify(_insertDeletedFileReference),
_putElement: callbackifyMultiResult(_putElement, ['result', 'project']),
_confirmFolder,
@ -86,7 +85,6 @@ module.exports = {
deleteEntity: wrapWithLock(deleteEntity),
renameEntity: wrapWithLock(renameEntity),
createNewFolderStructure: wrapWithLock(createNewFolderStructure),
_insertDeletedDocReference,
_insertDeletedFileReference,
_putElement
}
@ -445,17 +443,6 @@ async function renameEntity(
}
}
async function _insertDeletedDocReference(projectId, doc) {
await Project.updateOne(
{ _id: projectId },
{
$push: {
deletedDocs: { _id: doc._id, name: doc.name, deletedAt: new Date() }
}
}
).exec()
}
async function _insertDeletedFileReference(projectId, fileRef) {
await DeletedFile.create({
projectId,

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

@ -1507,21 +1507,12 @@ const ProjectEntityUpdateHandler = {
if (error != null) {
return callback(error)
}
ProjectEntityMongoUpdateHandler._insertDeletedDocReference(
project._id,
doc,
error => {
if (error != null) {
return callback(error)
}
DocumentUpdaterHandler.deleteDoc(projectId, docId, error => {
if (error != null) {
return callback(error)
}
DocstoreManager.deleteDoc(projectId, docId, doc.name, callback)
})
DocstoreManager.deleteDoc(projectId, docId, doc.name, error => {
if (error) {
return callback(error)
}
)
DocumentUpdaterHandler.deleteDoc(projectId, docId, callback)
})
})
},

28
services/web/test/unit/src/Project/ProjectEntityMongoUpdateHandlerTests.js
View file

@ -966,34 +966,6 @@ describe('ProjectEntityMongoUpdateHandler', function() {
})
})
describe('_insertDeletedDocReference', function() {
beforeEach(async function() {
this.ProjectMock.expects('updateOne')
.withArgs(
{ _id: this.project._id },
{
$push: {
deletedDocs: {
_id: this.doc._id,
name: this.doc.name,
deletedAt: sinon.match.date
}
}
}
)
.chain('exec')
.resolves()
await this.subject.promises._insertDeletedDocReference(
this.project._id,
this.doc
)
})
it('should update the database', function() {
this.ProjectMock.verify()
})
})
describe('_insertDeletedFileReference', function() {
beforeEach(async function() {
this.DeletedFileMock.expects('create')

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

@ -114,7 +114,6 @@ describe('ProjectEntityUpdateHandler', function() {
_confirmFolder: sinon.stub(),
_putElement: sinon.stub(),
_insertDeletedFileReference: sinon.stub(),
_insertDeletedDocReference: sinon.stub(),
replaceFileWithNew: sinon.stub(),
mkdirp: sinon.stub(),
moveEntity: sinon.stub(),
@ -2157,7 +2156,6 @@ describe('ProjectEntityUpdateHandler', function() {
}
this.path = '/path/to/doc'
this.ProjectEntityUpdateHandler.unsetRootDoc = sinon.stub().yields()
this.ProjectEntityMongoUpdateHandler._insertDeletedDocReference.yields()
this.DocstoreManager.deleteDoc.yields()
})
@ -2185,12 +2183,6 @@ describe('ProjectEntityUpdateHandler', function() {
.should.equal(true)
})
it('should insert the doc into the deletedDocs array', function() {
this.ProjectEntityMongoUpdateHandler._insertDeletedDocReference
.calledWith(this.project._id, this.doc)
.should.equal(true)
})
it('should delete the doc in the doc store', function() {
this.DocstoreManager.deleteDoc
.calledWith(projectId, this.doc._id.toString(), 'test.tex')