diff --git a/Controllers/threadController.js b/Controllers/threadController.js index ace70f7..37909f1 100644 --- a/Controllers/threadController.js +++ b/Controllers/threadController.js @@ -19,7 +19,7 @@ module.exports.submitRequests_post = (req, res) => { const token = req.cookies.jwt; - jwt.verify(token, 'esghsierhgoisio43jh5294utjgft*/*/4t*4et490wujt4*/w4t*/t4', (err, decodedToken) => { + jwt.verify(token, 'esghsierhgoisio43jh5294utjgft*/*/4t*4et490wujt4*/w4t*/t4', async (err, decodedToken) => { let id = decodedToken.id; @@ -50,7 +50,19 @@ module.exports.submitRequests_post = (req, res) => { messageObject['files'] = []; let messageId = database.addMessage(messageObject); - data['messageID_list'] = [messageId]; + + //create the main message for add/drop requests + let user = await db.collections.users.findOne({_id: mongoose.Types.ObjectId(id)}); + let message2; + if(bodyData.type == 'repeat' || bodyData.type == 'submission'){ + message2 = (user.name + ' has a request regarding the module ' + bodyData.module); + } + else{ + message2 = (user.name + ' requested the module ' + bodyData.module + ' to be changed to ' + bodyData.requiredModule); + } + let messageId2 = database.addMessage({'from': id, 'text': message2}); + + data['messageID_list'] = [messageId2, messageId]; database.addThread(data); res.redirect('/userProfile'); @@ -130,7 +142,6 @@ module.exports.getThreadData_post = (req, res) => { searchQuery['type'] = filter.type; let filterThreads = async (thread, filter) => { - console.log(filter); let string = filter.string.toLowerCase(); let searchWords = string.split(' '); diff --git a/profilePics/0d993272-2321-45fd-ad41-5990e1918b75-10cd73c02e713fc55986852f4a80d387 (1).png b/profilePics/0d993272-2321-45fd-ad41-5990e1918b75-10cd73c02e713fc55986852f4a80d387 (1).png new file mode 100644 index 0000000..1073faf Binary files /dev/null and b/profilePics/0d993272-2321-45fd-ad41-5990e1918b75-10cd73c02e713fc55986852f4a80d387 (1).png differ diff --git a/profilePics/1bb62128-6934-4363-8606-e6b3667d8946-10cd73c02e713fc55986852f4a80d387.jpg b/uploads/299bd8b9-9e3e-4323-aa9f-8c1231bb12f7-10cd73c02e713fc55986852f4a80d387.jpg similarity index 100% rename from profilePics/1bb62128-6934-4363-8606-e6b3667d8946-10cd73c02e713fc55986852f4a80d387.jpg rename to uploads/299bd8b9-9e3e-4323-aa9f-8c1231bb12f7-10cd73c02e713fc55986852f4a80d387.jpg