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

return the origin of peeked docs

Browse source
This commit is contained in:
Brian Gough 2021-08-02 10:25:03 +01:00
parent 6ce28271eb
commit 69339aeb9d
2 changed files with 56 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/docstore/app/js/HttpController.js
View file

@ -55,6 +55,7 @@ module.exports = HttpController = {
if (doc == null) { if (doc == null) {
return res.sendStatus(404) return res.sendStatus(404)
} else { } else {
res.setHeader('x-doc-status', doc.inS3 ? 'archived' : 'active')
return res.json(HttpController._buildDocView(doc)) return res.json(HttpController._buildDocView(doc))
} }
}) })

57
services/docstore/test/acceptance/js/GettingDocsFromArchiveTest.js
View file

@ -41,7 +41,7 @@ describe('Getting A Doc from Archive', function () {
await storage.createBucket(`${Settings.docstore.bucket}-deleted`) await storage.createBucket(`${Settings.docstore.bucket}-deleted`)
}) })
describe('archiving a single doc', function () { describe('for an archived doc', function () {
before(function (done) { before(function (done) {
this.project_id = ObjectId() this.project_id = ObjectId()
this.timeout(1000 * 30) this.timeout(1000 * 30)
@ -81,13 +81,66 @@ describe('Getting A Doc from Archive', function () {
done() done()
}) })
it('should get the doc lines and version', function (done) { it('should return the doc lines and version from persistent storage', function (done) {
return DocstoreClient.peekDoc( return DocstoreClient.peekDoc(
this.project_id, this.project_id,
this.doc._id, this.doc._id,
{}, {},
(error, res, doc) => { (error, res, doc) => {
res.statusCode.should.equal(200) res.statusCode.should.equal(200)
res.headers['x-doc-status'].should.equal('archived')
doc.lines.should.deep.equal(this.doc.lines)
doc.version.should.equal(this.doc.version)
doc.ranges.should.deep.equal(this.doc.ranges)
return done()
}
)
})
it('should return the doc lines and version from persistent storage on subsequent requests', function (done) {
return DocstoreClient.peekDoc(
this.project_id,
this.doc._id,
{},
(error, res, doc) => {
res.statusCode.should.equal(200)
res.headers['x-doc-status'].should.equal('archived')
doc.lines.should.deep.equal(this.doc.lines)
doc.version.should.equal(this.doc.version)
doc.ranges.should.deep.equal(this.doc.ranges)
return done()
}
)
})
describe('for an non-archived doc', function () {
before(function (done) {
this.project_id = ObjectId()
this.timeout(1000 * 30)
this.doc = {
_id: ObjectId(),
lines: ['foo', 'bar'],
ranges: {},
version: 2,
}
DocstoreClient.createDoc(
this.project_id,
this.doc._id,
this.doc.lines,
this.doc.version,
this.doc.ranges,
done
)
})
it('should return the doc lines and version from mongo', function (done) {
return DocstoreClient.peekDoc(
this.project_id,
this.doc._id,
{},
(error, res, doc) => {
res.statusCode.should.equal(200)
res.headers['x-doc-status'].should.equal('active')
doc.lines.should.deep.equal(this.doc.lines) doc.lines.should.deep.equal(this.doc.lines)
doc.version.should.equal(this.doc.version) doc.version.should.equal(this.doc.version)
doc.ranges.should.deep.equal(this.doc.ranges) doc.ranges.should.deep.equal(this.doc.ranges)