FE-66 🔀 브랜치 최신화

src/apis/epigramComment.ts

@@ -0,0 +1,46 @@
+import httpClient from '@/apis/index';
+import { CommentRequestSchema, CommentRequestType, CommentResponseSchema, CommentResponseType } from '@/schema/comment';
+import { PostCommentRequest, PatchCommentRequest } from '@/types/epigram.types';
+
+export const getEpigramComments = async (params: CommentRequestType): Promise<CommentResponseType> => {
+  try {
+    // 요청 파라미터 유효성 검사
+    const validatedParams = CommentRequestSchema.parse(params);
+
+    const { id, limit, cursor } = validatedParams;
+
+    // NOTE: URL의 쿼리 문자열을 사용
+    // NOTE : cursor값이 있다면 ?limit=3&cursor=100, 없다면 ?limit=3,(숫자는 임의로 지정한 것)
+    const queryParams = new URLSearchParams({
+      limit: limit.toString(),
+      ...(cursor !== undefined && { cursor: cursor.toString() }),
+    });
+
+    const response = await httpClient.get<CommentResponseType>(`/epigrams/${id}/comments?${queryParams.toString()}`);
+
+    // 응답 데이터 유효성 검사
+    const validatedData = CommentResponseSchema.parse(response.data);
+
+    return validatedData;
+  } catch (error) {
+    if (error instanceof Error) {
+      throw new Error(`댓글을 불러오는데 실패했습니다: ${error.message}`);
+    }
+    throw error;
+  }
+};
+
+export const postComment = async (commentData: PostCommentRequest) => {
+  const response = await httpClient.post('/comments', commentData);
+  return response.data;
+};
+
+export const patchComment = async (commentId: number, commentData: PatchCommentRequest) => {
+  const response = await httpClient.patch(`/comments/${commentId}`, commentData);
+  return response.data;
+};
+
+export const deleteComment = async (commentId: number) => {
+  const response = await httpClient.delete(`/comments/${commentId}`);
+  return response.data;
+};

src/apis/getEmotion.ts

@@ -0,0 +1,25 @@
+import { EmotionType } from '@/types/emotion';
+import type { GetEmotionResponseType } from '@/schema/emotion';
+import { translateEmotionToKorean } from '@/utils/emotionMap';
+import httpClient from '.';
+import { getMe } from './user';
+
+const getEmotion = async (): Promise<EmotionType | null> => {
+  const user = await getMe();
+  if (!user) {
+    throw new Error('로그인이 필요합니다.');
+  }
+
+  const response = await httpClient.get<GetEmotionResponseType>('/emotionLogs/today', {
+    params: { userId: user.id },
+  });
+
+  if (response.status === 204) {
+    return null; // No content
+  }
+
+  const koreanEmotion = translateEmotionToKorean(response.data.emotion);
+  return koreanEmotion;
+};
+
+export default getEmotion;

src/apis/getEpigrams.ts

@@ -0,0 +1,12 @@
+import { GetEpigramsParamsType, GetEpigramsResponseType, GetEpigramsResponse } from '@/schema/epigrams';
+import httpClient from '.';
+
+const getEpigrams = async (params: GetEpigramsParamsType): Promise<GetEpigramsResponseType> => {
+  const response = await httpClient.get(`/epigrams`, { params });
+
+  // 데이터 일치하는지 확인
+  const parsedResponse = GetEpigramsResponse.parse(response.data);
+  return parsedResponse;
+};
+
+export default getEpigrams;

src/apis/index.ts

@@ -50,3 +50,45 @@ httpClient.interceptors.response.use(
 );
 
 export default httpClient;
