Skip to content

[MERGE] DEV TO MAIN #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Baguette-bbang merged 3 commits into from
Jul 5, 2025
Merged

[MERGE] DEV TO MAIN #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7cfcf01
feat: User 에러 코드 추가
finger9999 Jul 5, 2025
9b077e6
Merge branch 'feat/review-error-handling' into develop
finger9999 Jul 5, 2025
14926a8
fix : 데이터 타입 변환
Baguette-bbang Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/main/java/com/umc/domain/perfume/service/PerfumeService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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()));
}

/**
Expand All @@ -145,7 +148,11 @@ public List<PerfumeResponseDto> 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());
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/umc/domain/user/controller/UserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -35,6 +36,9 @@ public class UserController {
@GetMapping("/me")
@Operation(summary = "자신의 닉네임 조회", description = "JWT 토큰을 기반으로 현재 유저의 닉네임을 조회합니다.",
security = @SecurityRequirement(name = "bearerAuth"))
@SwaggerConfig.ApiErrorExamples({
ErrorCode.TOKEN_INVALID
})
public ResponseEntity<ApiResponse<UserResponseDTO.MyNameDTO>> getMyNickname(HttpServletRequest request) {
String authorization = request.getHeader("Authorization");
log.info("닉네임 조회 요청 - Authorization: {}", authorization);
Expand Down