Merge branch 'main' into TJA/Likes

pablisch · May 16, 2023 · 81e34ab · 81e34ab
2 parents 3fac572 + 0d27392
commit 81e34ab
Show file tree

Hide file tree

Showing 23 changed files with 31,708 additions and 106 deletions.
diff --git a/api/controllers/posts.js b/api/controllers/posts.js
@@ -44,6 +44,61 @@ const PostsController = {
       });
     });
   },
+
+  // Pablo UPDATE version 3 6:40pm Monday 15th May
+  Update: async (req, res) => {
+    try {
+      const post_id = req.params.id;
+      console.log(post_id)
+      const update = req.body;
+      const updatedPost = await Post.findOneAndUpdate({ _id: post_id }, update, { new: true });
+      const token = await TokenGenerator.jsonwebtoken(req.user_id);
+      res.json({token})
+      // res.json({mssg: "You have updated this post!", token: token, updatedPost: updatedPost})
+    } catch (err) {
+      res.status(500).json({error: "messed up again!"})
+    }
+  },
+
+  // Tom, Pablo and Ana version 2 Monday pm
+  // Update: (req, res) => {
+  //   const post_id = req.params.id;
+  //   const update = req.body;
+  //   Post.findOneAndUpdate({ _id: post_id }, update, { new: true },
+  //     (async (updatedDoc) => {
+  //       if (!updatedDoc) {
+  //         res.status(400);
+  //       }
+
+  //       // res.status(204).json({ message: 'OK' });
+  //     }))
+  //     const token = await TokenGenerator.jsonwebtoken(req.user_id);
+  //       console.log(token)
+  //       console.log("HELLLO")
+  //       res.status(204).json({ message: 'OK', token: token });
+  //   ;
+  // },
+
+  // Ana, Tom and Pablo version 1 Monday pm
+  // Update: async (req, res) => {
+  //   console.log("Hello")
+  //   const post_id = req.params.id;
+  //   const update = req.body;
+  //   console.log(req.user_id)
+  //   try {
+  //     const updatedDoc = await Post.findOneAndUpdate({ _id: post_id }, update, {
+  //       new: true,
+  //     });
+  //     const token = await TokenGenerator.jsonwebtoken(req.user_id);
+  //     console.log(req.user_id)
+  //     console.log(token)
+  //     res.status(204).json({ message: 'OK', token: token });
+
+  //   } catch (err) {
+  //     res.status(500); //server error
+  //     console.log(err);
+  //   }
+  // },
 };
 
 module.exports = PostsController;
diff --git a/api/controllers/users.js b/api/controllers/users.js
@@ -1,15 +1,22 @@
 const User = require("../models/user");
+const { validateEmail } = require("../helpers/validation");
 
 const UsersController = {
-  Create: (req, res) => {
+  Create: (req, res) => { 
     const user = new User(req.body);
-    user.save((err) => {
+    if(!validateEmail(user.email)){
+       res.status(400).json({
+        message: 'Invalid email address!'
+      })
+    } else {
+      user.save((err) => {
       if (err) {
-        res.status(400).json({message: 'Bad request'})
+        res.status(400).json({message: 'Bad request'})    
       } else {
         res.status(201).json({ message: 'OK' });
       }
     });
+  }   
   },
 };
 

diff --git a/api/helpers/validation.js b/api/helpers/validation.js
@@ -0,0 +1,5 @@
+exports.validateEmail = (email) => {
+  //regex to validate email
+  return String(email).toLocaleLowerCase()
+  .match(/^([a-z\d\.-]+)@([a-z\d-]+)\.([a-z]{2,12})(\.[a-z]{1,12})?$/)
+}
diff --git a/api/models/post.js b/api/models/post.js
@@ -3,6 +3,7 @@ const mongoose = require("mongoose");
 
 const PostSchema = new mongoose.Schema({
   message: String, 
+  comments: [],   // AddComments: Added comments (empty array) to schema 
   authorUserID: {
     type: mongoose.Schema.Types.ObjectId,
     required: true,