chore: update some likedUsers to likedUser (#135)

- likedUsers: Pick<LikedUsers, 'id'>[] to likedUser
mash-up-kr · Sep 21, 2024 · 9ff6796 · 9ff6796
1 parent 45adc46
commit 9ff6796
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 31 deletions.
diff --git a/src/app/map/[mapId]/page.tsx b/src/app/map/[mapId]/page.tsx
@@ -166,7 +166,7 @@ const MapMain = ({ params: { mapId } }: { params: { mapId: string } }) => {
           if (selectedFilterNames.category === 'all') return true
           if (
             selectedFilterNames.category === 'like' &&
-            place.likedUsers?.some((likedUser) => likedUser.id === userData.id)
+            place.likedUser?.some((liked) => liked.id === userData.id)
           )
             return true
           if (

diff --git a/src/app/map/[mapId]/place-list-bottom-sheet.tsx b/src/app/map/[mapId]/place-list-bottom-sheet.tsx
@@ -41,8 +41,7 @@ const PlaceListBottomSheet = forwardRef<
     const getIsLike = (place: PlaceType): boolean => {
       if (typeof userId === 'undefined') return false
 
-      if (place.likedUsers?.some((likedUser) => likedUser.id === userId))
-        return true
+      if (place.likedUser?.some((liked) => liked.id === userId)) return true
 
       return false
     }
@@ -54,11 +53,9 @@ const PlaceListBottomSheet = forwardRef<
             p.place.id === place.place.id
               ? {
                   ...p,
-                  likedUsers: getIsLike(place)
-                    ? p.likedUsers?.filter(
-                        (likedUser) => likedUser.id !== userId,
-                      )
-                    : [...(p.likedUsers ?? []), { id: userId }],
+                  likedUser: getIsLike(place)
+                    ? p.likedUser?.filter((liked) => liked.id !== userId)
+                    : [...(p.likedUser ?? []), { id: userId }],
                 }
               : p,
           ),
@@ -145,7 +142,7 @@ const PlaceListBottomSheet = forwardRef<
                     pick={{
                       isLiked: getIsLike(place),
                       isMyPick: place.createdBy?.id === userId,
-                      numOfLikes: place.likedUsers?.length || 0,
+                      numOfLikes: place.likedUser?.length || 0,
 
                       onClickLike: (e) => {
                         e.preventDefault()

diff --git a/src/app/search/[query]/result-search-list.tsx b/src/app/search/[query]/result-search-list.tsx
@@ -34,9 +34,8 @@ const ResultSearchListBox = ({
   const [likeInfoPlaces, setLikeInfoPlaces] = useState(
     [...places].map((place) => ({
       isLike:
-        !!place.likedUsers?.find((likedUser) => likedUser.id === user?.id) ||
-        false,
-      numOfLike: place.likedUsers?.length ?? 0,
+        !!place.likedUser?.find((liked) => liked.id === user?.id) || false,
+      numOfLike: place.likedUser?.length ?? 0,
     })),
   )
 
@@ -45,20 +44,18 @@ const ResultSearchListBox = ({
       setLikeInfoPlaces(
         places.map((place) => ({
           isLike:
-            !!place.likedUsers?.find(
-              (likedUser) => likedUser.id === user?.id,
-            ) || false,
-          numOfLike: place.likedUsers?.length ?? 0,
+            !!place.likedUser?.find((liked) => liked.id === user?.id) || false,
+          numOfLike: place.likedUser?.length ?? 0,
         })),
       )
     }
   }, [likeInfoPlaces.length, places, user?.id])
 
   const calculateNumOfLike = (place: SearchPlace, isLikePlace: boolean) => {
-    const initialNumOfLike = place.likedUsers?.length || 0
+    const initialNumOfLike = place.likedUser?.length || 0
 
     if (!user?.id) return initialNumOfLike
-    if (place.likedUsers?.find((likedUser) => likedUser.id === user.id)) {
+    if (place.likedUser?.find((liked) => liked.id === user.id)) {
       if (isLikePlace) return initialNumOfLike
       return initialNumOfLike - 1
     }

diff --git a/src/components/place/place-map-popup.tsx b/src/components/place/place-map-popup.tsx
@@ -39,12 +39,10 @@ const PlaceMapPopup = forwardRef<HTMLAnchorElement, PlaceMapPopupProps>(
     const place = selectedPlace.place
 
     const getNumOfLike = () => {
-      const initialNumOfLike = selectedPlace.likedUsers?.length || 0
+      const initialNumOfLike = selectedPlace.likedUser?.length || 0
 
       if (!user?.id) return initialNumOfLike
-      if (
-        selectedPlace.likedUsers.some((likedUser) => likedUser.id === user.id)
-      ) {
+      if (selectedPlace.likedUser.some((liked) => liked.id === user.id)) {
         if (isLikePlace) return initialNumOfLike
         return initialNumOfLike - 1
       }
@@ -110,7 +108,7 @@ const PlaceMapPopup = forwardRef<HTMLAnchorElement, PlaceMapPopupProps>(
     useEffect(() => {
       if (!user) return
       setIsLikePlace(
-        selectedPlace.likedUsers.some((likedUser) => likedUser.id === user.id),
+        selectedPlace.likedUser.some((liked) => liked.id === user.id),
       )
     }, [user, selectedPlace])
 

diff --git a/src/constants/place.ts b/src/constants/place.ts
@@ -44,7 +44,7 @@ export const PLACE_LIST_DATA: PlaceType[] = [
       },
     ],
     comments: [{}],
-    likedUsers: [{ id: 1 }, { id: 2 }, { id: 3 }],
+    likedUser: [{ id: 1 }, { id: 2 }, { id: 3 }],
     createdBy: {
       id: 1,
       nickname: 'foodie',
@@ -92,7 +92,7 @@ export const PLACE_LIST_DATA: PlaceType[] = [
       },
     ],
     comments: [{}],
-    likedUsers: [{ id: 2 }, { id: 3 }, { id: 4 }],
+    likedUser: [{ id: 2 }, { id: 3 }, { id: 4 }],
     createdBy: {
       id: 2,
       nickname: 'sushiLover',
@@ -140,7 +140,7 @@ export const PLACE_LIST_DATA: PlaceType[] = [
       },
     ],
     comments: [{}],
-    likedUsers: [{ id: 3 }, { id: 4 }, { id: 5 }],
+    likedUser: [{ id: 3 }, { id: 4 }, { id: 5 }],
     createdBy: {
       id: 3,
       nickname: 'meatLover',
@@ -188,7 +188,7 @@ export const PLACE_LIST_DATA: PlaceType[] = [
       },
     ],
     comments: [{}],
-    likedUsers: [{ id: 4 }, { id: 5 }, { id: 6 }],
+    likedUser: [{ id: 4 }, { id: 5 }, { id: 6 }],
     createdBy: {
       id: 4,
       nickname: 'noodleFan',
@@ -237,7 +237,7 @@ export const PLACE_LIST_DATA: PlaceType[] = [
       },
     ],
     comments: [{}],
-    likedUsers: [{ id: 5 }, { id: 6 }, { id: 7 }],
+    likedUser: [{ id: 5 }, { id: 6 }, { id: 7 }],
     createdBy: {
       id: 5,
       nickname: 'cafeLover',

diff --git a/src/models/api/place.ts b/src/models/api/place.ts
@@ -14,7 +14,7 @@ export interface PlaceType {
   }
   tags: TagItem[]
   comments: unknown[]
-  likedUsers: Pick<LikeUsers, 'id'>[]
+  likedUser: Pick<LikeUsers, 'id'>[]
   createdBy: {
     id: number
     nickname: string
@@ -36,7 +36,7 @@ export interface SearchPlace {
   tags: string[]
   createdBy?: Creator
   score: number
-  likedUsers: Pick<LikeUsers, 'id'>[]
+  likedUser: Pick<LikeUsers, 'id'>[]
 }
 
 export const isSearchPlace = (

diff --git a/src/utils/api/index.ts b/src/utils/api/index.ts
@@ -198,10 +198,24 @@ const proxy = {
   get: (url: string): Promise<any> => client.public.get(`/proxy?url=${url}`),
 }
 
+const gpt = {
+  restaurants: {
+    recommend: {
+      test: {
+        get: (question: string, x: string, y: string): Promise<any> =>
+          client.secure.get(
+            `/gpt/restaurants/recommend/test?question=${question}&x=${x}&y=${y}`,
+          ),
+      },
+    },
+  },
+}
+
 export const api = {
   users,
   maps,
   search,
   place,
   proxy,
+  gpt,
 } as const
diff --git a/src/utils/format.ts b/src/utils/format.ts
@@ -5,7 +5,7 @@ export const convertSearchPlaceToPlaceType = (
 ): PlaceType => {
   return {
     ...searchPlace,
-    likedUsers: searchPlace.likedUsers ?? [],
+    likedUser: searchPlace.likedUser ?? [],
     createdBy: {
       id: -1,
       nickname: '',