Merge pull request #89 from Nook-Book/develop

[DEPLOY]
Nook-Book · Jan 21, 2025 · c3c4658 · c3c4658
2 parents 5aea11a + 057276f
commit c3c4658
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/nookbook/domain/user/application/UserService.java b/src/main/java/com/nookbook/domain/user/application/UserService.java
@@ -170,6 +170,7 @@ public ResponseEntity<ApiResponse> getMyInfo(UserPrincipal userPrincipal) {
         MyInfoRes myInfoRes = MyInfoRes.builder()
                 .nicknameId(user.getNicknameId())
                 .nickname(user.getNickname())
+                .imageUrl(user.getImageUrl())
                 .friendsNum(num)
                 .build();
 
@@ -193,7 +194,7 @@ public ResponseEntity<?> updateImage(UserPrincipal userPrincipal, Boolean isDefa
         String imageUrl;
         if (isDefaultImage && image.isEmpty()) {
             imageName = "default.png";
-            imageUrl = "https://";   // 추후 수정
+            imageUrl = "https://nookbook-image-bucket.s3.amazonaws.com/default.png";
         } else {
             imageName = s3Uploader.uploadImage(image.get());
             imageUrl = s3Uploader.getFullPath(imageName);

diff --git a/src/main/java/com/nookbook/domain/user/domain/User.java b/src/main/java/com/nookbook/domain/user/domain/User.java
@@ -38,8 +38,7 @@ public class User extends BaseEntity {
 
     private String providerId;
 
-    // 이미지는 기본 고정 필요
-    private String imageUrl = "https://";
+    private String imageUrl = "https://nookbook-image-bucket.s3.amazonaws.com/default.png";
 
     private String imageName = "default.png";
 

diff --git a/src/main/java/com/nookbook/domain/user/dto/response/MyInfoRes.java b/src/main/java/com/nookbook/domain/user/dto/response/MyInfoRes.java
@@ -18,6 +18,9 @@ public class MyInfoRes {
     @Schema(type = "String", example = "기무라타쿠야가되", description = "사용자의 닉네임입니다.")
     private String nickname;
 
+    @Schema(type = "String", example = "https://nookbook-s3-bucket.amazons.com/akfjvndij0e3.png", description = "사용자의 프로필 사진 URL입니다.")
+    private String imageUrl;
+
     @Schema(type = "int", example = "12", description = "특정 사용자의 친구 수 입니다.")
     private int friendsNum;
 }
diff --git a/src/main/java/com/nookbook/domain/user/presentation/MyPageController.java b/src/main/java/com/nookbook/domain/user/presentation/MyPageController.java
@@ -100,7 +100,7 @@ public ResponseEntity<?> findReadingReportByYear(
         return bookService.countReadBooksByYear(userPrincipal, year);
     }
 
-    @Operation(summary = "[마이페이지] 내 정보 조회", description = "마이페이지의 내 정보(아이디, 닉네임, 친구 수)를 조회합니다.")
+    @Operation(summary = "[마이페이지] 내 정보 조회", description = "마이페이지의 내 정보(아이디, 닉네임, 프로필 이미지, 친구 수)를 조회합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "조회 성공", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = MyInfoRes.class) ) } ),
             @ApiResponse(responseCode = "400", description = "조회 실패", content = { @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class) ) } ),