Merge pull request #208 from prgrms-aibe-devcourse/dev

dev to main

Author: dochmai382

src/api/expense.ts

@@ -57,7 +57,7 @@ export const expenseAPI = {
                 splitType: data.splitType,
                 splitData: data.splitData,
             };
-            endpoint = '/api/v1/expenses/group';
+            endpoint = '/api/v2/expenses/group';
         } else {
             expenseData = {
                 title: data.title,
@@ -66,7 +66,7 @@ export const expenseAPI = {
                 date: data.date,
                 memo: data.memo,
             };
-            endpoint = '/api/v1/expenses/personal';
+            endpoint = '/api/v2/expenses/personal';
         }
 
         formData.append('expense', new Blob([JSON.stringify(expenseData)], {
@@ -91,7 +91,7 @@ export const expenseAPI = {
         year: number;
         month: number;
     }) => {
-        const response = await apiClient.get('/api/v1/expenses/group/shares', { params });
+        const response = await apiClient.get('/api/v2/expenses/group/shares', { params });
         return response.data;
     },
 
@@ -104,7 +104,7 @@ export const expenseAPI = {
         category?: string;
         search?: string;
     }) => {
-        const response = await apiClient.get(`/api/v1/expenses/group/${groupId}/shares/paging`, { params });
+        const response = await apiClient.get(`/api/v2/expenses/group/${groupId}/shares/paging`, { params });
         return response.data;
     },
 
@@ -117,7 +117,7 @@ export const expenseAPI = {
         category?: string;
         search?: string;
     }) => {
-        const response = await apiClient.get('/api/v1/expenses/personal/combined', {params});
+        const response = await apiClient.get('/api/v2/expenses/personal/combined', {params});
         return response.data;
     },
 
@@ -130,7 +130,7 @@ export const expenseAPI = {
         category?: string;
         search?: string;
     }) => {
-        const response = await apiClient.get(`/api/v1/expenses/group/${groupId}/with-stats`, {params});
+        const response = await apiClient.get(`/api/v2/expenses/group/${groupId}/with-stats`, {params});
         return response.data;
     },
 
@@ -157,7 +157,7 @@ export const expenseAPI = {
             formData.append('receiptFile', data.receipt);
         }
 
