fix: error while create message

fixes #107
roman-ojha · Jun 10, 2022 · 429ab2b · 429ab2b
1 parent 0a5752c
commit 429ab2b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/client/src/components/MessageBox/MessagesListSingleMessage.jsx b/client/src/components/MessageBox/MessagesListSingleMessage.jsx
@@ -39,7 +39,7 @@ const MessagesListSingleMessage = (props) => {
       if (resMessage.status !== 200) {
         // const error = await resMessage.data;
       } else {
-        const resData = await resMessage.data;
+        const resData = await resMessage.data.data;
         // after getting message we will store that message into redux
         dispatch(
           currentUserMessageAction({

diff --git a/client/src/components/MessagePage/MessagesListSingleMessage.jsx b/client/src/components/MessagePage/MessagesListSingleMessage.jsx
@@ -40,7 +40,7 @@ const MessageListSingleMessage = (props) => {
       if (resMessage.status !== 200) {
         // const error = await resMessage.data;
       } else {
-        const resData = await resMessage.data;
+        const resData = await resMessage.data.data;
         // after getting message we will store that message into redux
         dispatch(
           currentUserMessageAction({

diff --git a/client/src/components/ProfilePage/UserInfo.jsx b/client/src/components/ProfilePage/UserInfo.jsx
@@ -141,15 +141,16 @@ const UserInfo = () => {
       if (resMessage.status !== 200) {
         // const error = await resMessage.data;
       } else {
-        const resData = await resMessage.data;
+        const resData = await resMessage.data.data;
         // after getting message we will store that message into redux
         dispatch(
           currentUserMessageAction({
             messageToId: resData.messageToId,
             messageToUserId: profilePageData.userID,
             receiverPicture: profilePageData.picture,
-            roomID: resData.roomID,
+            // roomID: resData.roomID,
             message: resData.message,
+            fetchedInnerMessage: true,
           })
         );
       }

diff --git a/controllers/message.controller.ts b/controllers/message.controller.ts
@@ -140,7 +140,7 @@ export default {
       );
       if (!userMessage) {
         // if message doesn't exist already then we have to create a new message which would contain the empty message
-        const roomID = crypto.randomBytes(16).toString("hex");
+        // const roomID = crypto.randomBytes(16).toString("hex");
         // generating new room id for those spacific user room to join on socket
         const resSaveRootMsg = await userDetail.updateOne(
           // creating and saving message to rootUser
@@ -151,7 +151,7 @@ export default {
             $push: {
               messages: {
                 messageToId: messageToId,
-                roomID: roomID,
+                // roomID: roomID,
                 message: [],
               },
             },
@@ -166,23 +166,33 @@ export default {
             $push: {
               messages: {
                 messageToId: rootUser.id,
-                roomID: roomID,
+                // roomID: roomID,
                 message: [],
               },
             },
           }
         );
         if (resSaverReceiverMsg && resSaveRootMsg) {
-          return res
-            .status(200)
-            .json(<ResponseObject>{ success: true, msg: "message created" });
+          return res.status(200).json(<ResponseObject>{
+            success: true,
+            msg: "message created",
+            data: {
+              messageToId: messageToId,
+              message: [],
+              lastMessageOn: new Date(),
+            },
+          });
         } else {
           return res
             .status(500)
             .json(<ResponseObject>{ success: false, msg: "server error" });
         }
       }
-      return res.status(200).json(userMessage.messages[0]);
+      return res.status(200).json({
+        success: true,
+        msg: "Successful",
+        data: userMessage.messages[0],
+      });
     } catch (err) {
       return res.status(500).json(<ResponseObject>{
         success: false,

diff --git a/models/userMessages.ts b/models/userMessages.ts
@@ -9,10 +9,10 @@ const userMessages = {
     type: String,
     required: true,
   },
-  roomID: {
-    type: String,
-    required: true,
-  },
+  // roomID: {
+  //   type: String,
+  //   required: true,
+  // },
   message: [
     {
       senderId: {