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
48 changes: 37 additions & 11 deletions src/api/service/user-service/index.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,46 @@
import { api } from '@/api/core';
import { Follow, GetUserPayload, UpdateMePayload, User } from '@/types/service/user';
import {
FollowParams,
GetUserParams,
UpdateMePayload,
UpdateMyImagePayload,
UpdateMyNotiParams,
User,
} from '@/types/service/user';

export const userServiceRemote = () => ({
// 1. 사용자 단건 조회
getUser: async (payload: GetUserPayload) => api.get<User>(`/users/${payload.userId}`),

// 2. 프로필 편집
updateMe: async (payload: UpdateMePayload) => api.patch<User>('/users', payload),
updateMe: async (payload: UpdateMePayload) => {
return api.patch<User>('/users', payload);
},

// 3. 회원탈퇴
deleteMe: async () => api.delete<User>(`/users`),
// 4. 사용자 프로필 이미지 변경
// 3. 프로필 이미지 편집
updateMyImage: async (payload: UpdateMyImagePayload) => {
return api.patch<User>(`/users/profile-image`, payload);
},

// 4. 알림 설정 변경
updatMyNotification: async (payload: UpdateMyNotiParams) => {
return api.patch<User>(`/users/notification/${payload.isNotificationEnabled}`);
},

// 5. 사용자 단건 조회
getUser: async (payload: GetUserParams) => {
return api.get<User>(`/users/${payload.userId}`);
},

// 5. 사용자 팔로우
followUser: async (payload: Follow) => api.post<void>(`/follows`, payload),
// 1. 사용자 팔로우
followUser: async (payload: FollowParams) => {
return api.post<void>(`/follows/${payload.followNickname}`);
},

// 6. 사용자 언팔로우
unfollowUser: async (payload: Follow) => api.delete<void>(`/follows/${payload.followeeId}`),
unfollowUser: async (payload: FollowParams) => {
return api.delete<void>(`/follows/${payload.followNickname}`);
},

// 7. 회원탈퇴
deleteMe: async () => api.delete<User>(`/users`),

// 8. 사용자 프로필 이미지 변경
});
7 changes: 4 additions & 3 deletions src/hooks/use-user/use-user-follow/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';

import { API } from '@/api';
import { userKeys } from '@/lib/query-key/query-key-user';
import { Follow } from '@/types/service/user';
import { FollowParams } from '@/types/service/user';

export const useFollowUser = (payload: Follow) => {
export const useFollowUser = (payload: FollowParams) => {
const queryClient = useQueryClient();
const query = useMutation({
mutationFn: () => API.userService.followUser(payload),
onSuccess: (_data, _variables, _context) => {
queryClient.invalidateQueries({ queryKey: userKeys.item(payload.followeeId) });
// todo: GetUser는 ID로 호출, follow는 nickname으로 진행 => querykey 타입 불일치로 인한 전체 querykey 삭제 적용 (임시)
queryClient.invalidateQueries({ queryKey: userKeys.all });
console.log('요청 성공');
},
onError: () => {
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/use-user/use-user-get/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { useQuery } from '@tanstack/react-query';

import { API } from '@/api';
import { userKeys } from '@/lib/query-key/query-key-user';
import { GetUserPayload } from '@/types/service/user';
import { GetUserParams } from '@/types/service/user';

export const useGetUser = ({ userId }: GetUserPayload) => {
export const useGetUser = ({ userId }: GetUserParams) => {
const query = useQuery({
queryKey: userKeys.item(userId),
queryFn: () => API.userService.getUser({ userId }),
Expand Down
6 changes: 3 additions & 3 deletions src/hooks/use-user/use-user-unfollow/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';

import { API } from '@/api';
import { userKeys } from '@/lib/query-key/query-key-user';
import { Follow } from '@/types/service/user';
import { FollowParams } from '@/types/service/user';

export const useUnfollowUser = (payload: Follow) => {
export const useUnfollowUser = (payload: FollowParams) => {
const queryClient = useQueryClient();
const query = useMutation({
mutationFn: () => API.userService.unfollowUser(payload),
onSuccess: (_data, _variables, _context) => {
queryClient.invalidateQueries({ queryKey: userKeys.item(payload.followeeId) });
queryClient.invalidateQueries({ queryKey: userKeys.all });
console.log('요청 성공');
},
onError: () => {
Expand Down
17 changes: 10 additions & 7 deletions src/types/service/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,24 @@ export interface User {
isFollowing: boolean;
}

export interface GetUserPayload {
export interface GetUserParams {
userId: number;
}

export type GetUserResponse = User;

export interface UpdateMePayload {
nickName?: string;
profileImage?: string;
mbti?: string;
profileMessage?: string;
}

export type UpdateMeResponse = GetUserResponse;
export interface UpdateMyImagePayload {
file: File;
}

export interface UpdateMyNotiParams {
isNotificationEnabled: boolean;
}

export interface Follow {
followeeId: number;
export interface FollowParams {
followNickname: string;
}