Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 17:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: user:user redundancies

Browse source
This commit is contained in:
Danny Avila 2023-03-16 13:32:04 -04:00
parent df19595c5b
commit 915cda70ef
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/models/Conversation.js
View file

@ -86,7 +86,7 @@ module.exports = {
} }
return await Conversation.findOneAndUpdate( return await Conversation.findOneAndUpdate(
{ conversationId: conversationId, user: user }, { conversationId: conversationId, user },
{ $set: update }, { $set: update },
{ new: true, upsert: true } { new: true, upsert: true }
).exec(); ).exec();
@ -97,7 +97,7 @@ module.exports = {
}, },
updateConvo: async (user, { conversationId, ...update }) => { updateConvo: async (user, { conversationId, ...update }) => {
try { try {
return await Conversation.findOneAndUpdate({ conversationId: conversationId, user: user }, update, { return await Conversation.findOneAndUpdate({ conversationId: conversationId, user }, update, {
new: true new: true
}).exec(); }).exec();
} catch (error) { } catch (error) {
@ -107,9 +107,9 @@ module.exports = {
}, },
getConvosByPage: async (user, pageNumber = 1, pageSize = 12) => { getConvosByPage: async (user, pageNumber = 1, pageSize = 12) => {
try { try {
const totalConvos = (await Conversation.countDocuments({ user: user })) || 1; const totalConvos = (await Conversation.countDocuments({ user })) || 1;
const totalPages = Math.ceil(totalConvos / pageSize); const totalPages = Math.ceil(totalConvos / pageSize);
const convos = await Conversation.find({ user: user }) const convos = await Conversation.find({ user })
.sort({ createdAt: -1, created: -1 }) .sort({ createdAt: -1, created: -1 })
.skip((pageNumber - 1) * pageSize) .skip((pageNumber - 1) * pageSize)
.limit(pageSize) .limit(pageSize)
@ -132,7 +132,7 @@ module.exports = {
} }
}, },
deleteConvos: async (user, filter) => { 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); deleteCount.messages = await deleteMessages(filter);
return deleteCount; return deleteCount;
}, },

12
api/models/CustomGpt.js
View file

@ -37,7 +37,7 @@ const createCustomGpt = async ({ chatGptLabel, promptPrefix, value, user }) => {
module.exports = { module.exports = {
getCustomGpts: async (user, filter) => { getCustomGpts: async (user, filter) => {
try { try {
return await CustomGpt.find({ ...filter, user: user }).exec(); return await CustomGpt.find({ ...filter, user }).exec();
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return { customGpt: 'Error getting customGpts' }; return { customGpt: 'Error getting customGpts' };
@ -45,12 +45,12 @@ module.exports = {
}, },
updateCustomGpt: async (user, { value, ...update }) => { updateCustomGpt: async (user, { value, ...update }) => {
try { try {
const customGpt = await CustomGpt.findOne({ value, user: user }).exec(); const customGpt = await CustomGpt.findOne({ value, user }).exec();
if (!customGpt) { if (!customGpt) {
return await createCustomGpt({ value, ...update, user: user }); return await createCustomGpt({ value, ...update, user });
} else { } else {
return await CustomGpt.findOneAndUpdate({ value, user: user }, update, { return await CustomGpt.findOneAndUpdate({ value, user }, update, {
new: true, new: true,
upsert: true upsert: true
}).exec(); }).exec();
@ -62,7 +62,7 @@ module.exports = {
}, },
updateByLabel: async (user, { prevLabel, ...update }) => { updateByLabel: async (user, { prevLabel, ...update }) => {
try { try {
return await CustomGpt.findOneAndUpdate({ chatGptLabel: prevLabel, user: user }, update, { return await CustomGpt.findOneAndUpdate({ chatGptLabel: prevLabel, user }, update, {
new: true, new: true,
upsert: true upsert: true
}).exec(); }).exec();
@ -73,7 +73,7 @@ module.exports = {
}, },
deleteCustomGpts: async (user, filter) => { deleteCustomGpts: async (user, filter) => {
try { try {
return await CustomGpt.deleteMany({ ...filter, user: user }).exec(); return await CustomGpt.deleteMany({ ...filter, user }).exec();
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return { customGpt: 'Error deleting customGpts' }; return { customGpt: 'Error deleting customGpts' };