Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] fix: 리뷰 작성 페이지 API 관련 오류를 수정한다. #324

Merged
merged 4 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,21 @@ import { postReviewApi } from '@/apis/review';
import { REVIEW_QUERY_KEYS } from '@/constants';
import { ReviewWritingFormResult } from '@/types';

interface UseMutateReviewProps {
openErrorModal: (message: string) => void;
}

const useMutateReview = ({ openErrorModal }: UseMutateReviewProps) => {
const useMutateReview = () => {
const queryClient = useQueryClient();

const reviewMutation = useMutation({
mutationFn: (formResult: ReviewWritingFormResult) => postReviewApi(formResult),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: [REVIEW_QUERY_KEYS.postReview] });
},
onError: () => {
openErrorModal('리뷰 제출에 실패했어요');
},
});

const postReview = (formResult: ReviewWritingFormResult) => {
reviewMutation.mutate(formResult);
};

return { reviewMutation, postReview };
return { ...reviewMutation, postReview };
};

export default useMutateReview;
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import useMutateReview from '.';

describe('리뷰 생성 요청 테스트', () => {
test('성공적으로 리뷰를 생성한다.', async () => {
const { result } = renderHook(() => useMutateReview({ openErrorModal: () => {} }), { wrapper: QueryClientWrapper });
const { result } = renderHook(() => useMutateReview(), { wrapper: QueryClientWrapper });

act(() => {
result.current.postReview(REVIEW_FORM_RESULT_DATA);
});

await waitFor(() => result.current.reviewMutation.isSuccess);
await waitFor(() => result.current.isSuccess);

expect(result.current.reviewMutation.isSuccess).toBe(true);
expect(result.current.isSuccess).toBe(true);
});
});
27 changes: 14 additions & 13 deletions frontend/src/hooks/review/writingCardForm/useQuestionList.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
import { useEffect, useState } from 'react';

import { REVIEW_WRITING_FORM_CARD_DATA } from '@/mocks/mockData';
import { ReviewWritingCardSection } from '@/types';

const useQuestionList = () => {
const questionListSectionsData = REVIEW_WRITING_FORM_CARD_DATA.sections;
interface UseQuestionListProps {
questionListSectionsData: ReviewWritingCardSection[];
}

const useQuestionList = ({ questionListSectionsData }: UseQuestionListProps) => {
const [questionList, setQuestionList] = useState<ReviewWritingCardSection[] | null>(null);
const [selectedCategory, setSelectedCategory] = useState<number[] | null>(null);
// TODO: react-query로 서버에서 질문 목록 다 받아오기

const updatedSelectedCategory = (newSelectedCategory: number[]) => {
setSelectedCategory(newSelectedCategory);
};

const updateQuestionList = () => {
setQuestionList(
questionListSectionsData.filter((data) => {
// 공통 질문 추출
if (data.visible === 'ALWAYS') return true;
// 선택된 카테고리 답변과 data.onSelectedOptionId를 비교
if (!data.onSelectedOptionId) return false;
return !!selectedCategory?.includes(data.onSelectedOptionId);
}),
);
const newQuestionList = questionListSectionsData.filter((data) => {
// 공통 질문 추출
if (data.visible === 'ALWAYS') return true;
// 선택된 카테고리 답변과 data.onSelectedOptionId를 비교
if (!data.onSelectedOptionId) return false;
return !!selectedCategory?.includes(data.onSelectedOptionId);
});
setQuestionList(newQuestionList);
};

useEffect(() => {
updateQuestionList();
}, [selectedCategory]);
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading