diff --git a/src/@types/travel.ts b/src/@types/travel.ts index 82cb6404..7ffc704a 100644 --- a/src/@types/travel.ts +++ b/src/@types/travel.ts @@ -49,7 +49,7 @@ export interface TravelDetail { travelPlan: TravelPlan[]; participant: Participant[]; participationFlag: boolean | null; - isBookmark: boolean | null; + bookmarkFlag: boolean | null; } export interface TravelReviewRateScore { diff --git a/src/components/travel/detail/TravelDetail.tsx b/src/components/travel/detail/TravelDetail.tsx index 8bd299b4..910e1ad6 100644 --- a/src/components/travel/detail/TravelDetail.tsx +++ b/src/components/travel/detail/TravelDetail.tsx @@ -53,7 +53,7 @@ const TravelDetail = ({ travelDetail }: { travelDetail: TravelType }) => { startAt={travelDetail.startAt} endAt={travelDetail.endAt} organizer={organizer} - isBookmark={travelDetail.isBookmark} + bookmarkFlag={travelDetail.bookmarkFlag} /> {!dateOver && ( { travelPlan={mockTravelPlan} startAt={mockStartAt} endAt={endAt} - isBookmark + bookmarkFlag />, ); diff --git a/src/components/travel/detail/TravelDetailCategory.tsx b/src/components/travel/detail/TravelDetailCategory.tsx index 60588ee1..89831f14 100644 --- a/src/components/travel/detail/TravelDetailCategory.tsx +++ b/src/components/travel/detail/TravelDetailCategory.tsx @@ -17,7 +17,7 @@ type Props = Pick< | 'startAt' | 'endAt' | 'participationFlag' - | 'isBookmark' + | 'bookmarkFlag' > & { organizer?: Participant }; type Category = 'details' | 'itinerary' | 'review'; @@ -35,7 +35,7 @@ const TravelDetailCategory = ({ endAt, participationFlag, organizer, - isBookmark, + bookmarkFlag, }: Props) => { const [category, setCategory] = useState('details'); @@ -77,7 +77,7 @@ const TravelDetailCategory = ({ organizer={organizer} hashTags={hashTags} description={description} - isBookmark={isBookmark} + bookmarkFlag={bookmarkFlag} /> )} diff --git a/src/components/travel/detail/category/TabTravelDetail.test.tsx b/src/components/travel/detail/category/TabTravelDetail.test.tsx index 908b6434..802c9afe 100644 --- a/src/components/travel/detail/category/TabTravelDetail.test.tsx +++ b/src/components/travel/detail/category/TabTravelDetail.test.tsx @@ -49,7 +49,7 @@ describe('TabTravelDetail', () => { organizer={mock.organizer} hashTags={mock.hashTags} description={mock.description} - isBookmark + bookmarkFlag />, ); }); @@ -83,7 +83,7 @@ describe('여행 모임장일 때', () => { organizer={mock.organizer} hashTags={mock.hashTags} description={mock.description} - isBookmark={null} + bookmarkFlag={null} />, ); }); @@ -132,7 +132,7 @@ describe('여행 모임장이 아닐 때', () => { organizer={mockParticipation.organizer} hashTags={mockParticipation.hashTags} description={mockParticipation.description} - isBookmark + bookmarkFlag />, ); }); diff --git a/src/components/travel/detail/category/TabTravelDetail.tsx b/src/components/travel/detail/category/TabTravelDetail.tsx index c4238e1e..d0ed0be0 100644 --- a/src/components/travel/detail/category/TabTravelDetail.tsx +++ b/src/components/travel/detail/category/TabTravelDetail.tsx @@ -10,14 +10,14 @@ const TabTravelDetail = ({ organizer, hashTags, description, - isBookmark, + bookmarkFlag, }: { travelId: number; participationFlag: boolean | null; organizer?: Participant; hashTags: string; description: string; - isBookmark: boolean | null; + bookmarkFlag: boolean | null; }) => { const { data: user } = useGetUser(); @@ -37,7 +37,7 @@ const TabTravelDetail = ({ {participationFlag !== null && user && organizer && ( diff --git a/src/components/travel/detail/category/TravelDetailButtons.tsx b/src/components/travel/detail/category/TravelDetailButtons.tsx index d8d7c1e6..f47f17a2 100644 --- a/src/components/travel/detail/category/TravelDetailButtons.tsx +++ b/src/components/travel/detail/category/TravelDetailButtons.tsx @@ -13,23 +13,23 @@ import Link from 'next/link'; const TravelDetailButtons = ({ organizerId, userId, - isBookmark, + bookmarkFlag, travelId, }: { organizerId: number; userId: number; - isBookmark: boolean | null; + bookmarkFlag: boolean | null; travelId: number; }) => { const [isLoading, setIsLoading] = useState(true); - const [isBookmarked, setIsBookmarked] = useState(isBookmark); + const [isBookmarked, setIsBookmarked] = useState(bookmarkFlag); const { mutate: postBookMark } = useBookmarkTravel(); const { mutate: deleteBookMark } = useDeleteBookmarkTravel(); useEffect(() => { - setIsBookmarked(isBookmark); + setIsBookmarked(bookmarkFlag); setIsLoading(false); - }, [isBookmark]); + }, [bookmarkFlag]); const handleClickBookMark = () => { if (isBookmarked) { diff --git a/src/mocks/data/travel/travelDetail.json b/src/mocks/data/travel/travelDetail.json index ecda1a8c..91d571f1 100644 --- a/src/mocks/data/travel/travelDetail.json +++ b/src/mocks/data/travel/travelDetail.json @@ -16,7 +16,7 @@ "registrationEnd": "20241225", "tripDuration": 3, "participationFlag": null, - "isBookmark": true, + "bookmarkFlag": true, "travelPlan": [ { "tripDay": 1,