[Refactor]: 입찰 리팩토링

1. 메소드 기능별로 구분 (create, find/get, validation, update, helper)
2. 불필요한 entityManager/ 검증 메소드 제거
3. 결제관련 서비스 분리
4. rsData 정적 메소드 활용
5. status필드 String-> enum
6. 응답코드 문서화 개선
7. 테스트코드 수정

Author: Jiwoo-Seo

build.gradle.kts

@@ -73,9 +73,6 @@ dependencies {
 
 tasks.withType<Test> {
     useJUnitPlatform()
-    filter {
-        includeTestsMatching("com.backend.domain.member.controller.ApiV1MemberControllerTest")
-    }
 }
 
 // QueryDSL 설정 - 생성된 Q클래스들이 저장될 디렉토리 설정

src/main/java/com/backend/domain/bid/controller/ApiV1BidController.java

@@ -1,6 +1,7 @@
 package com.backend.domain.bid.controller;
 
 import com.backend.domain.bid.dto.*;
+import com.backend.domain.bid.service.BidPaymentService;
 import com.backend.domain.bid.service.BidService;
 import com.backend.domain.member.repository.MemberRepository;
 import com.backend.global.response.RsData;
@@ -26,85 +27,94 @@
 public class ApiV1BidController {
 
     private final BidService bidService;
+    private final BidPaymentService bidPaymentService;
     private final MemberRepository memberRepository;
 
     @Operation(summary = "입찰 생성", description = "특정 상품에 대해 입찰 생성.")
     @ApiResponses(value = {
-        @ApiResponse(responseCode = "200", description = "입찰 생성 성공",
-            content = @Content(schema = @Schema(implementation = RsData.class))),
-        @ApiResponse(responseCode = "400", description = "잘못된 요청",
-            content = @Content(schema = @Schema(implementation = RsData.class))),
-        @ApiResponse(responseCode = "401", description = "인증 실패",
-            content = @Content(schema = @Schema(implementation = RsData.class)))
+            @ApiResponse(responseCode = "201", description = "입찰 생성 성공",
+                    content = @Content(schema = @Schema(implementation = RsData.class))),
+            @ApiResponse(responseCode = "400", description = "잘못된 요청",
+                    content = @Content(schema = @Schema(implementation = RsData.class))),
+            @ApiResponse(responseCode = "401", description = "인증 실패",
+                    content = @Content(schema = @Schema(implementation = RsData.class)))
     })
     @PostMapping("/products/{productId}")
     public RsData<BidResponseDto> createBid(
             @Parameter(description = "상품 ID", required = true) @PathVariable Long productId,
             @Parameter(description = "입찰 요청 정보", required = true) @Valid @RequestBody BidRequestDto request,
             @Parameter(hidden = true) @AuthenticationPrincipal User user) {
-        // TODO: JWT 토큰에서 사용자 추출로직으로 대체
-        Long bidderId;
-        if (user != null) {
-            bidderId = Long.parseLong(user.getUsername());
-        } else {
-            // 테스트용: 인증이 없으면 첫 번째 사용자 사용
-            bidderId = 1L;
-        }
+        Long bidderId = extractMemberId(user);
         return bidService.createBid(productId, bidderId, request);
     }
 
     @Operation(summary = "입찰 현황 조회", description = "특정 상품의 현재 입찰 현황 조회.")
     @ApiResponses(value = {
-        @ApiResponse(responseCode = "200", description = "입찰 현황 조회 성공",
-            content = @Content(schema = @Schema(implementation = RsData.class))),
-        @ApiResponse(responseCode = "404", description = "상품을 찾을 수 없음",
-            content = @Content(schema = @Schema(implementation = RsData.class)))
+            @ApiResponse(responseCode = "200", description = "입찰 현황 조회 성공",
+                    content = @Content(schema = @Schema(implementation = RsData.class))),
+            @ApiResponse(responseCode = "404", description = "상품을 찾을 수 없음",
+                    content = @Content(schema = @Schema(implementation = RsData.class)))
     })
     @GetMapping("/products/{productId}")
     public RsData<BidCurrentResponseDto> getBidStatus(
-            @Parameter(description = "상품 ID", required = true) @PathVariable Long productId
-    ){
+            @Parameter(description = "상품 ID", required = true) @PathVariable Long productId) {
         return bidService.getBidStatus(productId);
     }
 
     @Operation(summary = "내 입찰 내역 조회", description = "현재 사용자의 입찰 내역을 페이지네이션으로 조회.")
     @ApiResponses(value = {
-        @ApiResponse(responseCode = "200", description = "내 입찰 내역 조회 성공",
-            content = @Content(schema = @Schema(implementation = RsData.class))),
-        @ApiResponse(responseCode = "401", description = "인증 실패",
-            content = @Content(schema = @Schema(implementation = RsData.class)))
+            @ApiResponse(responseCode = "200", description = "내 입찰 내역 조회 성공",
+                    content = @Content(schema = @Schema(implementation = RsData.class))),
+            @ApiResponse(responseCode = "401", description = "인증 실패",
+                    content = @Content(schema = @Schema(implementation = RsData.class)))
     })
     @GetMapping("/me")
     public RsData<MyBidResponseDto> getMyBids(
             @Parameter(description = "페이지 번호 (0부터 시작)", example = "0") @RequestParam(defaultValue = "0") int page,
             @Parameter(description = "페이지 크기", example = "10") @RequestParam(defaultValue = "10") int size,
-            @Parameter(hidden = true) @AuthenticationPrincipal User user
-    ){
-        // TODO: JWT 토큰에서 사용자 추출로직으로 대체
-        Long memberId = Long.parseLong(user.getUsername());
-        return bidService.getMyBids(memberId,page,size);
+            @Parameter(hidden = true) @AuthenticationPrincipal User user) {
+        Long memberId = extractMemberId(user);
+        return bidService.getMyBids(memberId, page, size);
     }
 
     @Operation(summary = "낙찰 결제", description = "내가 낙찰한 입찰 건에 대해 지갑에서 출금하고 결제 완료로 표시합니다.")
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "결제 성공",
+                    content = @Content(schema = @Schema(implementation = RsData.class))),
+            @ApiResponse(responseCode = "401", description = "인증 실패",
+                    content = @Content(schema = @Schema(implementation = RsData.class))),
+            @ApiResponse(responseCode = "403", description = "권한 없음",
+                    content = @Content(schema = @Schema(implementation = RsData.class)))
+    })
     @PostMapping("/{bidId}/pay")
     public RsData<BidPayResponseDto> payBid(
-            @PathVariable Long bidId,
-            @AuthenticationPrincipal User user
-    ) {
+            @Parameter(description = "입찰 ID", required = true) @PathVariable Long bidId,
+            @Parameter(hidden = true) @AuthenticationPrincipal User user) {
         if (user == null) {
             throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.");
         }
 
-        Long memberId;
+        Long memberId = extractMemberId(user);
+        return bidPaymentService.payForBid(memberId, bidId);
+    }
+
+    // ======================================= helper methods ======================================= //
+    private Long extractMemberId(User user) {
+        if (user == null) {
+            // 테스트용: 인증이 없으면 첫 번째 사용자 사용
+            return 1L;
+        }
+
         String username = user.getUsername();
         try {
-            memberId = Long.parseLong(username);
+            return Long.parseLong(username);
         } catch (NumberFormatException e) {
-            var me = memberRepository.findByEmail(username)
-                    .orElseThrow(() -> new ResponseStatusException(HttpStatus.UNAUTHORIZED, "유효하지 않은 인증 정보입니다."));
-            memberId = me.getId();
+            var member = memberRepository.findByEmail(username)
+                    .orElseThrow(() -> new ResponseStatusException(
+                            HttpStatus.UNAUTHORIZED,
+                            "유효하지 않은 인증 정보입니다."
+                    ));
+            return member.getId();
         }
-
-        return bidService.payForBid(memberId, bidId);
     }
 }

