[chore] 충돌사항 수정

Author: mtm-git1018

src/domains/recipe/api/fetchRecipe.ts

@@ -4,7 +4,6 @@ import { useInfiniteQuery, useQuery, useQueryClient } from '@tanstack/react-quer
 import { Cocktail, Sort } from '../types/types';
 import { useEffect, useRef } from 'react';
 
-
 interface CocktailResponse {
   data: Cocktail[];
 }
@@ -43,9 +42,9 @@ const fetchKeep = async (): Promise<Set<number>> => {
 };
 
 const fetchRecipe = async (
-  pageParam:PageParam|null,
+  pageParam: PageParam | null,
   size: number,
-  sortBy?: Sort,
+  sortBy?: Sort
 ): Promise<Cocktail[]> => {
   const url = new URL(`${getApi}/cocktails`);
   url.searchParams.set('size', String(size));
@@ -137,7 +136,6 @@ export const useCocktailsInfiniteQuery = (size: number = 20, sortBy?: Sort) => {
       const lastItem = lastPage[lastPage.length - 1];
       if (!lastItem) return undefined;
 
-
       let lastValue: number | string;
 
       switch (sortBy) {
@@ -207,17 +205,17 @@ export const useCocktails = (
   }
 
   const allCocktails = infiniteQuery.data?.pages.flatMap((page) => page) ?? [];
- const uniqueCocktails = allCocktails.filter(
-   (cocktail, index, self) => index === self.findIndex((c) => c.cocktailId === cocktail.cocktailId)
- );
-  
-    const hasDuplicates = allCocktails.length !== uniqueCocktails.length;
+  const uniqueCocktails = allCocktails.filter(
+    (cocktail, index, self) => index === self.findIndex((c) => c.cocktailId === cocktail.cocktailId)
+  );
+
+  const hasDuplicates = allCocktails.length !== uniqueCocktails.length;
   return {
     data: uniqueCocktails,
     noResults: false,
     isSearchMode: false,
     fetchNextPage: infiniteQuery.fetchNextPage,
-    hasNextPage: hasDuplicates ? false: infiniteQuery.hasNextPage,
+    hasNextPage: hasDuplicates ? false : infiniteQuery.hasNextPage,
     isFetchingNextPage: infiniteQuery.isFetchingNextPage,
   };
 };

src/domains/recipe/api/useRecipeComment.ts

@@ -5,8 +5,7 @@ import { useToast } from '@/shared/hook/useToast';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 
 interface Comment {
-
-  userNickName: string
+  userNickName: string;
 }
 
 export const postRecipeComment = async (cocktailId: number, content: string) => {
@@ -23,8 +22,7 @@ export const postRecipeComment = async (cocktailId: number, content: string) =>
     body: JSON.stringify(body),
   });
 
-
-    if (res.status === 401) throw new Error('unauth')
+  if (res.status === 401) throw new Error('unauth');
 
   const text = await res.text();
   const data = JSON.parse(text);
@@ -80,15 +78,15 @@ export function useRecipeComment({ cocktailId }: { cocktailId: number }) {
     queryFn: () => getRecipeComment(cocktailId),
     staleTime: 30_000,
   });
- 
-  const hasComment = comments.some((c:Comment) => c.userNickName === user?.nickname);
+
+  const hasComment = comments.some((c: Comment) => c.userNickName === user?.nickname);
   const createMut = useMutation({
     mutationFn: (content: string) => {
       if (!user?.id) {
         toastInfo('로그인 후 이용 가능합니다.');
-        return Promise.resolve(null)
+        return Promise.resolve(null);
       } else if (hasComment) {
-        toastInfo('댓글은 한 개만 작성 가능합니다.')
+        toastInfo('댓글은 한 개만 작성 가능합니다.');
       }
       return postRecipeComment(cocktailId, content);
     },

src/domains/recipe/components/main/Cocktails.tsx

@@ -13,17 +13,15 @@ import { Sort } from '../../types/types';
 
 function Cocktails() {
   const searchParams = useSearchParams();
-  const sortByParam = searchParams.get('sortBy') || 'recent'
+  const sortByParam = searchParams.get('sortBy') || 'recent';
   const [keyword, setKeyword] = useState('');
   const [input, setInput] = useState('');
 
-  const [sortBy,setSortBy] = useState<Sort>(sortByParam as Sort)
+  const [sortBy, setSortBy] = useState<Sort>(sortByParam as Sort);
   const [alcoholStrengths, setAlcoholStrengths] = useState<string[]>([]);
   const [alcoholBaseTypes, setAlcoholBaseTypes] = useState<string[]>([]);
   const [cocktailTypes, setCocktailTypes] = useState<string[]>([]);
 
-
-
   const { data, fetchNextPage, hasNextPage, noResults, isSearchMode } = useCocktails(
     {
       keyword,
@@ -45,17 +43,16 @@ function Cocktails() {
     }
   }, [inView, hasNextPage, fetchNextPage]);
 
-    useEffect(() => {
-      setSortBy(sortByParam as Sort);
-    }, [sortByParam]);
+  useEffect(() => {
+    setSortBy(sortByParam as Sort);
+  }, [sortByParam]);
 
   const debounceKeyword = useMemo(() => debounce((v: string) => setKeyword(v), 300), []);
   const handleSearch = (v: string) => {
     setInput(v);
     debounceKeyword(v);
   };
 
-
   return (
     <section>
       <div className="flex flex-col-reverse items-start gap-6 md:flex-row md:justify-between md:items-center ">
@@ -67,7 +64,7 @@ function Cocktails() {
         <CocktailSearchBar keyword={input} onChange={handleSearch} />
       </div>
 
-      <CocktailFilter cocktailsEA={data.length}  />
+      <CocktailFilter cocktailsEA={data.length} />
 
       <section className="mt-5">
         {noResults ? <div>검색 결과가 없습니다.</div> : <CocktailList cocktails={data} />}

src/domains/recipe/types/types.ts

@@ -6,7 +6,7 @@ export interface Cocktail {
   cocktailNameKo: string;
   isKeep: boolean;
   keepCount?: number;
-  commentCount?: number; 
+  commentCount?: number;
 }
 
 export interface RecommendCocktail {