-        const response = await apiClient.patch(`/api/v1/expenses/${id}`, formData, {
+        const response = await apiClient.patch(`/api/v2/expenses/${id}`, formData, {
             headers: {
                 'Content-Type': 'multipart/form-data'
             }
@@ -167,19 +167,19 @@ export const expenseAPI = {
 
     // 지출 삭제
     delete: async (id: number) => {
-        const response = await apiClient.delete(`/api/v1/expenses/${id}`);
+        const response = await apiClient.delete(`/api/v2/expenses/${id}`);
         return response.data;
     },
 
     // 영수증 URL 조회
     getReceiptUrl: async (id: number) => {
-        const response = await apiClient.get(`/api/v1/expenses/${id}/receipt`);
+        const response = await apiClient.get(`/api/v2/expenses/${id}/receipt`);
         return response.data;
     },
 
     // 영수증만 삭제
     deleteReceipt: async (id: number) => {
-        const response = await apiClient.delete(`/api/v1/expenses/${id}/receipt`);
+        const response = await apiClient.delete(`/api/v2/expenses/${id}/receipt`);
         return response.data;
     },
 
@@ -190,7 +190,7 @@ export const expenseAPI = {
         months?: number;
         category?: string;
     }) => {
-        const response = await apiClient.get('/api/v1/expenses/personal/trend', { params });
+        const response = await apiClient.get('/api/v2/expenses/personal/trend', { params });
         return response.data;
     },
 
@@ -201,7 +201,7 @@ export const expenseAPI = {
         months?: number;
         category?: string;
     }) => {
-        const response = await apiClient.get(`/api/v1/expenses/group/${groupId}/trend`, { params });
+        const response = await apiClient.get(`/api/v2/expenses/group/${groupId}/trend`, { params });
         return response.data;
     },
 

src/api/profile.ts

@@ -7,15 +7,15 @@ export const profileApi = {
         nickname?: string;
         monthlyBudget?: number;
     }) => {
-        const response = await apiClient.patch('/api/v1/users/me', profileData);
+        const response = await apiClient.patch('/api/v2/users/me', profileData);
         return response.data;
     },
 
     // 프로필 이미지 업로드
     uploadAvatar: async (file: File) => {
         const formData = new FormData();
         formData.append('file', file);
-        const response = await apiClient.post('/api/v1/users/me/profile-image', formData, {
+        const response = await apiClient.post('/api/v2/users/me/profile-image', formData, {
             headers: {
                 'Content-Type': 'multipart/form-data',
             },
@@ -25,20 +25,20 @@ export const profileApi = {
 
     // 프로필 이미지 삭제
     deleteAvatar: async () => {
-        const response = await apiClient.delete('/api/v1/users/me/profile-image');
+        const response = await apiClient.delete('/api/v2/users/me/profile-image');
         return response.data;
     },
 
     // 닉네임 중복 확인
     checkNickname: async (nickname: string) => {
         const encodedNickname = encodeURIComponent(nickname);
-        const response = await apiClient.get(`/api/v1/users/nickname/check?nickname=${encodedNickname}`);
+        const response = await apiClient.get(`/api/v2/users/nickname/check?nickname=${encodedNickname}`);
         return response.data;
     },
 
     // 계정 삭제 (비활성화)
     deleteAccount: async () => {
-        const response = await apiClient.delete('/api/v1/users/me');
+        const response = await apiClient.delete('/api/v2/users/me');
         return response.data;
     }
 }

src/components/expenses/ExpenseModal.tsx

@@ -14,6 +14,8 @@ interface ExpenseModalProps {
 }
 
 const ExpenseModal: React.FC<ExpenseModalProps> = ({expense, onClose}) => {
+  // console.log('expense 객체: ', expense?.expenseType, expense);
+
     const {addExpense, updateExpense, deleteExpense, mode, currentGroup} = useAppStore();
     const {user} = useAuthStore();
     const [isSubmitting, setIsSubmitting] = useState(false);
@@ -652,7 +654,7 @@ const ExpenseModal: React.FC<ExpenseModalProps> = ({expense, onClose}) => {
 
             {/* Buttons */}
             <div className="flex space-x-3 pt-4">
-              {expense && !expense.isGroupShare && (
+              {expense && expense.expenseType !== 'SHARE' && (
                 <motion.button
                   type="button"
                   className={`px-4 py-2 border border-red-300 text-red-700 rounded-lg font-medium transition-colors ${
@@ -677,7 +679,7 @@ const ExpenseModal: React.FC<ExpenseModalProps> = ({expense, onClose}) => {
                 </motion.button>
               )}
 
-              {!expense?.isGroupShare && (
+              {expense?.expenseType !== 'SHARE' && (
                 <motion.button
                   type="submit"
                   className={`flex-1 px-4 py-2 bg-accent-500 text-white rounded-lg font-medium transition-colors ${

src/hooks/useAuth.ts

@@ -45,7 +45,7 @@ export const useAuth = () => {
         try {
             setIsLoading(true);
             console.log('사용자 정보 요청 시작')
-            const response = await apiClient.get('/api/v1/auth/me');
+            const response = await apiClient.get('/api/v2/auth/me');
             // console.log('/me 응답: ', response.status, response.data);
             const userData = response.data;
             // HTML 응답인지 확인
@@ -91,7 +91,7 @@ export const useAuth = () => {
     const logout = async () => {
         try {
             setIsLoading(true);
-            await apiClient.post('/api/v1/auth/logout', {}, { timeout: 5000 });
+            await apiClient.post('/api/v2/auth/logout', {}, { timeout: 5000 });
             console.log('서버 로그아웃 요청 성공');
         } catch (error) {
             console.error('로그아웃 실패: ', error);

src/utils/api.ts

@@ -72,7 +72,7 @@ const shouldSkipUnauthorizedHandling = (url: string, method: string) => {
 
   // 계정삭제 API
   const isAccountDeletion =
-    url?.includes("/api/v1/users/me") && method === "delete";
+    url?.includes("/api/v2/users/me") && method === "delete";
 
   const isMainRoot = currentPath === "/";
 
@@ -85,7 +85,7 @@ const shouldSkipUnauthorizedHandling = (url: string, method: string) => {
 const handleRefreshToken = async (originalRequest: any) => {
   try {
     // 한번만 refresh 시도
-    await apiClient.post("/api/v1/auth/refresh");
+    await apiClient.post("/api/v2/auth/refresh");
     isHandling401 = false;
     // 성공하면 원래 요청 재시도
     return apiClient(originalRequest);