src/main/java/com/backend/domain/bid/dto/BidResponseDto.java

@@ -1,12 +1,15 @@
 package com.backend.domain.bid.dto;
 
+import com.backend.domain.bid.enums.BidStatus;
+
 import java.time.LocalDateTime;
 
-public record BidResponseDto (
+public record BidResponseDto(
         Long id,
         Long productId,
         Long bidderId,
         long price,
-        String status,
+        BidStatus status,
         LocalDateTime createDate
-) {}
+) {
+}

src/main/java/com/backend/domain/bid/dto/MyBidResponseDto.java

@@ -1,32 +1,37 @@
 package com.backend.domain.bid.dto;
 
+import com.backend.domain.bid.enums.BidStatus;
+
 import java.time.LocalDateTime;
 import java.util.List;
 
-public record MyBidResponseDto (
+public record MyBidResponseDto(
         List<MyBidItem> content,
         Integer totalElements,
         Integer totalPages,
         Integer currentPage,
         Integer pageSize,
         Boolean hasNext
-){
-    public record MyBidItem (
+) {
+    public record MyBidItem(
             Long bidId,
             Long productId,
             String productName,
             String thumbnailUrl,
             Long myBidPrice,
             Long currentPrice,
-            String status,
+            BidStatus status,
             Boolean isWinning,
             LocalDateTime bidTime,
             LocalDateTime endTime,
             String productStatus,
             SellerInfo Seller
-    ) {}
-    public record SellerInfo (
+    ) {
+    }
+
+    public record SellerInfo(
             Long id,
             String nickname
-    ) {}
+    ) {
+    }
 }

src/main/java/com/backend/domain/bid/dto/ProductCurrentPriceDto.java

@@ -0,0 +1,6 @@
+package com.backend.domain.bid.dto;
+
+public interface ProductCurrentPriceDto {
+    Long getProductId();
+    Long getCurrentPrice();
+}

src/main/java/com/backend/domain/bid/entity/Bid.java

@@ -1,5 +1,6 @@
 package com.backend.domain.bid.entity;
 
+import com.backend.domain.bid.enums.BidStatus;
 import com.backend.domain.member.entity.Member;
 import com.backend.domain.product.entity.Product;
 import com.backend.global.jpa.entity.BaseEntity;
@@ -10,7 +11,8 @@
 
 @Entity
 @Table(name = "bids")
-@Getter @Setter
+@Getter
+@Setter
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
@@ -19,8 +21,9 @@ public class Bid extends BaseEntity {
     @Column(name = "bid_price", nullable = false)
     private Long bidPrice;
 
+    @Enumerated(EnumType.STRING)
     @Column(nullable = false, length = 50)
-    private String status;
+    private BidStatus status;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "product_id")
@@ -35,4 +38,4 @@ public class Bid extends BaseEntity {
 
     @Column(name = "paid_amount")
     private Long paidAmount;
-}
+}

