github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

[misc] apply review feedback on naming functions and parameters

Browse source 
Co-Authored-By: Simon Detheridge <s@sd.ai>
This commit is contained in:
Jakob Ackermann 2021-06-08 19:29:10 +01:00
parent 4996f8bbcd
commit d69c29e4dc
3 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/docstore/app/js/DocArchiveManager.js
View file

@ -36,7 +36,7 @@ module.exports = {
async function archiveAllDocs(projectId) { async function archiveAllDocs(projectId) {
while (true) { while (true) {
const docs = await MongoManager.getNNonArchivedProjectDocs( const docs = await MongoManager.getNonArchivedProjectDocs(
projectId, projectId,
ARCHIVE_BATCH_SIZE ARCHIVE_BATCH_SIZE
) )
@ -106,12 +106,12 @@ async function unArchiveAllDocs(projectId) {
while (true) { while (true) {
let docs let docs
if (settings.docstore.keepSoftDeletedDocsArchived) { if (settings.docstore.keepSoftDeletedDocsArchived) {
docs = await MongoManager.getNNonDeletedArchivedProjectDocs( docs = await MongoManager.getNonDeletedArchivedProjectDocs(
projectId, projectId,
UN_ARCHIVE_BATCH_SIZE UN_ARCHIVE_BATCH_SIZE
) )
} else { } else {
docs = await MongoManager.getNArchivedProjectDocs( docs = await MongoManager.getArchivedProjectDocs(
projectId, projectId,
UN_ARCHIVE_BATCH_SIZE UN_ARCHIVE_BATCH_SIZE
) )

16
services/docstore/app/js/MongoManager.js
View file

@ -64,29 +64,33 @@ module.exports = MongoManager = {
db.docs.find(query, queryOptions).toArray(callback) db.docs.find(query, queryOptions).toArray(callback)
}, },
getNArchivedProjectDocs(project_id, n, callback) { getArchivedProjectDocs(project_id, maxResults, callback) {
const query = { const query = {
project_id: ObjectId(project_id.toString()), project_id: ObjectId(project_id.toString()),
inS3: true inS3: true
} }
db.docs.find(query, { projection: { _id: 1 }, limit: n }).toArray(callback) db.docs
.find(query, { projection: { _id: 1 }, limit: maxResults })
.toArray(callback)
}, },
getNNonArchivedProjectDocs(project_id, n, callback) { getNonArchivedProjectDocs(project_id, maxResults, callback) {
const query = { const query = {
project_id: ObjectId(project_id.toString()), project_id: ObjectId(project_id.toString()),
inS3: { $ne: true } inS3: { $ne: true }
} }
db.docs.find(query, { limit: n }).toArray(callback) db.docs.find(query, { limit: maxResults }).toArray(callback)
}, },
getNNonDeletedArchivedProjectDocs(project_id, n, callback) { getNonDeletedArchivedProjectDocs(project_id, maxResults, callback) {
const query = { const query = {
project_id: ObjectId(project_id.toString()), project_id: ObjectId(project_id.toString()),
deleted: { $ne: true }, deleted: { $ne: true },
inS3: true inS3: true
} }
db.docs.find(query, { projection: { _id: 1 }, limit: n }).toArray(callback) db.docs
.find(query, { projection: { _id: 1 }, limit: maxResults })
.toArray(callback)
}, },
upsertIntoDocCollection(project_id, doc_id, updates, callback) { upsertIntoDocCollection(project_id, doc_id, updates, callback) {

18
services/docstore/test/unit/js/DocArchiveManagerTests.js
View file

@ -116,24 +116,24 @@ describe('DocArchiveManager', function () {
deleteObject: sinon.stub().resolves() deleteObject: sinon.stub().resolves()
} }
const getNNonArchivedProjectDocs = sinon.stub() const getNonArchivedProjectDocs = sinon.stub()
getNNonArchivedProjectDocs getNonArchivedProjectDocs
.onCall(0) .onCall(0)
.resolves(mongoDocs.filter((doc) => !doc.inS3)) .resolves(mongoDocs.filter((doc) => !doc.inS3))
getNNonArchivedProjectDocs.onCall(1).resolves([]) getNonArchivedProjectDocs.onCall(1).resolves([])
const getNArchivedProjectDocs = sinon.stub() const getArchivedProjectDocs = sinon.stub()
getNArchivedProjectDocs.onCall(0).resolves(archivedDocs) getArchivedProjectDocs.onCall(0).resolves(archivedDocs)
getNArchivedProjectDocs.onCall(1).resolves([]) getArchivedProjectDocs.onCall(1).resolves([])
MongoManager = { MongoManager = {
promises: { promises: {
markDocAsArchived: sinon.stub().resolves(), markDocAsArchived: sinon.stub().resolves(),
upsertIntoDocCollection: sinon.stub().resolves(), upsertIntoDocCollection: sinon.stub().resolves(),
getProjectsDocs: sinon.stub().resolves(mongoDocs), getProjectsDocs: sinon.stub().resolves(mongoDocs),
getNNonDeletedArchivedProjectDocs: getNArchivedProjectDocs, getNonDeletedArchivedProjectDocs: getArchivedProjectDocs,
getNNonArchivedProjectDocs, getNonArchivedProjectDocs,
getNArchivedProjectDocs, getArchivedProjectDocs,
findDoc: sinon.stub().rejects(new Errors.NotFoundError()), findDoc: sinon.stub().rejects(new Errors.NotFoundError()),
destroyDoc: sinon.stub().resolves() destroyDoc: sinon.stub().resolves()
} }