Bug fixes

README.md

@@ -1,5 +1,9 @@
 # Acebook
 
+# Trello Board:
+
+https://trello.com/b/Ckf68HAB/acebook
+
 In this project, you are tasked with working on an existing application. A significant part of the challenge will be to familiarise yourself with the codebase you've inherited, as you work to **improve and extend** it.
 
 ## Videos

api/app.js

@@ -7,30 +7,32 @@ const JWT = require("jsonwebtoken");
 const postsRouter = require("./routes/posts");
 const tokensRouter = require("./routes/tokens");
 const usersRouter = require("./routes/users");
+const commentsRouter = require("./routes/comments");
+const likesRouter = require("./routes/likes")
+
 
 const app = express();
 
 // setup for receiving JSON
-app.use(express.json())
+app.use(express.json());
 
 app.use(logger("dev"));
 app.use(express.json());
 app.use(express.static(path.join(__dirname, "public")));
 
 // middleware function to check for valid tokens
 const tokenChecker = (req, res, next) => {
-
   let token;
-  const authHeader = req.get("Authorization")
+  const authHeader = req.get("Authorization");
 
-  if(authHeader) {
-    token = authHeader.slice(7)
+  if (authHeader) {
+    token = authHeader.slice(7);
   }
 
   JWT.verify(token, process.env.JWT_SECRET, (err, payload) => {
-    if(err) {
-      console.log(err)
-      res.status(401).json({message: "auth error"});
+    if (err) {
+      //console.log(err);
+      res.status(401).json({ message: "auth error" });
     } else {
       req.user_id = payload.user_id;
       next();
@@ -40,8 +42,11 @@ const tokenChecker = (req, res, next) => {
 
 // route setup
 app.use("/posts", tokenChecker, postsRouter);
+app.use("/comments", tokenChecker, commentsRouter);
 app.use("/tokens", tokensRouter);
 app.use("/users", usersRouter);
+app.use("/likes", tokenChecker, likesRouter);
+//app.use("/", homeRouter);
 
 // catch 404 and forward to error handler
 app.use((req, res, next) => {
@@ -55,7 +60,7 @@ app.use((err, req, res) => {
   res.locals.error = req.app.get("env") === "development" ? err : {};
 
   // respond with details of the error
-  res.status(err.status || 500).json({message: 'server error'})
+  res.status(err.status || 500).json({ message: "server error" });
 });
 
 module.exports = app;

api/controllers/likes.js

@@ -0,0 +1,61 @@
+const Post = require("../models/post");
+const TokenGenerator = require("../models/token_generator");
+
+// const addLike = (req, res) => {
+//   // this method will:
+//   // 1. retrieve the post using post_id
+//   // 2. insert user_id into likes array
+//   const data = req.body;
+//   const post_id = data.post_id;
+//   const user_id = req.user_id;
+
+//   console.log("method called");
+//   console.log(`post_id is ${post_id}`);
+//   console.log(`user_id is ${user_id}`);
+
+//   Post.findByIdAndUpdate(
+//     post_id,
+//     {
+//       $push: {
+//         likes: { likerId: user_id },
+//       },
+//     },
+//     async (err) => {
+//       if (err) {
+//         throw err;
+//       }
+//       const token = await TokenGenerator.jsonwebtoken(user_id);
+//       res.status(201).json({ message: "OK", token: token });
+//     }
+//   );
+// };
+
+const LikesController = {
+  Create: (req, res) => {
+    const data = req.body;
+    const post_id = data.post_id;
+    const user_id = req.user_id;
+
+    console.log("method called");
+    console.log(`post_id is ${post_id}`);
+    console.log(`user_id is ${user_id}`);
+
+    Post.findByIdAndUpdate(
+      post_id,
+      {
+        $push: {
+          likes: { likerId: user_id },
+        },
+      },
+      async (err) => {
+        if (err) {
+          throw err;
+        }
+        const token = await TokenGenerator.jsonwebtoken(user_id);
+        res.status(201).json({ message: "OK", token: token });
+      }
+    );
+  },
+};
+
+module.exports = LikesController;

api/controllers/posts.js

@@ -1,3 +1,4 @@
+const router = require("../routes/posts");
 const Post = require("../models/post");
 const TokenGenerator = require("../models/token_generator");
 
@@ -7,21 +8,47 @@ const PostsController = {
       if (err) {
         throw err;
       }
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
+      const token = await TokenGenerator.jsonwebtoken(req.user_id);
       res.status(200).json({ posts: posts, token: token });
-    });
+    }).sort({ time: -1 });
   },
   Create: (req, res) => {
+    req.body.time = Date.now();
+    req.body.posterUserId = req.user_id;
+    req.body.comments = [];
     const post = new Post(req.body);
     post.save(async (err) => {
       if (err) {
         throw err;
       }
 
-      const token = await TokenGenerator.jsonwebtoken(req.user_id)
-      res.status(201).json({ message: 'OK', token: token });
+      const token = await TokenGenerator.jsonwebtoken(req.user_id);
+      res.status(201).json({ message: "OK", token: token });
     });
   },
+  CreateComment: (req, res) => {
+    req.body.time = Date.now();
+    req.body.posterUserId = req.user_id;
+    Post.findByIdAndUpdate(
+      req.body.postId,
+      {
+        $push: {
+          comments: {
+            time: req.body.time,
+            user: req.user_id,
+            comment: req.body.comment,
+          },
+        },
+      },
+      async (err) => {
+        if (err) {
+          throw err;
+        }
+        const token = await TokenGenerator.jsonwebtoken(req.user_id);
+        res.status(201).json({ message: "OK", token: token });
+      }
+    );
+  },
 };
 
 module.exports = PostsController;

api/controllers/tokens.js

@@ -1,25 +1,24 @@
 const User = require("../models/user");
-const TokenGenerator = require("../models/token_generator")
+const TokenGenerator = require("../models/token_generator");
 
 const SessionsController = {
-
   Create: (req, res) => {
     const email = req.body.email;
     const password = req.body.password;
 
     User.findOne({ email: email }).then(async (user) => {
       if (!user) {
-        console.log("auth error: user not found")
+        console.log("auth error: user not found");
         res.status(401).json({ message: "auth error" });
       } else if (user.password !== password) {
-        console.log("auth error: passwords do not match")
+        console.log("auth error: passwords do not match");
         res.status(401).json({ message: "auth error" });
       } else {
-        const token = await TokenGenerator.jsonwebtoken(user.id)
+        const token = await TokenGenerator.jsonwebtoken(user.id);
         res.status(201).json({ token: token, message: "OK" });
       }
     });
-  }
+  },
 };
 
 module.exports = SessionsController;

api/controllers/users.js

@@ -5,9 +5,9 @@ const UsersController = {
     const user = new User(req.body);
     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' });
+        res.status(201).json({ message: "OK" });
       }
     });
   },