src/main/java/com/backend/domain/bid/enums/BidStatus.java

@@ -0,0 +1,20 @@
+package com.backend.domain.bid.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum BidStatus {
+    BIDDING("bidding", "입찰 중"),
+    WINNING("winning", "낙찰"),
+    LOSING("losing", "낙찰 실패"),
+    PAID("paid", "결제 완료"),
+    CANCELLED("cancelled", "취소됨");
+
+    private final String value;
+    private final String displayName;
+
+    BidStatus(String value, String displayName) {
+        this.value = value;
+        this.displayName = displayName;
+    }
+}

src/main/java/com/backend/domain/bid/repository/BidRepository.java

@@ -1,6 +1,8 @@
 package com.backend.domain.bid.repository;
 
+import com.backend.domain.bid.dto.ProductCurrentPriceDto;
 import com.backend.domain.bid.entity.Bid;
+import com.backend.domain.bid.enums.BidStatus;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -11,46 +13,52 @@
 import java.util.Optional;
 import java.util.Set;
 
-public interface BidRepository extends JpaRepository<Bid,Long> {
+public interface BidRepository extends JpaRepository<Bid, Long> {
     // 현재 최고 입찰가 조회
-    @Query("SELECT MAX(b.bidPrice) FROM Bid b WHERE b.product.id = :productId AND b.status = 'bidding'")
+    @Query("SELECT MAX(b.bidPrice) FROM Bid b WHERE b.product.id = :productId AND b.status = 'BIDDING'")
     Optional<Long> findHighestBidPrice(@Param("productId") Long productId);
+
     // 이미 입찰했는지 여부
-    @Query("SELECT COUNT(b)>0 FROM Bid b WHERE b.product.id = :productId AND b.member.id = :memberId AND b.status = 'bidding'")
-    boolean existsProductBid(@Param("productId") Long productId,@Param("memberId") Long memberId,@Param("status") String status);
+    boolean existsByProductIdAndMemberIdAndStatus(Long productId, Long memberId, BidStatus status);
+
     // 입찰 개수 조회
-    @Query("SELECT COUNT(b) FROM Bid b WHERE b.product.id = :productId AND b.status = 'bidding'")
+    @Query("SELECT COUNT(b) FROM Bid b WHERE b.product.id = :productId AND b.status = 'BIDDING'")
     Integer countProductBid(@Param("productId") Long productId);
+
     // 상품 입찰내역(페이징)
-    @Query("SELECT b FROM Bid b WHERE b.product.id = :productId AND b.status = 'bidding' ORDER BY b.createDate DESC")
+    @Query("SELECT b FROM Bid b WHERE b.product.id = :productId AND b.status = 'BIDDING' ORDER BY b.createDate DESC")
     Page<Bid> findAllBids(@Param("productId") Long productId, Pageable pageable);
+
     // 상품 입찰내역(상위 n개)
-    @Query("SELECT b FROM Bid b WHERE b.product.id = :productId AND b.status = 'bidding' ORDER BY b.createDate DESC LIMIT:limit")
+    @Query("SELECT b FROM Bid b WHERE b.product.id = :productId AND b.status = 'BIDDING' ORDER BY b.createDate DESC LIMIT :limit")
     List<Bid> findNBids(@Param("productId") Long productId, @Param("limit") Integer limit);
+
     // 내 입찰내역 조회
-    @Query("SELECT b FROM Bid b JOIN FETCH b.product p WHERE b.member.id = :memberId AND b.status = 'bidding' ORDER BY b.createDate DESC")
+    @Query("SELECT b FROM Bid b JOIN FETCH b.product p WHERE b.member.id = :memberId AND b.status = 'BIDDING' ORDER BY b.createDate DESC")
     Page<Bid> findMyBids(@Param("memberId") Long memberId, Pageable pageable);
+
     // 상품들 현재 최고 입찰가 조회
     @Query("""
-        SELECT b.product.id, MAX(b.bidPrice) 
-        FROM Bid b
-        WHERE b.product.id IN :productIds
-        AND b.status = 'bidding'
-        GROUP BY b.product.id
-        """)
-    List<Object[]> findCurrentPricesForProducts(@Param("productIds") Set<Long> productIds);
+            SELECT b.product.id AS productId, MAX(b.bidPrice) AS currentPrice
+            FROM Bid b
+            WHERE b.product.id IN :productIds
+            AND b.status = 'BIDDING'
+            GROUP BY b.product.id
+            """)
+    List<ProductCurrentPriceDto> findCurrentPricesForProducts(@Param("productIds") Set<Long> productIds);
+
     // 내가 최고 입찰자인 상품들
     @Query("""
-        SELECT b FROM Bid b
-        WHERE b.member.id = :memberId
-        AND b.status = 'bidding'
-        AND b.bidPrice = (
-                SELECT MAX(b2.bidPrice)
-                FROM Bid b2
-                WHERE b2.product.id = b.product.id
-                AND b2.status = 'bidding'
-                )
-        ORDER BY b.createDate DESC
-        """)
+            SELECT b FROM Bid b
+            WHERE b.member.id = :memberId
+            AND b.status = 'BIDDING'
+            AND b.bidPrice = (
+                    SELECT MAX(b2.bidPrice)
+                    FROM Bid b2
+                    WHERE b2.product.id = b.product.id
+                    AND b2.status = 'BIDDING'
+                    )
+            ORDER BY b.createDate DESC
+            """)
     List<Bid> findWinningBids(@Param("memberId") Long memberId);
 }