feat : 편지작성, 랜덤편지 구현 90% 완료, 편지상세는 이후에 테스트

src/apis/client.ts

@@ -34,7 +34,6 @@ const processQueue = (error: unknown, token: string | null = null) => {
 client.interceptors.request.use(
   (config) => {
     const accessToken = useAuthStore.getState().accessToken;
-
     if (config.url !== '/auth/reissue' && accessToken) {
       config.headers.Authorization = `Bearer ${accessToken}`;
     }

src/apis/letterDetail.ts

@@ -1,28 +1,23 @@
 import client from './client';
 
-const getLetter = async (
-  letterId: string,
-  setLetterState: React.Dispatch<React.SetStateAction<LetterDetail | null>>,
-  callBack?: () => void,
-) => {
+const getLetter = async (letterId: string) => {
   try {
     const res = await client.get(`/api/letters/${letterId}`);
     if (!res) throw new Error('편지 데이터를 가져오는 도중 에러가 발생했습니다.');
-    setLetterState(res.data.data);
-    if (callBack) callBack();
     console.log(res);
+    return res;
   } catch (error) {
     console.error(error);
   }
 };
 
-const deleteLetter = async (letterId: string, callBack?: () => void) => {
+const deleteLetter = async (letterId: string) => {
   try {
     console.log(`/api/letters/${letterId}`);
     const res = await client.delete(`/api/letters/${letterId}`);
     if (!res) throw new Error('편지 삭제 요청 도중 에러가 발생했습니다.');
-    if (callBack) callBack();
     console.log(res);
+    return res;
   } catch (error) {
     console.error(error);
   }

src/apis/randomLetter.ts

@@ -1,17 +1,70 @@
 import client from './client';
 
-const getRandomLetters = async (
-  setRandomLettersState: React.Dispatch<React.SetStateAction<RandomLetters[]>>,
-  category: string | null,
-) => {
+const getRandomLetters = async (category: string | null) => {
   try {
-    const res = await client.get(`/api/random/${category}`);
+    const res = await client.get(`/api/random-letters/${category}`);
     if (!res) throw new Error('랜덤 편지 데이터를 가져오는 도중 에러가 발생했습니다.');
-    setRandomLettersState(res.data.data);
     console.log(res);
+    return res;
   } catch (error) {
     console.error(error);
   }
 };
 
-export { getRandomLetters };
+const postRandomLettersApprove = async (approveRequest: ApproveRequest, callBack?: () => void) => {
+  try {
+    console.log('엔드포인트 : /api/random-letters/approve');
+    console.log('request', approveRequest);
+    const res = await client.post('/api/random-letters/approve', approveRequest);
+    if (!res) throw new Error('랜덤편지 매칭수락 도중 에러가 발생했습니다.');
+    if (callBack) callBack();
+    return res;
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const getRandomLetterMatched = async (callBack?: () => void) => {
+  try {
+    const res = await client.post('/api/random-letters/valid-table');
+    if (!res)
+      throw new Error('랜덤 편지 최종 매칭 시간 검증 데이터를 가자오는 도중 에러가 발생했습니다.');
+    if (callBack) callBack();
+    console.log(res);
+    return res;
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const getRandomLetterCoolTime = async (callBack?: () => void) => {
+  try {
+    const res = await client.post('/api/random-letters/valid');
+    if (!res)
+      throw new Error('랜덤 편지 최종 매칭 시간 검증 데이터를 가자오는 도중 에러가 발생했습니다.');
+    if (callBack) callBack();
+    console.log(res);
+    return res;
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const deleteRandomLetterMatching = async () => {
+  try {
+    const res = await client.delete('/api/random-letters/matching/cancel');
+    if (!res) throw new Error('매칭 취소 도중 에러가 발생했습니다.');
+    console.log(res);
+    return res;
+  } catch (error) {
+    console.log(error);
+  }
+};
+
+export {
+  getRandomLetters,
+  postRandomLettersApprove,
+  getRandomLetterCoolTime,
+  getRandomLetterMatched,
+  deleteRandomLetterMatching,
+};

src/apis/write.ts

@@ -1,28 +1,37 @@
+// import { AxiosResponse } from 'axios';
 import client from './client';
 
-const postLetter = async (data: LetterRequest, callBack?: () => void) => {
+const postLetter = async (data: LetterRequest) => {
   try {
     const res = await client.post('/api/letters', data);
-    if (callBack) callBack();
+    if (!res) throw new Error('편지 전송과정중에서 오류가 발생했습니다.');
+    console.log(`api 주소 : /api/letters, 전송타입 : post`);
+    return res;
+  } catch (error) {
+    console.error(error);
+  }
+};
+
+const postFirstReply = async (data: FirstReplyRequest) => {
+  try {
+    const res = await client.post('/api/random-letters/matching', data);
+    if (!res) throw new Error('최초 답장 전송과정중에서 오류가 발생했습니다.');
+    console.log(`api 주소 : /api/random-letters/matching, 전송타입 : post`);
     console.log(res);
+    return res;
   } catch (error) {
     console.error(error);
   }
 };
 
-const getPrevLetter = async (
-  letterId: string,
-  setPrevLetterState: React.Dispatch<React.SetStateAction<PrevLetter[]>>,
-  callBack?: () => void,
-) => {
+const getPrevLetter = async (letterId: string) => {
   try {
     const res = await client.get(`/api/letters/${letterId}/previous`);
-    setPrevLetterState(res.data.data);
-    if (callBack) callBack();
     console.log(res);
+    return res;
   } catch (error) {
     console.error(error);
   }
 };
 
-export { postLetter, getPrevLetter };
+export { postLetter, postFirstReply, getPrevLetter };

src/components/ResultLetter.tsx

@@ -9,13 +9,13 @@ export default function ResultLetter({
 }: {
   categoryName: Category;
   title: string;
-  zipCode?: string;
+  zipCode: string;
 }) {
   const date = new Date();
   const today = `${date.getFullYear()}년 ${date.getMonth() + 1}월 ${date.getDate()}일`;
 
   return (
-    <LetterWrapper>
+    <LetterWrapper className="min-w-[300px]">
       <div className="flex w-full flex-col gap-[35px]">
         <div className="flex justify-between gap-3">
           <div className="flex flex-col gap-2.5">

src/layouts/Header.tsx

@@ -1,13 +1,16 @@
-import { Link } from 'react-router';
+import { Link, useNavigate } from 'react-router';
 
 import { AlarmIcon, ArrowLeftIcon, PersonIcon } from '@/assets/icons';
 
 const Header = () => {
   // TODO: 뒤로 가기 버튼이 보이는 조건 추가
   // TODO: 스크롤 발생 시, 어떻게 보여져야 하는지
+  const navigate = useNavigate();
   return (
     <header className="fixed top-0 z-40 flex h-16 w-full max-w-150 items-center justify-between p-5">
-      <ArrowLeftIcon className="h-6 w-6 text-white" />
+      <button onClick={() => navigate(-1)}>
+        <ArrowLeftIcon className="h-6 w-6 text-white" />
+      </button>
       <div className="flex items-center gap-3">
         <Link to="/mypage/notifications">
           <AlarmIcon className="h-6 w-6 text-white" />

src/pages/LetterDetail/index.tsx

@@ -39,16 +39,38 @@ const LetterDetailPage = () => {
     }
     setDegreeModalOpen(false);
   };
+
+  const handleDeleteLetter = async (letterId: string) => {
+    const res = await deleteLetter(letterId);
+    if (res?.status === 200) {
+      navigate(-1);
+    } else {
+      alert('편지 삭제 도중 오류 발생(임시)');
+    }
+  };
+
   useEffect(() => {
     document.body.addEventListener('click', handleOutsideClick);
+
+    const handleGetLetter = async (letterId: string) => {
+      const res = await getLetter(letterId);
+      if (res?.status === 200) {
+        setLetterDetail(res.data.data);
+      } else {
+        alert(
+          '에러가 발생했거나 존재하지 않거나 따숨님의 편지가 아니에요(임시) - 이거 에러코드 따른 처리 달리해야할듯',
+        );
+        navigate(-1);
+      }
+    };
     if (params.id) {
-      getLetter(params.id, setLetterDetail);
+      handleGetLetter(params.id);
     }
 
     return () => {
       document.body.removeEventListener('click', handleOutsideClick);
     };
-  }, [params.id]);
+  }, [params.id, navigate]);
   return (
     <>
       {reportModalOpen && <ReportModal onClose={() => setReportModalOpen(false)} />}
@@ -137,7 +159,7 @@ const LetterDetailPage = () => {
               setDeleteModalOpen(false);
             }}
             onConfirm={() => {
-              if (params.id) deleteLetter(params.id);
+              if (params.id) handleDeleteLetter(params.id);
               navigate(-1);
             }}
           />

src/pages/RandomLetters/components/CoolTime.tsx

@@ -3,17 +3,22 @@ import { useNavigate } from 'react-router';
 
 import LetterWrapper from '@/components/LetterWrapper';
 import { formatNumber } from '@/utils/formatNumber';
+import { timeFormatter } from '@/utils/timeFormatter';
 
 // import letterPink from '@/assets/images/letter-pink.png';
 
 export default function CoolTime({
-  setCoolTime,
+  setIsCoolTime,
+  coolTime,
 }: {
-  setCoolTime: React.Dispatch<React.SetStateAction<boolean>>;
+  setIsCoolTime: React.Dispatch<React.SetStateAction<boolean>>;
+  coolTime: CoolTime;
 }) {
   const navigate = useNavigate();
 
-  const TIME_STAMP = '2025-02-26T22:13:25.262045608';
+  const TIME_STAMP = coolTime?.lastMatchedAt
+    ? coolTime.lastMatchedAt
+    : '2025-03-01T21:15:25.262045608';
 
   const COMPLETED_DATE = new Date(TIME_STAMP);
 
@@ -24,56 +29,36 @@ export default function CoolTime({
 
   const endTime = END_DATE.getTime() - NOW_DATE.getTime();
 
-  const [endTimes, setEndTimes] = useState({
-    hours: Math.floor((endTime / (1000 * 60 * 60)) % 24),
-    minutes: Math.floor((endTime / (1000 * 60)) % 60),
-    seconds: Math.floor((endTime / 1000) % 60),
-  });
+  const [endTimeSeconds, setEndTimeSeconds] = useState(endTime / 1000);
+
+  const formatedEndTime = timeFormatter(endTimeSeconds);
 
   useEffect(() => {
-    if (endTimes.hours < 0 || endTimes.minutes < 0 || endTimes.seconds < 0) {
-      setEndTimes({ hours: 0, minutes: 0, seconds: 0 });
-    }
-    if (endTimes.hours === 0 && endTimes.minutes === 0 && endTimes.seconds === 0) {
-      setCoolTime(false);
-      return;
-    }
-    const endTimeFlow = setInterval(() => {
-      setEndTimes((currentTime) => {
-        if (currentTime.seconds > 0) {
-          return { ...currentTime, seconds: currentTime.seconds - 1 };
-        } //
-        else {
-          if (currentTime.minutes > 0) {
-            return { ...currentTime, minutes: currentTime.minutes - 1, seconds: 59 };
-          } //
-          else {
-            if (currentTime.hours > 0) {
-              return { hours: currentTime.hours - 1, minutes: 59, seconds: 59 };
-            } //
-            else {
-              setCoolTime(false);
-              return { ...currentTime };
-            }
-          }
-        }
-      });
-      if (endTimes.hours === 0 && endTimes.minutes === 0 && endTimes.seconds === 0) {
-        clearInterval(endTimeFlow);
+    const endTargetTime = Date.now() + endTime;
+
+    const count = setInterval(() => {
+      const now = Date.now();
+      const newEndTimeSeconds = Math.max(0, Math.floor((endTargetTime - now) / 1000));
+
+      if (endTimeSeconds <= 0) {
+        setIsCoolTime(false);
       }
+
+      setEndTimeSeconds(newEndTimeSeconds);
     }, 1000);
 
     return () => {
-      clearInterval(endTimeFlow);
+      clearInterval(count);
     };
-  }, [endTimes, setCoolTime]);
+  });
+
   return (
     <div className="mt-20 flex flex-col items-center justify-center">
       <div className="body-m flex flex-col items-center justify-center">
         <p className="text-gray-60">랜덤 편지 활성화 까지</p>
         <p className="text-gray-80">
-          {formatNumber(endTimes.hours)} : {formatNumber(endTimes.minutes)} :{' '}
-          {formatNumber(endTimes.seconds)}
+          {formatNumber(formatedEndTime.hours)} : {formatNumber(formatedEndTime.minutes)} :{' '}
+          {formatNumber(formatedEndTime.seconds)}
         </p>
         <div className="mt-2 w-75">
           <LetterWrapper>