From 7d0004a51b7c29f6fe163f44b73e5886ed0d10ee Mon Sep 17 00:00:00 2001
From: klkim1913 <49425719+klkim1913@users.noreply.github.com>
Date: Tue, 15 Aug 2023 16:18:40 +0900
Subject: [PATCH] Fix/invalid member (#114)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: AuctionService nickname 검사없이 NULL가져오던거 수정

* Fix: AuctionService nickname 검사없이 NULL가져오던거 수정
---
 .../exception/GlobalExceptionHandler.java     |  2 --
 .../anywayclear/service/AuctionService.java   | 20 ++++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/anywayclear/exception/GlobalExceptionHandler.java b/src/main/java/com/anywayclear/exception/GlobalExceptionHandler.java
index 2ba809d..c3e0dce 100644
--- a/src/main/java/com/anywayclear/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/anywayclear/exception/GlobalExceptionHandler.java
@@ -6,8 +6,6 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
-import javax.validation.ConstraintViolationException;
-
 import java.sql.SQLIntegrityConstraintViolationException;
 
 import static com.anywayclear.exception.ExceptionCode.*;
diff --git a/src/main/java/com/anywayclear/service/AuctionService.java b/src/main/java/com/anywayclear/service/AuctionService.java
index 66786b0..3b8aa10 100644
--- a/src/main/java/com/anywayclear/service/AuctionService.java
+++ b/src/main/java/com/anywayclear/service/AuctionService.java
@@ -56,20 +56,22 @@ public BiddingResponse Bidding(long auctionId, String consumerId, BiddingRequest
     @Transactional
     public void checkAuctionFinished(long auctionId) {
         Auction auction = auctionRepository.findById(auctionId).orElseThrow(() -> new CustomException(INVALID_AUCTION_ID));
-        Member consumer = memberRepository.findByNickname(auction.getNickname()).orElseThrow(()->new CustomException(INVALID_MEMBER));
         Produce produce = auction.getProduce();
         if (produce.getStatus() == 1 && !auction.isClosed() && LocalDateTime.now().isAfter(auction.getLastBidding().plusMinutes(4))) {
             auction.setClosed(true);
             produce.setEndDate(auction.getUpdatedAt());
 //            produce.setEa(produce.getEa() - 1);
-            DealCreateRequest dealCreateRequest = DealCreateRequest.builder()
-                    .endPrice(auction.getPrice())
-                    .produce(produce)
-                    .seller(produce.getSeller())
-                    .consumer(consumer)
-                    .build();
-            dealService.createDeal(dealCreateRequest);
-                    produce.setStatus(2);
+            if(!produce.getStartDate().equals(auction.getLastBidding())) {
+                Member consumer = memberRepository.findByNickname(auction.getNickname()).orElseThrow(() -> new CustomException(INVALID_MEMBER));
+                DealCreateRequest dealCreateRequest = DealCreateRequest.builder()
+                        .endPrice(auction.getPrice())
+                        .produce(produce)
+                        .seller(produce.getSeller())
+                        .consumer(consumer)
+                        .build();
+                dealService.createDeal(dealCreateRequest);
+            }
+            produce.setStatus(2);
             for (Auction a : produce.getAuctionList()) {
                 if (!a.isClosed()) {
                     produce.setStatus(1);