Merge pull request #267 from limbaba1120/deploy

Deploy
Kernel360 · Aug 29, 2024 · 739a02f · 739a02f
2 parents 6c2b487 + d04af31
commit 739a02f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/backend/src/main/java/org/example/user/controller/member/UserApiController.java b/backend/src/main/java/org/example/user/controller/member/UserApiController.java
@@ -40,7 +40,8 @@ public ResponseEntity<UserDto.UserUpdateResponse> userUpdate(
 	) throws IOException {
 		String email = SecurityContextHolder.getContext().getAuthentication().getName();
 
-		if(updateRequest == null && profileImage.isEmpty()){
+		// profileImage가 null인지도 확인
+		if (updateRequest == null && (profileImage == null || profileImage.isEmpty())) {
 			throw ApiUserException.builder()
 				.category(ApiErrorCategory.RESOURCE_INACCESSIBLE)
 				.subCategory(ApiUserErrorSubCategory.USER_UPDATE_IMPOSSIBLE)

diff --git a/frontend/src/app/_api/myPage.ts b/frontend/src/app/_api/myPage.ts
@@ -53,50 +53,52 @@ export async function updateProfileInfo(
     },
     profileImage?: ProfileImage | null,
 ) {
-    const formData = new FormData()
+    const formData = new FormData();
 
+    // updateRequest를 FormData로 추가
     const updateRequestBlob = new Blob([JSON.stringify(updateRequest)], {
         type: 'application/json',
-    })
-    formData.append('updateRequest', updateRequestBlob) // JSON 데이터를 문자열로 변환하여 추가
+    });
+    formData.append('updateRequest', updateRequestBlob);
 
+    // profileImage가 있을 경우 FormData로 추가
     if (profileImage) {
-        formData.append('profileImage', profileImage.blob)
+        formData.append('profileImage', profileImage.blob);
     }
 
-    const requestUrl = `${API_PRIVATE_URL}/user/update`
+    const requestUrl = `${API_PRIVATE_URL}/user/update`;
 
     const res = await fetch(requestUrl, {
         method: 'PATCH',
         credentials: 'include',
         body: formData,
-    })
+    });
 
     if (!res.ok) {
-        const errorBody = await res.json()
-        throw new ApiError(res.status, errorBody)
+        const errorBody = await res.json();
+        throw new ApiError(res.status, errorBody);
     }
 
-    return await res.json()
+    return await res.json();
 }
 
 export async function updateProfileImg(profileImage: File) {
-    const formData = new FormData()
-    formData.append('profileImage', profileImage)
-    const requestUrl = `${API_PRIVATE_URL}/user/update`
+    const formData = new FormData();
+    formData.append('profileImage', profileImage);
+    const requestUrl = `${API_PRIVATE_URL}/user/update`;
 
     const res = await fetch(requestUrl, {
         method: 'PATCH',
         credentials: 'include',
         body: formData,
-    })
+    });
 
     if (!res.ok) {
-        const errorBody = await res.json()
-        throw new ApiError(res.status, errorBody)
+        const errorBody = await res.json();
+        throw new ApiError(res.status, errorBody);
     }
 
-    return await res.json()
+    return await res.json();
 }
 
 export async function getMyPosts(): Promise<myPostAllResponse[]> {