Skip to content
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
23 changes: 22 additions & 1 deletion src/apis/reviews/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
ReviewReplyCreateRequest,
} from './model';

export const getReveiewLists = async ({
export const getReviewLists = async ({
marketId,
cursorId,
size,
Expand All @@ -26,6 +26,27 @@ export const getReveiewLists = async ({
return null;
}
};
export const getUnRepliedReviewLists = async ({
marketId,
cursorId,
size,
}: ReviewListsRequest): Promise<ReviewListsResponse | null> => {
try {
const res = await apiClient.get<ReviewListsResponse | null>(
`/owner/review/market/${marketId}/no-reply`,
{
params: {
cursorId,
size,
},
},
);
return res;
} catch (error) {
console.error('리뷰 페치 에러', error);
return null;
}
};

export const postReviewReply = async ({
reviewId,
Expand Down
28 changes: 24 additions & 4 deletions src/apis/reviews/query.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,33 @@
import {useInfiniteQuery, useMutation} from '@tanstack/react-query';
import {getReveiewLists, postReviewReply} from './client';
import {
getReviewLists,
postReviewReply,
getUnRepliedReviewLists,
} from './client';
import {ReviewReplyCreateRequest} from './model';

export const useReviewList = (marketId: number, enabled: boolean) => {
return useInfiniteQuery({
queryKey: ['marketList', marketId],
queryKey: ['marketList', 'review', 'every', marketId],
queryFn: ({pageParam = 0}) =>
// FIXME: 페이징 단위 size
getReveiewLists({cursorId: pageParam, size: 5, marketId}),
// TODO: 페이징 단위 size
getReviewLists({cursorId: pageParam, size: 5, marketId}),
initialPageParam: 0,
getNextPageParam: lastPage => {
return lastPage?.hasNext
? lastPage.reviews[lastPage.reviews.length - 1].id
: undefined;
},
enabled: enabled,
});
};

export const useUnRepliedReviewList = (marketId: number, enabled: boolean) => {
return useInfiniteQuery({
queryKey: ['marketList', 'review', 'no-reply', marketId],
queryFn: ({pageParam = 0}) =>
// TODO: 페이징 단위 size
getUnRepliedReviewLists({cursorId: pageParam, size: 5, marketId}),
initialPageParam: 0,
getNextPageParam: lastPage => {
return lastPage?.hasNext
Expand Down
12 changes: 12 additions & 0 deletions src/components/review/ReviewContainerLists.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import S from './ReviewContainerLists.style';
import {FlatList} from 'react-native';
import {ActivityIndicator} from 'react-native-paper';
import ReviewContainer from './ReviewContainer';
import {useQueryClient} from '@tanstack/react-query';
import usePullDownRefresh from '@/hooks/usePullDownRefresh';

type ReviewContainerListsProps = {
reviews: ReviewType[];
Expand All @@ -18,12 +20,22 @@ const ReviewContainerLists = ({
isFetchingNextPage,
fetchNextPage,
}: ReviewContainerListsProps) => {
const queryClient = useQueryClient();

const {onRefresh, refreshing} = usePullDownRefresh(async () => {
await queryClient.invalidateQueries({
queryKey: ['marketList', 'review'],
Comment on lines +25 to +27
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

무효화할때마다 쿼리키가 무엇인지 api 쿼리를 확인해야되서 약간 불편할 수도 있겠다는 생각이 드네요..

필요하다면 유틸로 묶어서 queryclient를 키를 받고, 쿼리키는 타입추론이 될수있도록 나중에 해보죠

Copy link
Contributor Author

@l-lyun l-lyun Aug 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저도 해당 부분 쿼리키 훅 만지면서 고민했는데, 프로젝트 사이즈가 더 커지면 형님 말씀해주신 코드 내에서 방법이나,

쿼리키에 대해 문서화를 확실히 해야겠다는 생각이 들었습니다. 코드적으로 어떻게 풀 수 있지?
하고 넘어갔는데 조언 감사합니다~!

});
});

return (
<S.Container>
<FlatList
data={reviews}
keyExtractor={item => item.id.toString()}
renderItem={({item}) => <ReviewContainer item={item} />}
refreshing={refreshing}
onRefresh={onRefresh}
onEndReached={() => {
if (hasNextPage && !isFetchingNextPage) {
fetchNextPage();
Expand Down
5 changes: 5 additions & 0 deletions src/screens/ReviewReplyScreen/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {ActivityIndicator} from 'react-native-paper';
import {useNavigation} from '@react-navigation/native';
import {Keyboard, TouchableWithoutFeedback, Platform} from 'react-native';
import TextInput from '@/components/common/TextInput/TextInput';
import {useQueryClient} from '@tanstack/react-query';

type ReviewReplyScreenProps = StackScreenProps<
ReviewStackParamList,
Expand All @@ -19,6 +20,7 @@ const ReviewReplyScreen = ({route}: ReviewReplyScreenProps) => {

const {mutate: createReviewReply, isPending} = useCreateReviewReply();
const navigation = useNavigation();
const queryClient = useQueryClient();

const handleReplySubmit = () => {
if (!replyContent.trim()) return;
Expand All @@ -28,6 +30,9 @@ const ReviewReplyScreen = ({route}: ReviewReplyScreenProps) => {
onSuccess: () => {
setReplyContent('');
navigation.goBack();
queryClient.invalidateQueries({
queryKey: ['marketList', 'review'],
});
},
},
);
Expand Down
21 changes: 21 additions & 0 deletions src/screens/ReviewScreen/ReviewScreen.style.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
import styled from '@emotion/native';
import {ToggleButton, ToggleButtonGroup} from '@/components/common';

const S = {
Container: styled.View`
flex: 1;
background-color: white;
`,

EmptyWrapper: styled.View`
flex: 1;
align-items: center;
`,

ToggleText: styled.Text`
color: ${props => props.theme.colors.tertiary};
`,

NavbarGroup: styled(ToggleButtonGroup)`
display: flex;
flex-direction: row;
justify-content: space-between;
margin: 10px;
`,

ToggleButton: styled(ToggleButton)`
width: 100%;
`,
};

export default S;
91 changes: 70 additions & 21 deletions src/screens/ReviewScreen/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// ReviewScreen.tsx
import React from 'react';
import React, {useState} from 'react';
import {ActivityIndicator, Text} from 'react-native';
import S from './ReviewScreen.style';
import {useReviewList} from '@/apis/reviews';
import {useReviewList, useUnRepliedReviewList} from '@/apis/reviews';
import useProfile from '@/hooks/useProfile';
import ReviewContainerLists from '@/components/review/ReviewContainerLists';
import NonRegister from '@/components/common/NonRegister';
Expand All @@ -12,16 +11,32 @@ import useMarket from '@/hooks/useMarket';
const ReviewScreen = () => {
const {profile} = useProfile();
const {marketInfo} = useMarket();
const [selected, setSelected] = useState<'every' | 'no-reply'>('no-reply');
const marketId = profile?.marketId;

const {
data: reviewLists,
hasNextPage,
fetchNextPage,
isFetchingNextPage,
status,
// error,
} = useReviewList(marketId!, Boolean(marketId));
data: allPages,
hasNextPage: hasNextAll,
fetchNextPage: fetchNextAll,
isFetchingNextPage: isFetchingNextAll,
status: statusAll,
} = useReviewList(marketId!, !!marketId);

const {
data: unrepliedPages,
hasNextPage: hasNextUn,
fetchNextPage: fetchNextUn,
isFetchingNextPage: isFetchingNextUn,
status: statusUn,
} = useUnRepliedReviewList(marketId!, !!marketId);

const isPending =
(selected === 'every' && statusAll === 'pending') ||
(selected === 'no-reply' && statusUn === 'pending');

const isError =
(selected === 'every' && statusAll === 'error') ||
(selected === 'no-reply' && statusUn === 'error');

if (!profile) {
return <NonRegister />;
Expand All @@ -31,7 +46,7 @@ const ReviewScreen = () => {
return <EmptyMarket />;
}

if (status === 'pending') {
if (isPending) {
return (
<S.Container>
<ActivityIndicator />
Expand All @@ -40,34 +55,68 @@ const ReviewScreen = () => {
}

// TODO: error 로직 개선
if (status === 'error') {
if (isError) {
return (
<S.Container>
<Text>Error</Text>
</S.Container>
);
}

const reviews =
reviewLists?.pages.flatMap(page => (page ? page.reviews : [])) || [];
const allReviews = allPages?.pages.flatMap(p => (p ? p.reviews : [])) ?? [];

if (reviews.length === 0 || !reviews) {
const unrepliedReviews =
unrepliedPages?.pages.flatMap(p => (p ? p.reviews : [])) ?? [];

const currentReviews = selected === 'every' ? allReviews : unrepliedReviews;
const currentHasNext = selected === 'every' ? hasNextAll : hasNextUn;
const currentFetchNext = selected === 'every' ? fetchNextAll : fetchNextUn;
const currentIsFetchingNext =
selected === 'every' ? isFetchingNextAll : isFetchingNextUn;

if (!currentReviews || currentReviews.length === 0) {
return (
<S.Container>
<Text>등록된 리뷰가 없어요!</Text>
<S.NavbarGroup selected={selected}>
<S.ToggleButton
value="no-reply"
onPress={() => setSelected('no-reply')}>
<S.ToggleText>댓글을 달지 않은 리뷰</S.ToggleText>
</S.ToggleButton>
<S.ToggleButton value="every" onPress={() => setSelected('every')}>
<S.ToggleText>전체 리뷰</S.ToggleText>
</S.ToggleButton>
</S.NavbarGroup>
<S.EmptyWrapper>
<Text>
{selected === 'every'
? '등록된 리뷰가 없어요!'
: '미답변 리뷰가 없어요!'}
</Text>
</S.EmptyWrapper>
</S.Container>
);
}

return (
<S.Container>
<S.NavbarGroup selected={selected}>
<S.ToggleButton
value="no-reply"
onPress={() => setSelected('no-reply')}>
<S.ToggleText>댓글을 달지 않은 리뷰</S.ToggleText>
</S.ToggleButton>
<S.ToggleButton value="every" onPress={() => setSelected('every')}>
<S.ToggleText>전체 리뷰</S.ToggleText>
</S.ToggleButton>
</S.NavbarGroup>
<ReviewContainerLists
reviews={reviews}
hasNextPage={hasNextPage}
fetchNextPage={fetchNextPage}
isFetchingNextPage={isFetchingNextPage}
reviews={currentReviews}
hasNextPage={currentHasNext}
fetchNextPage={currentFetchNext}
isFetchingNextPage={currentIsFetchingNext}
/>
</S.Container>
);
};

export default ReviewScreen;