+
+// NOTE: eslint-disable no-param-reassign 미해결로 인한 설정
+httpClient.interceptors.request.use((config) => {
+  const accessToken = localStorage.getItem('accessToken');
+  /* eslint-disable no-param-reassign */
+  if (accessToken) config.headers.Authorization = `Bearer ${accessToken}`;
+  /* eslint-enable no-param-reassign */
+  return config;
+});
+
+httpClient.interceptors.response.use(
+  (response) => response,
+
+  (error) => {
+    if (error.response && error.response.status === 401) {
+      const refreshToken = localStorage.getItem('refreshToken');
+
+      if (!refreshToken) {
+        window.location.href = '/auth/SignIn';
+        return Promise.reject(error);
+      }
+
+      return httpClient
+        .post('/auth/refresh-token', null, {
+          headers: { Authorization: `Bearer ${refreshToken}` },
+        })
+        .then((response) => {
+          const { accessToken, refreshToken: newRefreshToken } = response.data;
+          localStorage.setItem('accessToken', accessToken);
+          localStorage.setItem('refreshToken', newRefreshToken);
+
+          const originalRequest = error.config;
+          return httpClient(originalRequest);
+        })
+        .catch(() => {
+          window.location.href = '/auth/SignIn';
+          return Promise.reject(error);
+        });
+    }
+    return Promise.reject(error);
+  },
+);

src/apis/oauth.ts

@@ -0,0 +1,11 @@
+import axios from 'axios';
+
+const postOauth = async (code: string) => {
+  const response = await axios.post(`${process.env.NEXT_PUBLIC_BASE_URL}/auth/signIn/KAKAO`, {
+    redirectUri: process.env.NEXT_PUBLIC_REDIRECT_URI,
+    token: code,
+  });
+  return response.data;
+};
+
+export default postOauth;

src/apis/postEmotion.ts

@@ -0,0 +1,24 @@
+import { EmotionType } from '@/types/emotion';
+import type { PostEmotionRequestType, PostEmotionResponseType } from '@/schema/emotion';
+import { translateEmotionToEnglish } from '@/utils/emotionMap';
+import httpClient from '.';
+import { getMe } from './user';
+
+const postEmotion = async (emotion: EmotionType): Promise<PostEmotionResponseType> => {
+  const user = await getMe();
+  if (!user) {
+    throw new Error('로그인이 필요합니다.');
+  }
+
+  const englishEmotion = translateEmotionToEnglish(emotion);
+  const request: PostEmotionRequestType = { emotion: englishEmotion };
+
+  const response = await httpClient.post<PostEmotionResponseType>('/emotionLogs/today', {
+    ...request,
+    userId: user.id,
+  });
+
+  return response.data;
+};
+
+export default postEmotion;

src/apis/user.ts

@@ -1,18 +1,18 @@
-import type { GetUserReponseType, GetUserRequestType, PatchMeRequestType } from '@/schema/user';
+import type { GetUserResponseType, GetUserRequestType, PatchMeRequestType } from '@/schema/user';
 import httpClient from '.';
 
-export const getMe = async (): Promise<GetUserReponseType> => {
+export const getMe = async (): Promise<GetUserResponseType> => {
   const response = await httpClient.get('/users/me');
   return response.data;
 };
 
-export const getUser = async (request: GetUserRequestType): Promise<GetUserReponseType> => {
+export const getUser = async (request: GetUserRequestType): Promise<GetUserResponseType> => {
   const { id } = request;
   const response = await httpClient.get(`/users/${id}`);
   return response.data;
 };
 
-export const updateMe = async (request: PatchMeRequestType): Promise<GetUserReponseType> => {
+export const updateMe = async (request: PatchMeRequestType): Promise<GetUserResponseType> => {
   const response = await httpClient.patch('/users/me', { ...request });
   return response.data;
 };

src/components/Emotion/EmotionCard.tsx

@@ -7,7 +7,7 @@
 import React from 'react';
 import cn from '@/lib/utils';
 import Image from 'next/image';
-import { EmotionIconCardProps } from '@/types/EmotionTypes';
+import { EmotionIconCardProps } from '@/types/emotion';
 
 // 아이콘 파일 경로 매핑
 const iconPaths = {

src/components/Emotion/EmotionSaveToast.tsx

@@ -0,0 +1,34 @@
+/*
+ * 오늘의 감정을 선택하면 표시되는 toast입니다.
+ * 감정을 확인하기 위해 마이페이지로 연결됩니다.
+ */
+
+import React, { useEffect } from 'react';
+import { useToast } from '@/components/ui/use-toast';
+import { ToastAction } from '@/components/ui/toast';
+import { useRouter } from 'next/router';
+
+interface EmotionSaveToastProps {
+  iconType: string;
+}
+
+function EmotionSaveToast({ iconType }: EmotionSaveToastProps) {
+  const { toast } = useToast();
+  const router = useRouter();
+
+  useEffect(() => {
+    toast({
+      title: '오늘의 감정이 저장되었습니다.',
+      description: `오늘의 감정: ${iconType}`,
+      action: (
+        <ToastAction altText='확인하기' onClick={() => router.push('/mypage')}>
+          확인하기
+        </ToastAction>
+      ),
+    });
+  }, [iconType, toast, router]);
+
+  return null;
+}
+
+export default EmotionSaveToast;

src/components/Emotion/EmotionSelector.tsx

@@ -1,19 +1,21 @@
-/*
-  여러 개의 EmotionIconCard를 관리합니다.
-  사용자 인터페이스에 필요한 상호 작용 로직을 포함합니다.
- */
-
-import React, { useState } from 'react';
-import EmotionIconCard from '@/components/Emotion/EmotionCard';
+import React, { useState, useEffect } from 'react';
 import useMediaQuery from '@/hooks/useMediaQuery';
-import { EmotionType, EmotionState } from '@/types/EmotionTypes';
+import EmotionIconCard from '@/components/Emotion/EmotionCard';
+import { EmotionType, EmotionState } from '@/types/emotion';
+import usePostEmotion from '@/hooks/usePostEmotion';
+import useGetEmotion from '@/hooks/useGetEmotion';
+import EmotionSaveToast from './EmotionSaveToast';
 
-// EmotionSelector 컴포넌트 함수 선언
+/**
+ * EmotionSelector 컴포넌트는 여러 개의 EmotionIconCard를 관리하고
+ * 사용자의 오늘의 감정을 선택하고 저장하고 출력합니다.
+ */
 function EmotionSelector() {
+  // 반응형 디자인을 위한 미디어 쿼리 훅
   const isTablet = useMediaQuery('(min-width: 768px) and (max-width: 1024px)');
   const isMobile = useMediaQuery('(max-width: 767px)');
 
-  // 감정 카드 상태 관리
+  // 감정 카드 상태 관리를 위한 useState 훅
   const [states, setStates] = useState<Record<EmotionType, EmotionState>>({
     감동: 'Default',
     기쁨: 'Default',
@@ -22,13 +24,37 @@ function EmotionSelector() {
     분노: 'Default',
   });
 
-  // 감정 카드 클릭 핸들러
-  const handleCardClick = (iconType: EmotionType) => {
+  // 현재 선택된 감정을 관리하는 useState 훅
+  const [selectedEmotion, setSelectedEmotion] = useState<EmotionType | null>(null);
+  // 오늘의 감정을 조회하기 위한 훅
+  const { data: emotion, error: getError, isLoading: isGetLoading } = useGetEmotion();
+  // 감정을 저장하기 위한 훅
+  const postEmotionMutation = usePostEmotion();
+
+  // 컴포넌트가 마운트될 때 한 번만 실행되는 useEffect 훅
+  // 오늘의 감정을 조회하고 상태를 업데이트합니다.
+  useEffect(() => {
+    if (emotion) {
+      setStates((prevStates) => ({
+        ...prevStates,
+        [emotion]: 'Clicked',
+      }));
+    }
+  }, [emotion]);
+
+  /**
+   * 감정 카드 클릭 핸들러
+   * 사용자가 감정 카드를 클릭했을 때 호출됩니다.
+   * 클릭된 감정 카드를 'Clicked' 상태로 설정하고 나머지 카드는 'Unclicked' 상태로 설정합니다.
+   * 감정을 서버에 저장합니다.
+   * @param iconType - 클릭된 감정의 타입
+   */
+  const handleCardClick = async (iconType: EmotionType) => {
     setStates((prevStates) => {
       const newStates = { ...prevStates };
 
       if (prevStates[iconType] === 'Clicked') {
-        // 현재 클릭된 카드가 다시 클릭되면 모두 Default로 설정
+        // 현재 클릭된 카드가 다시 클릭되면 모든 카드를 Default로 설정
         Object.keys(newStates).forEach((key) => {
           newStates[key as EmotionType] = 'Default';
         });
@@ -41,8 +67,20 @@ function EmotionSelector() {
 
       return newStates;
     });
+
+    // 오늘의 감정 저장
+    postEmotionMutation.mutate(iconType, {
+      onSuccess: (_, clickedIconType) => {
+        setSelectedEmotion(clickedIconType);
+      },
+      onError: (error: unknown) => {
+        // eslint-disable-next-line
+        console.error(error);
+      },
+    });
   };
 
+  // 반응형 디자인을 위한 카드 크기 설정
   let containerClass = 'w-[544px] h-[136px] gap-4';
   let cardSize: 'lg' | 'md' | 'sm' = 'lg';
 
@@ -54,12 +92,19 @@ function EmotionSelector() {
     cardSize = 'sm';
   }
 
+  if (isGetLoading) return <p>Loading...</p>;
+  if (getError) return <p>{getError.message}</p>;
+
   return (
-    <div className={`justify-start items-start inline-flex ${containerClass}`}>
-      {(['감동', '기쁨', '고민', '슬픔', '분노'] as const).map((iconType) => (
-        <EmotionIconCard key={iconType} iconType={iconType} size={cardSize} state={states[iconType]} onClick={() => handleCardClick(iconType)} />
-      ))}
-    </div>
+    <>
+      <div className={`justify-start items-start inline-flex ${containerClass}`}>
+        {(['감동', '기쁨', '고민', '슬픔', '분노'] as const).map((iconType) => (
+          <EmotionIconCard key={iconType} iconType={iconType} size={cardSize} state={states[iconType]} onClick={() => handleCardClick(iconType)} />
+        ))}
+      </div>
+      {/* 감정이 선택되었을 때 토스트 메시지 표시 */}
+      {selectedEmotion && <EmotionSaveToast iconType={selectedEmotion} />}
+    </>
   );
 }
 

src/hooks/useDeleteCommentHook.ts

@@ -0,0 +1,31 @@
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { deleteComment } from '@/apis/epigramComment';
+import { toast } from '@/components/ui/use-toast';
+
+const useDeleteCommentMutation = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (commentId: number) => deleteComment(commentId),
+    onSuccess: () => {
+      // 댓글 목록 쿼리 무효화
+      queryClient.invalidateQueries({ queryKey: ['epigramComments'] });
+
+      // 성공 메시지 표시
+      toast({
+        title: '댓글 삭제 성공',
+        description: '댓글이 성공적으로 삭제되었습니다.',
+      });
+    },
+    onError: (error) => {
+      // 에러 메시지 표시
+      toast({
+        title: '댓글 삭제 실패',
+        description: `댓글 삭제 중 오류가 발생했습니다: ${error instanceof Error ? error.message : '알 수 없는 오류'}`,
+        variant: 'destructive',
+      });
+    },
+  });
+};
+
+export default useDeleteCommentMutation;

src/hooks/useGetEmotion.ts

@@ -0,0 +1,11 @@
+import { useQuery } from '@tanstack/react-query';
+import getEmotion from '@/apis/getEmotion';
+import { EmotionType } from '@/types/emotion';
+
+const useGetEmotion = () =>
+  useQuery<EmotionType | null, Error>({
+    queryKey: ['emotion'],
+    queryFn: getEmotion,
+  });
+
+export default useGetEmotion;