fix: conflict 해결

prgrms-fe-devcourse · Jun 22, 2022 · 02dff6e · 02dff6e
1 parent 972be1b
commit 02dff6e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/pages/ChallengePage.tsx b/src/pages/ChallengePage.tsx
@@ -38,6 +38,7 @@ const ChallengePage = () => {
   const [endDate, setEndDate] = useState("");
   const [isCheered, setIsCheered] = useState(false);
   const [cheerUpId, setCheerUpId] = useState("");
+  const [authorId, setAuthorId] = useState("");
   const [show, setShow] = useState(false);
 
   const [, , channelId, postId] = window.location.pathname.split("/");
@@ -50,6 +51,7 @@ const ChallengePage = () => {
         new Date(format(new Date(), "yyyy-MM-dd")),
         new Date(date)
       );
+      setAuthorId(author._id);
       validateGuest(author._id);
       setReward(reward);
       setCommentCount(comments.length);
@@ -115,15 +117,15 @@ const ChallengePage = () => {
         status === 200 ? setCheerUpYes(data._id) : alert("다시 시도바랍니다.");
       }
     } else {
-      alert("로그인 후 이용가능합니다.");
+      alert("로그인 후 이용가능합니다!");
     }
   };
 
   const onCheerUpNotificationEvent = async (cheerUpId) => {
     const { status } = await fetchPostNotification({
       notificationType: "LIKE",
       notificationTypeId: cheerUpId,
-      userId: myUser._id,
+      userId: authorId,
     });
     status === 200
       ? console.log("success like-notification")

diff --git a/src/pages/CommentPage.tsx b/src/pages/CommentPage.tsx
@@ -19,14 +19,16 @@ const CommentPage = () => {
   const [myUser] = useAtom(userAtom);
   const [commentList, setCommentList] = useState([]);
   const [commentValue, setCommentValue] = useState("");
+  const [authorId, setAuthorId] = useState("");
   const [show, setShow] = useState(false);
 
   const [, , , postId] = window.location.pathname.split("/");
   const { data: Contents } = useGetChallenge(postId);
 
   useEffect(() => {
     if (Contents?.status === 200) {
-      const { comments } = Contents?.data;
+      const { author, comments } = Contents?.data;
+      setAuthorId(author._id);
       setCommentList(comments);
       setShow(true);
     }
@@ -42,7 +44,7 @@ const CommentPage = () => {
     const { status } = await fetchPostNotification({
       notificationType: "COMMENT",
       notificationTypeId: commentId,
-      userId: myUser._id,
+      userId: authorId,
     });
     status === 200
       ? console.log("success comment-notification")