api/models/post.js

@@ -1,7 +1,17 @@
 const mongoose = require("mongoose");
 
 const PostSchema = new mongoose.Schema({
-  message: String
+  message: String,
+  time: Number,
+  posterUserId: String,
+  comments: [  
+    {
+   time: { type: Number },
+   user: { type: String },
+   comment: { type: String },
+  }, 
+],
+  likes: Array
 });
 
 const Post = mongoose.model("Post", PostSchema);

api/models/token_generator.js

@@ -1,10 +1,10 @@
 const JWT = require("jsonwebtoken");
-const options = {expiresIn: "10m"};
+const options = { expiresIn: "10m" };
 const secret = process.env.JWT_SECRET;
 
 class TokenGenerator {
   static jsonwebtoken(user_id) {
-    return JWT.sign({user_id: user_id, iat: Date.now()}, secret, options);
+    return JWT.sign({ user_id: user_id, iat: Date.now() }, secret, options);
   }
 }
 

api/package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "start": "nodemon ./bin/www",
     "start:test": "MONGODB_URL='mongodb://0.0.0.0/acebook_test' npm start",
-    "test": "jest"
+    "test": "jest --runInBand"
   },
   "engines": {
     "node": ">=18.1.0"

api/routes/comments.js

@@ -0,0 +1,10 @@
+
+const express = require("express");
+const router = express.Router();
+
+
+const PostsController = require("../controllers/posts");
+
+router.post("/", PostsController.CreateComment);
+
+module.exports = router;

api/routes/likes.js

@@ -0,0 +1,13 @@
+
+const express = require("express");
+const router = express.Router();
+
+
+const LikesController = require("../controllers/likes");
+
+
+
+// router.get("/", PostsController.Index);
+router.post("/", LikesController.Create);
+
+module.exports = router;

api/routes/posts.js

@@ -1,8 +1,12 @@
+
 const express = require("express");
 const router = express.Router();
 
+
 const PostsController = require("../controllers/posts");
 
+
+
 router.get("/", PostsController.Index);
 router.post("/", PostsController.Create);