Merge pull request #212 from SKY-HORSE-MAN-POWER/develop

[DEPLOYMENT] 입찰 시, 입찰자 필터링에 `auctionUuid` 추가
3-RACEHORSE · Jun 23, 2024 · 00e1b00 · 00e1b00
2 parents 8aa0a0d + 0751774
commit 00e1b00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/skyhorsemanpower/auction/application/impl/AuctionServiceImpl.java b/src/main/java/com/skyhorsemanpower/auction/application/impl/AuctionServiceImpl.java
@@ -196,7 +196,8 @@ private void isBiddingPossible(OfferBiddingPriceDto offerBiddingPriceDto, RoundI
         log.info("입찰 시간 통과");
 
         // 조건2. 해당 라운드에 참여 여부
-        checkBiddingRound(offerBiddingPriceDto.getBiddingUuid(), offerBiddingPriceDto.getRound());
+        checkBiddingRound(offerBiddingPriceDto.getAuctionUuid(), offerBiddingPriceDto.getBiddingUuid(),
+                offerBiddingPriceDto.getRound());
         log.info("현재 라운드에 참여한 적 없음");
 
         // 조건3. 남은 인원이 1 이상
@@ -208,8 +209,9 @@ private void isBiddingPossible(OfferBiddingPriceDto offerBiddingPriceDto, RoundI
         log.info("라운드 및 입찰가 통과");
     }
 
-    private void checkBiddingRound(String biddingUuid, int round) {
-        if (auctionHistoryRepository.findByBiddingUuidAndRound(biddingUuid, round).isPresent()) {
+    private void checkBiddingRound(String auctionUuid, String biddingUuid, int round) {
+        if (auctionHistoryRepository.findByAuctionUuidAndBiddingUuidAndRound(
+                auctionUuid, biddingUuid, round).isPresent()) {
             throw new CustomException(ResponseStatus.ALREADY_BID_IN_ROUND);
         }
     }

diff --git a/src/main/java/com/skyhorsemanpower/auction/repository/AuctionHistoryRepository.java b/src/main/java/com/skyhorsemanpower/auction/repository/AuctionHistoryRepository.java
@@ -23,7 +23,7 @@ public interface AuctionHistoryRepository extends MongoRepository<AuctionHistory
 
     List<AuctionHistory> findByAuctionUuidAndRoundOrderByBiddingTime(String auctionUuid, int round);
 
-    Optional<AuctionHistory> findByBiddingUuidAndRound(String biddingUuid, int round);
+    Optional<AuctionHistory> findByAuctionUuidAndBiddingUuidAndRound(String auctionUuid, String biddingUuid, int round);
 
     Optional<AuctionHistory> findFirstByAuctionUuidOrderByBiddingTimeDesc(String auctionUuid);
 }