From d89a58f809abbb557ed036a7a89c2827f9ae5d65 Mon Sep 17 00:00:00 2001
From: Rykkel <220993G@mymail.nyp.edu.sg>
Date: Mon, 12 Aug 2024 18:33:28 +0800
Subject: [PATCH] Retrieve comment pfp & name

---
 client/src/components/CommentsModule.tsx | 20 +++++++++++++++-----
 server/models/Comment.js                 |  2 ++
 server/routes/post.js                    |  1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/client/src/components/CommentsModule.tsx b/client/src/components/CommentsModule.tsx
index 547135f..65d8db2 100644
--- a/client/src/components/CommentsModule.tsx
+++ b/client/src/components/CommentsModule.tsx
@@ -24,6 +24,11 @@ export default function CommentsModule() {
 
     let postId = id
 
+    // Function to get the profile picture URL
+    const getProfilePicture = (userId: string): string => {
+        return `${config.serverAddress}/users/profile-image/${userId}`;
+    };
+
     const getComments = async () => {
         instance
             .get(config.serverAddress + `/post/${postId}/getComments`).then((res) => {
@@ -47,21 +52,26 @@ export default function CommentsModule() {
                 <div className="w-8/12 mx-auto">
                     {commentList.length > 0 ? (
                         commentList.map((comment) => {
-                            // console.log(comment); // Log each comment to verify its structure
-                            // // Check if `comment.user` is defined before accessing properties
-                            // const user = comment.user || { firstName: "Unknown", lastName: "" };
+                            const user = comment.user; // Get the user object from the comment
+
+                            if (!user) {
+                                console.error("User object is undefined for comment:", comment);
+                                return null; // Skip rendering this comment if user is undefined
+                            }
+
+                            const profilePictureUrl = getProfilePicture(user.id); // Get the user's profile picture
                             return (
                                 <div className="flex flex-col w-full bg-primary-50 dark:bg-primary-950 rounded-xl mb-2 p-3 mx-auto"
                                     key={comment.id}>
                                     <div className="flex flex-row flex-shrink-0 w-full">
                                         <div>
                                             <Avatar
-                                                src="https://pbs.twimg.com/media/GOva9x5a0AAK8Bn?format=jpg&name=large"
+                                                src={profilePictureUrl}
                                                 size="md"
                                             />
                                         </div>
                                         <div className="flex flex-col w-10/12 flex-grow text-sm ml-3">
-                                            <div className="font-bold">Name</div>
+                                            <div className="font-bold">{user.firstName} {user.lastName}</div>
                                             <div className="break-words whitespace-pre-wrap">{comment.content}</div>
                                         </div>
                                         <div className="flex-shrink-0 ml-10">
diff --git a/server/models/Comment.js b/server/models/Comment.js
index 7410dd8..eab3511 100644
--- a/server/models/Comment.js
+++ b/server/models/Comment.js
@@ -22,10 +22,12 @@ module.exports = (sequelize, DataTypes) => {
     Comment.associate = (models) => {
         Comment.belongsTo(models.User, {
           foreignKey: 'userId',
+          as: "user",
           onDelete: 'CASCADE',
         });
         Comment.belongsTo(models.Post, {
           foreignKey: 'postId',
+          as: "post",
           onDelete: 'CASCADE',
         });
         Comment.hasMany(models.Comment, {
diff --git a/server/routes/post.js b/server/routes/post.js
index 298b862..f17b872 100644
--- a/server/routes/post.js
+++ b/server/routes/post.js
@@ -309,6 +309,7 @@ router.get("/:id/getComments", async (req, res) => {
     include: [
       {
         model: User,
+        as: "user",
         attributes: ["id", "firstName", "lastName"], // Specify the attributes you need
       },
     ],