From 6853806a8437acf5dddb7491b5413f6a4f6c1d98 Mon Sep 17 00:00:00 2001 From: jisu <98259433+jisu-jeong0@users.noreply.github.com> Date: Wed, 22 Jan 2025 01:37:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[REFACTOR]=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=9D=91=EB=8B=B5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nookbook/domain/user/application/UserService.java | 1 + .../java/com/nookbook/domain/user/dto/response/MyInfoRes.java | 3 +++ .../nookbook/domain/user/presentation/MyPageController.java | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/nookbook/domain/user/application/UserService.java b/src/main/java/com/nookbook/domain/user/application/UserService.java index 30ed0c9..a6a1293 100644 --- 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 getMyInfo(UserPrincipal userPrincipal) { MyInfoRes myInfoRes = MyInfoRes.builder() .nicknameId(user.getNicknameId()) .nickname(user.getNickname()) + .imageUrl(user.getImageUrl()) .friendsNum(num) .build(); 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 index 308fa5a..52fc45c 100644 --- 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 index 5003995..7548f9b 100644 --- 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) ) } ), From 082edb7c9317df8ba491466aa0731189ead6d572 Mon Sep 17 00:00:00 2001 From: jisu <98259433+jisu-jeong0@users.noreply.github.com> Date: Wed, 22 Jan 2025 01:40:58 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[REFACTOR]=20=EA=B8=B0=EB=B3=B8=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=A3=BC=EC=86=8C=20=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nookbook/domain/user/application/UserService.java | 2 +- src/main/java/com/nookbook/domain/user/domain/User.java | 3 +-- 2 files changed, 2 insertions(+), 3 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 index a6a1293..5b4307d 100644 --- a/src/main/java/com/nookbook/domain/user/application/UserService.java +++ b/src/main/java/com/nookbook/domain/user/application/UserService.java @@ -194,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 index 8cdee6a..58e44df 100644 --- 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";