agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 14:13:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15261 from overleaf/csh-issue-11625-mongo-ug-5-chat

Browse Source 
Upgrade mongodb module for chat from 4.11.0 to 6.1.0

GitOrigin-RevId: d4ce72b093fd09638a575a14f8945c8cb9ec7f3d
This commit is contained in:
Christopher Hoskin
2023-10-18 08:04:27 +00:00
committed by Copybot
parent 781a827e05
commit b3b02941c7
11 changed files with 123 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/chat/app/js/Features/Threads/ThreadManager.js
+10 -10
View File
@@ -4,9 +4,9 @@ export const GLOBAL_THREAD = 'GLOBAL'
export async function findOrCreateThread(projectId, threadId) {
let query, update
projectId = ObjectId(projectId.toString())
projectId = new ObjectId(projectId.toString())
if (threadId !== GLOBAL_THREAD) {
threadId = ObjectId(threadId.toString())
threadId = new ObjectId(threadId.toString())
}
if (threadId === GLOBAL_THREAD) {
@@ -33,14 +33,14 @@ export async function findOrCreateThread(projectId, threadId) {
{ $set: update },
{ upsert: true, returnDocument: 'after' }
)
return result.value
return result
}
export async function findAllThreadRooms(projectId) {
return db.rooms
.find(
{
project_id: ObjectId(projectId.toString()),
project_id: new ObjectId(projectId.toString()),
thread_id: { $exists: true },
},
{
@@ -55,7 +55,7 @@ export async function findAllThreadRoomsAndGlobalThread(projectId) {
return db.rooms
.find(
{
project_id: ObjectId(projectId.toString()),
project_id: new ObjectId(projectId.toString()),
},
{
thread_id: 1,
@@ -68,8 +68,8 @@ export async function findAllThreadRoomsAndGlobalThread(projectId) {
export async function resolveThread(projectId, threadId, userId) {
await db.rooms.updateOne(
{
project_id: ObjectId(projectId.toString()),
thread_id: ObjectId(threadId.toString()),
project_id: new ObjectId(projectId.toString()),
thread_id: new ObjectId(threadId.toString()),
},
{
$set: {
@@ -85,8 +85,8 @@ export async function resolveThread(projectId, threadId, userId) {
export async function reopenThread(projectId, threadId) {
await db.rooms.updateOne(
{
project_id: ObjectId(projectId.toString()),
thread_id: ObjectId(threadId.toString()),
project_id: new ObjectId(projectId.toString()),
thread_id: new ObjectId(threadId.toString()),
},
{
$unset: {
@@ -106,6 +106,6 @@ export async function deleteThread(projectId, threadId) {
export async function deleteAllThreadsInProject(projectId) {
await db.rooms.deleteMany({
project_id: ObjectId(projectId.toString()),
project_id: new ObjectId(projectId.toString()),
})
}