Merge pull request #115 from CHZZK-Study/dev

Dev to Main Merge: 카테고리, SSE 수정
JECT-Study · Oct 5, 2024 · bf6bf47 · bf6bf47
2 parents c51cf00 + f8c7d51
commit bf6bf47
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 30 deletions.
diff --git a/src/hooks/useSSE.ts b/src/hooks/useSSE.ts
@@ -9,14 +9,15 @@ import { useNavigate } from 'react-router-dom';
 
 export const useSSE = <T>(url: string) => {
   const [state, setState] = useState<T[]>([]);
+  const navigate = useNavigate();
+  const isLogin = useSelector(isLoggedIn);
+
   const EventSource = EventSourcePolyfill || NativeEventSource;
   const eventSource = useRef<null | EventSource>(null);
-  const accessToken = getToken();
-  const isLogin = useSelector(isLoggedIn);
-  const navigate = useNavigate();
 
   useEffect(() => {
     const fetchSSE = () => {
+      const accessToken = getToken();
       eventSource.current = new EventSource(`${import.meta.env.VITE_API_URL}${url}`, {
         headers: {
           Authorization: `Bearer ${accessToken}`,
@@ -29,7 +30,7 @@ export const useSSE = <T>(url: string) => {
         try {
           await refreshToken();
           eventSource.current?.close();
-          setTimeout(fetchSSE, 3000);
+          setTimeout(fetchSSE, 1000);
         } catch (error) {
           await logout();
           navigate('/login');

diff --git a/src/pages/Register.tsx b/src/pages/Register.tsx
@@ -17,7 +17,7 @@ import { CATEGORIES } from '@/constants/categories';
 import { convertCurrencyToNumber } from '@/utils/convertCurrencyToNumber';
 import { useEditableNumberInput } from '@/hooks/useEditableNumberInput';
 import { usePatchPreAuction, usePostRegister } from '@/components/register/quries';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { z } from 'zod';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useGetPreAuctionDetails } from '@/components/details/queries';
@@ -28,7 +28,7 @@ type FormFields = z.infer<typeof RegisterSchema>;
 const defaultValues: FormFields = {
   productName: '',
   images: [],
-  category: '카테고리를 선택하세요.',
+  category: '',
   description: '',
   minPrice: '',
 };
@@ -37,22 +37,11 @@ const Register = () => {
   const preAuctionId = useLoaderData() as number;
   const { preAuctionDetails } = useGetPreAuctionDetails(preAuctionId);
   const { mutate: patchPreAuction } = usePatchPreAuction();
-
-  if (preAuctionDetails) {
-    const { productName, imageUrls, category, description, minPrice } = preAuctionDetails;
-    defaultValues.productName = productName;
-    defaultValues.images = imageUrls;
-    defaultValues.description = description;
-    defaultValues.minPrice = formatCurrencyWithWon(minPrice);
-    defaultValues.category = CATEGORIES[category].value;
-  }
-
   const navigate = useNavigate();
   const [caution, setCaution] = useState<string>('');
   const [check, setCheck] = useState<boolean>(false);
   const [files, setFiles] = useState<File[]>([]);
   const { mutate: register } = usePostRegister();
-
   const {
     control,
     handleSubmit,
@@ -63,51 +52,55 @@ const Register = () => {
     defaultValues,
     resolver: zodResolver(RegisterSchema),
   });
-
   const { isEditing, handleBlur, handleFocus } = useEditableNumberInput({
     name: 'minPrice',
     setValue,
     getValues,
   });
 
-  const title = caution === '' ? `${preAuctionId ? '사전 경매 수정하기' : '경매 등록하기'}` : `주의사항`;
-  const cautionButton = caution === 'REGISTER' ? '바로 등록하기' : '사전 등록하기';
-  const finalButton = isSubmitting ? '등록 중...' : cautionButton;
+  const title = caution ? '주의사항' : preAuctionId ? '사전 경매 수정하기' : '경매 등록하기';
+  const finalButton = isSubmitting ? '등록 중...' : caution === 'REGISTER' ? '바로 등록하기' : '사전 등록하기';
 
   const toggleCheckBox = () => setCheck((state) => !state);
   const clickBack = () => (caution === '' ? navigate(-1) : setCaution(''));
   const handleProceed = (proceedType: 'PRE_REGISTER' | 'REGISTER') => {
-    handleSubmit(() => {
-      // 유효성 검사가 통과되면 실행.
-      setCaution(proceedType);
-    })();
+    handleSubmit(() => setCaution(proceedType))();
   };
 
   const onSubmit: SubmitHandler<FormFields> = async (data) => {
     const { productName, category, description, minPrice } = data;
     const formData = new FormData();
 
-    let submitData: IRegister = {
+    const submitData: IRegister = {
       productName,
       category,
       description,
       minPrice: convertCurrencyToNumber(minPrice),
+      ...(preAuctionId ? {} : { auctionRegisterType: caution }),
     };
-    if (!preAuctionId) submitData.auctionRegisterType = caution;
 
     formData.append(
       'request',
       new Blob([JSON.stringify(submitData)], {
         type: 'application/json',
       })
     );
-
     files.forEach((file) => formData.append('images', file));
 
-    if (preAuctionId) patchPreAuction({ preAuctionId, formData });
-    else register(formData);
+    preAuctionId ? patchPreAuction({ preAuctionId, formData }) : register(formData);
   };
 
+  useEffect(() => {
+    if (preAuctionDetails) {
+      const { productName, imageUrls, category, description, minPrice } = preAuctionDetails;
+      setValue('productName', productName);
+      setValue('images', imageUrls);
+      setValue('description', description);
+      setValue('minPrice', formatCurrencyWithWon(minPrice));
+      setValue('category', CATEGORIES[category].code); // 카테고리 기본 값 설정
+    }
+  }, [preAuctionDetails, setValue]);
+
   return (
     <Layout>
       <Layout.Header title={title} handleBack={clickBack} />