diff --git a/api/models/Conversation.js b/api/models/Conversation.js index 9c30e1575a..7506fafe43 100644 --- a/api/models/Conversation.js +++ b/api/models/Conversation.js @@ -86,7 +86,7 @@ module.exports = { } return await Conversation.findOneAndUpdate( - { conversationId: conversationId, user: user }, + { conversationId: conversationId, user }, { $set: update }, { new: true, upsert: true } ).exec(); @@ -97,7 +97,7 @@ module.exports = { }, updateConvo: async (user, { conversationId, ...update }) => { try { - return await Conversation.findOneAndUpdate({ conversationId: conversationId, user: user }, update, { + return await Conversation.findOneAndUpdate({ conversationId: conversationId, user }, update, { new: true }).exec(); } catch (error) { @@ -107,9 +107,9 @@ module.exports = { }, getConvosByPage: async (user, pageNumber = 1, pageSize = 12) => { try { - const totalConvos = (await Conversation.countDocuments({ user: user })) || 1; + const totalConvos = (await Conversation.countDocuments({ user })) || 1; const totalPages = Math.ceil(totalConvos / pageSize); - const convos = await Conversation.find({ user: user }) + const convos = await Conversation.find({ user }) .sort({ createdAt: -1, created: -1 }) .skip((pageNumber - 1) * pageSize) .limit(pageSize) @@ -132,7 +132,7 @@ module.exports = { } }, deleteConvos: async (user, filter) => { - let deleteCount = await Conversation.deleteMany({...filter, user: user}).exec(); + let deleteCount = await Conversation.deleteMany({...filter, user}).exec(); deleteCount.messages = await deleteMessages(filter); return deleteCount; }, diff --git a/api/models/CustomGpt.js b/api/models/CustomGpt.js index 99379c944d..af3e092275 100644 --- a/api/models/CustomGpt.js +++ b/api/models/CustomGpt.js @@ -37,7 +37,7 @@ const createCustomGpt = async ({ chatGptLabel, promptPrefix, value, user }) => { module.exports = { getCustomGpts: async (user, filter) => { try { - return await CustomGpt.find({ ...filter, user: user }).exec(); + return await CustomGpt.find({ ...filter, user }).exec(); } catch (error) { console.error(error); return { customGpt: 'Error getting customGpts' }; @@ -45,12 +45,12 @@ module.exports = { }, updateCustomGpt: async (user, { value, ...update }) => { try { - const customGpt = await CustomGpt.findOne({ value, user: user }).exec(); + const customGpt = await CustomGpt.findOne({ value, user }).exec(); if (!customGpt) { - return await createCustomGpt({ value, ...update, user: user }); + return await createCustomGpt({ value, ...update, user }); } else { - return await CustomGpt.findOneAndUpdate({ value, user: user }, update, { + return await CustomGpt.findOneAndUpdate({ value, user }, update, { new: true, upsert: true }).exec(); @@ -62,7 +62,7 @@ module.exports = { }, updateByLabel: async (user, { prevLabel, ...update }) => { try { - return await CustomGpt.findOneAndUpdate({ chatGptLabel: prevLabel, user: user }, update, { + return await CustomGpt.findOneAndUpdate({ chatGptLabel: prevLabel, user }, update, { new: true, upsert: true }).exec(); @@ -73,7 +73,7 @@ module.exports = { }, deleteCustomGpts: async (user, filter) => { try { - return await CustomGpt.deleteMany({ ...filter, user: user }).exec(); + return await CustomGpt.deleteMany({ ...filter, user }).exec(); } catch (error) { console.error(error); return { customGpt: 'Error deleting customGpts' };