alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[misc] simplify mongodb collection access using a shared db construct

Browse Source 
Resolve the getCollection Promises once and store the result in a shared
 `db` object which can get imported by all the call-sites.

The http server is starting only after a Promise of `waitForDb()`
 resolves. This covers the app code and the acceptance tests:
REF: 586706a9439c3591fc9613dc877f055096ca073a
REF: d026569d2eb4123e30c771a55a001b42d5ade72f
This commit is contained in:
Jakob Ackermann
2020-09-10 10:08:30 +01:00
parent a52c0fe9fb
commit 4080784310
3 changed files with 94 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/chat/app/js/Features/Threads/ThreadManager.js
+54 -66
View File
@@ -12,12 +12,10 @@
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
let ThreadManager
const { ObjectId, getCollection } = require('../../mongodb')
const { db, ObjectId } = require('../../mongodb')
const logger = require('logger-sharelatex')
const metrics = require('@overleaf/metrics')
const roomsCollectionPromise = getCollection('rooms')
module.exports = ThreadManager = {
GLOBAL_THREAD: 'GLOBAL',
@@ -50,58 +48,52 @@ module.exports = ThreadManager = {
}
}
roomsCollectionPromise.then((rooms) =>
rooms.updateOne(query, { $set: update }, { upsert: true }, function (
error
) {
if (error != null) {
return callback(error)
}
rooms.findOne(query, callback)
})
)
db.rooms.updateOne(query, { $set: update }, { upsert: true }, function (
error
) {
if (error != null) {
return callback(error)
}
db.rooms.findOne(query, callback)
})
},
findAllThreadRooms(project_id, callback) {
if (callback == null) {
callback = function (error, rooms) {}
}
roomsCollectionPromise.then((rooms) =>
rooms
.find(
{
project_id: ObjectId(project_id.toString()),
thread_id: { $exists: true }
},
{
thread_id: 1,
resolved: 1
}
)
.toArray(callback)
)
db.rooms
.find(
{
project_id: ObjectId(project_id.toString()),
thread_id: { $exists: true }
},
{
thread_id: 1,
resolved: 1
}
)
.toArray(callback)
},
resolveThread(project_id, thread_id, user_id, callback) {
if (callback == null) {
callback = function (error) {}
}
roomsCollectionPromise.then((rooms) =>
rooms.updateOne(
{
project_id: ObjectId(project_id.toString()),
thread_id: ObjectId(thread_id.toString())
},
{
$set: {
resolved: {
user_id,
ts: new Date()
}
db.rooms.updateOne(
{
project_id: ObjectId(project_id.toString()),
thread_id: ObjectId(thread_id.toString())
},
{
$set: {
resolved: {
user_id,
ts: new Date()
}
},
callback
)
}
},
callback
)
},
@@ -109,19 +101,17 @@ module.exports = ThreadManager = {
if (callback == null) {
callback = function (error) {}
}
roomsCollectionPromise.then((rooms) =>
rooms.updateOne(
{
project_id: ObjectId(project_id.toString()),
thread_id: ObjectId(thread_id.toString())
},
{
$unset: {
resolved: true
}
},
callback
)
db.rooms.updateOne(
{
project_id: ObjectId(project_id.toString()),
thread_id: ObjectId(thread_id.toString())
},
{
$unset: {
resolved: true
}
},
callback
)
},
@@ -136,18 +126,16 @@ module.exports = ThreadManager = {
if (error != null) {
return callback(error)
}
roomsCollectionPromise.then((rooms) =>
rooms.deleteOne(
{
_id: room._id
},
function (error) {
if (error != null) {
return callback(error)
}
return callback(null, room._id)
db.rooms.deleteOne(
{
_id: room._id
},
function (error) {
if (error != null) {
return callback(error)
}
)
return callback(null, room._id)
}
)
})
}