Merge pull request #103 from JA-yeong-eop-JA-moeu-JA/dev

🚀 deploy: dev -> main 병합

Author: munjji

src/main/java/com/jajaja/domain/auth/controller/AuthController.java

@@ -21,8 +21,8 @@ public class AuthController {
             description = "사용자 ID를 기반으로 액세스 토큰과 리프레쉬 토큰을 발급합니다."
     )
     @PostMapping("/token")
-    public ApiResponse<TokenResponseDto> getToken(@RequestParam Long userId) {
-        return ApiResponse.onSuccess(authService.getToken(userId));
+    public ApiResponse<TokenResponseDto> getToken(@RequestParam Long memberId) {
+        return ApiResponse.onSuccess(authService.getToken(memberId));
     }
 
     @Operation(

src/main/java/com/jajaja/domain/auth/dto/CustomOAuth2User.java

@@ -8,7 +8,7 @@
 import java.util.Map;
 
 public record CustomOAuth2User(
-        UserDto userDto
+        MemberDto memberDto
 ) implements OAuth2User {
     @Override
     public Map<String, Object> getAttributes() {
@@ -22,18 +22,18 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
 
     @Override
     public String getName() {
-        return String.valueOf(userDto.userId());
+        return String.valueOf(memberDto.memberId());
     }
 
     public String getOAuthId() {
-        return userDto.oAuthId();
+        return memberDto.oAuthId();
     }
 
     public OauthType getOAuthType() {
-        return userDto.oAuthType();
+        return memberDto.oAuthType();
     }
 
     public String getUserName() {
-        return userDto.name();
+        return memberDto.name();
     }
 }

…/com/jajaja/domain/auth/dto/UserDto.java …om/jajaja/domain/auth/dto/MemberDto.javasrc/main/java/com/jajaja/domain/auth/dto/UserDto.java renamed to src/main/java/com/jajaja/domain/auth/dto/MemberDto.java src/main/java/com/jajaja/domain/auth/dto/UserDto.java renamed to src/main/java/com/jajaja/domain/auth/dto/MemberDto.java

@@ -4,15 +4,15 @@
 import lombok.Builder;
 
 @Builder
-public record UserDto(
-        long userId,
+public record MemberDto(
+        long memberId,
         OauthType oAuthType,
         String oAuthId,
         String name
 ) {
-    public static UserDto of(long userId, OauthType provider, String providerId, String name) {
-        return UserDto.builder()
-                .userId(userId)
+    public static MemberDto of(long memberId, OauthType provider, String providerId, String name) {
+        return MemberDto.builder()
+                .memberId(memberId)
                 .oAuthType(provider)
                 .oAuthId(providerId)
                 .name(name)

src/main/java/com/jajaja/domain/auth/service/AuthService.java

@@ -19,8 +19,8 @@ public class AuthService {
 
     private final JwtProvider jwtProvider;
 
-    public TokenResponseDto getToken(Long userId) {
-        Authentication authentication = new UsernamePasswordAuthenticationToken(String.valueOf(userId), null, null);
+    public TokenResponseDto getToken(Long memberId) {
+        Authentication authentication = new UsernamePasswordAuthenticationToken(String.valueOf(memberId), null, null);
         String accessToken = jwtProvider.generateAccessToken(authentication);
         String refreshToken = jwtProvider.generateRefreshToken(authentication);
         return new TokenResponseDto(accessToken, refreshToken);

src/main/java/com/jajaja/domain/auth/service/CustomOAuth2UserService.java

@@ -3,7 +3,7 @@
 import com.jajaja.domain.cart.entity.Cart;
 import com.jajaja.domain.cart.repository.CartRepository;
 import com.jajaja.domain.member.converter.MemberConverter;
-import com.jajaja.domain.auth.dto.UserDto;
+import com.jajaja.domain.auth.dto.MemberDto;
 import com.jajaja.domain.auth.dto.CustomOAuth2User;
 import com.jajaja.domain.auth.dto.GoogleResponseDto;
 import com.jajaja.domain.auth.dto.KakaoResponseDto;
@@ -54,7 +54,7 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
             existingMember.updateEmail(oAuth2Response.getEmail());
             member = existingMember;
         }
-        UserDto userDto = UserDto.of(member.getId(), oauthType, oauthId, oAuth2Response.getName());
-        return new CustomOAuth2User(userDto);
+        MemberDto memberDto = MemberDto.of(member.getId(), oauthType, oauthId, oAuth2Response.getName());
+        return new CustomOAuth2User(memberDto);
     }
 }

src/main/java/com/jajaja/domain/member/controller/MemberBusinessCategoryController.java

@@ -19,7 +19,7 @@ public class MemberBusinessCategoryController {
 
     /**
      * 유저 업종 등록 API
-     * @param userId 유저 ID
+     * @param memberId 유저 ID
      * @param dto 업종 등록 요청 DTO
      * @return 200 OK
      */
@@ -28,11 +28,11 @@ public class MemberBusinessCategoryController {
             description = "온보딩 단계에서 유저가 선택한 업종을 등록합니다."
     )
     @PostMapping("/")
-    public ApiResponse<Void> registerUserBusinessCategory(
-            @Auth Long userId,
+    public ApiResponse<Void> registerMemberBusinessCategory(
+            @Auth Long memberId,
             @RequestBody @Valid MemberBusinessCategoryRequestDto dto
     ) {
-        memberBusinessCategoryCommandService.registerUserBusinessCategory(userId, dto);
+        memberBusinessCategoryCommandService.registerMemberBusinessCategory(memberId, dto);
         return ApiResponse.onSuccess(null);
     }
 

src/main/java/com/jajaja/domain/member/service/MemberBusinessCategoryCommandService.java

@@ -6,5 +6,5 @@
 public interface MemberBusinessCategoryCommandService {
 
     @Transactional
-    void registerUserBusinessCategory(Long userId, MemberBusinessCategoryRequestDto dto);
+    void registerMemberBusinessCategory(Long memberId, MemberBusinessCategoryRequestDto dto);
 }

src/main/java/com/jajaja/domain/member/service/MemberBusinessCategoryCommandServiceImpl.java

@@ -23,12 +23,12 @@ public class MemberBusinessCategoryCommandServiceImpl implements MemberBusinessC
 
     /**
      * 유저 업종 등록
-     * @param userId 유저 아이디
+     * @param memberId 유저 아이디
      * @param dto 업종 요청 DTO
      */
     @Transactional
-    public void registerUserBusinessCategory(Long userId, MemberBusinessCategoryRequestDto dto) {
-        Member member = memberRepository.findById(userId)
+    public void registerMemberBusinessCategory(Long memberId, MemberBusinessCategoryRequestDto dto) {
+        Member member = memberRepository.findById(memberId)
                 .orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND));
 
         if (memberBusinessCategoryRepository.findByMember(member).isPresent()) {

src/main/java/com/jajaja/domain/order/controller/OrderController.java

@@ -57,8 +57,8 @@ public ApiResponse<OrderRefundResponseDto> refundOrder(
             description = "사용자의 모든 주문 목록을 조회합니다."
     )
     @GetMapping("/me")
-    public ApiResponse<PagingOrderListResponseDto> getMyOrders(@Auth Long userId, Pageable pageable) {
-        PagingOrderListResponseDto pagingOrderListResponseDto = orderQueryService.getMyOrders(userId, pageable);
+    public ApiResponse<PagingOrderListResponseDto> getMyOrders(@Auth Long memberId, Pageable pageable) {
+        PagingOrderListResponseDto pagingOrderListResponseDto = orderQueryService.getMyOrders(memberId, pageable);
         return ApiResponse.onSuccess(pagingOrderListResponseDto);
     }
 

src/main/java/com/jajaja/domain/order/dto/response/OrderItemProductDto.java

@@ -18,7 +18,7 @@ public static OrderItemProductDto from(OrderProduct orderProduct) {
                 .image(orderProduct.getProduct().getImageUrl())
                 .store(orderProduct.getProduct().getStore())
                 .name(orderProduct.getProduct().getName())
-                .option(orderProduct.getProductOption().getName())
+                .option(orderProduct.getProductOption() == null ? null : orderProduct.getProductOption().getName())
                 .quantity(orderProduct.getQuantity())
                 .build();
     }