From 7cfcf01be6c34bd7f21a28419970fef6ef1b9bb5 Mon Sep 17 00:00:00 2001 From: finger9999 <161580182+finger9999@users.noreply.github.com> Date: Sun, 6 Jul 2025 06:57:16 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20User=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/umc/domain/user/controller/UserController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/umc/domain/user/controller/UserController.java b/src/main/java/com/umc/domain/user/controller/UserController.java index 1c1e045..748d7ef 100644 --- a/src/main/java/com/umc/domain/user/controller/UserController.java +++ b/src/main/java/com/umc/domain/user/controller/UserController.java @@ -6,6 +6,7 @@ import com.umc.domain.user.dto.UserResponseDTO; import com.umc.domain.user.entity.User; import com.umc.domain.user.repository.UserRepository; +import com.umc.global.config.SwaggerConfig; import com.umc.global.exception.BusinessException; import com.umc.global.exception.ErrorCode; import io.swagger.v3.oas.annotations.Operation; @@ -35,6 +36,9 @@ public class UserController { @GetMapping("/me") @Operation(summary = "자신의 닉네임 조회", description = "JWT 토큰을 기반으로 현재 유저의 닉네임을 조회합니다.", security = @SecurityRequirement(name = "bearerAuth")) + @SwaggerConfig.ApiErrorExamples({ + ErrorCode.TOKEN_INVALID + }) public ResponseEntity> getMyNickname(HttpServletRequest request) { String authorization = request.getHeader("Authorization"); log.info("닉네임 조회 요청 - Authorization: {}", authorization); From 14926a80b812bd988c4fd71548be705e9bc12bdb Mon Sep 17 00:00:00 2001 From: Baguette-bbang Date: Sun, 6 Jul 2025 07:36:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B3=80=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/perfume/service/PerfumeService.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/umc/domain/perfume/service/PerfumeService.java b/src/main/java/com/umc/domain/perfume/service/PerfumeService.java index cfcabfc..a633f2f 100644 --- a/src/main/java/com/umc/domain/perfume/service/PerfumeService.java +++ b/src/main/java/com/umc/domain/perfume/service/PerfumeService.java @@ -63,8 +63,9 @@ public PerfumeResponseDto createPerfume(SourceType sourceType, MultipartFile fil log.info("향수 생성 완료 - ID: {}, 사용자: {}, 타입: {}", savedPerfume.getId(), existingUser.getNickname(), sourceType); - // 6. 응답 DTO 생성 및 반환 - return PerfumeResponseDto.from(savedPerfume); + // 6. 응답 DTO 생성 및 반환 (sourceType을 클라이언트용으로 변환) + PerfumeResponseDto dto = PerfumeResponseDto.from(savedPerfume); + return dto.withClientSourceType(convertToClientSourceType(savedPerfume.getSourceType())); } catch (Exception e) { log.error("향수 생성 중 오류 발생: ", e); @@ -125,7 +126,9 @@ public PerfumeResponseDto getPerfume(Long id) { log.info("향수 조회 완료 - ID: {}, 사용자: {}", id, perfume.getUser().getNickname()); - return PerfumeResponseDto.from(perfume); + PerfumeResponseDto dto = PerfumeResponseDto.from(perfume); + // sourceType을 클라이언트용으로 변환 + return dto.withClientSourceType(convertToClientSourceType(perfume.getSourceType())); } /** @@ -145,7 +148,11 @@ public List getUserPerfumes(Long userId) { log.info("사용자 향수 목록 조회 완료 - 사용자: {}, 향수 개수: {}", user.getNickname(), perfumes.size()); return perfumes.stream() - .map(PerfumeResponseDto::from) + .map(perfume -> { + PerfumeResponseDto dto = PerfumeResponseDto.from(perfume); + // sourceType을 클라이언트용으로 변환 + return dto.withClientSourceType(convertToClientSourceType(perfume.getSourceType())); + }) .collect(Collectors.toList()); }