diff --git a/src/main/java/com/anywayclear/controller/ProduceController.java b/src/main/java/com/anywayclear/controller/ProduceController.java index 71969ea..f12e419 100644 --- a/src/main/java/com/anywayclear/controller/ProduceController.java +++ b/src/main/java/com/anywayclear/controller/ProduceController.java @@ -8,6 +8,7 @@ import com.anywayclear.entity.Produce; import com.anywayclear.service.AuctionService; import com.anywayclear.service.ProduceService; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -21,6 +22,7 @@ @RestController @RequestMapping("/api/produces") +@Slf4j //@Secured({"ROLE_CONSUMER", "ROLE_SELLER"}) public class ProduceController { private final ProduceService produceService; @@ -51,8 +53,8 @@ public ResponseEntity getProduce(@Positive @PathVariable("id") public ResponseEntity> getProduceList( @RequestParam(value = "userId", required = false) String sellerId, @RequestParam(required = false, defaultValue = "all") String filter, @RequestParam List statusNoList, Pageable pageable, @RequestParam(required = false, defaultValue = "") String name) { + log.debug("컨트롤러 전체조회 진입"); produceService.updateProduceStatus(); - return ResponseEntity.ok(produceService.getProducePage(statusNoList, pageable, name, sellerId, filter)); } diff --git a/src/main/java/com/anywayclear/service/ProduceService.java b/src/main/java/com/anywayclear/service/ProduceService.java index f143e55..4315f06 100644 --- a/src/main/java/com/anywayclear/service/ProduceService.java +++ b/src/main/java/com/anywayclear/service/ProduceService.java @@ -10,6 +10,7 @@ import com.anywayclear.repository.AuctionRepository; import com.anywayclear.repository.MemberRepository; import com.anywayclear.repository.ProduceRepository; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -21,6 +22,7 @@ import static com.anywayclear.exception.ExceptionCode.INVALID_PRODUCE_ID; @Service +@Slf4j public class ProduceService { private final ProduceRepository produceRepository; private final AuctionRepository auctionRepository; @@ -65,10 +67,12 @@ public MultiResponse getProducePage(List stat @Transactional public void updateProduceStatus() { + log.debug("농산물 상태 검사 시작"); for (Produce produce : produceRepository.findByStatus(1)) { for (Auction auction : produce.getAuctionList()) { auctionService.checkAuctionFinished(auction.getId()); } } + log.debug("농산물 상태 검사 종료"); } } diff --git a/src/main/java/com/anywayclear/util/AuctionScheduler.java b/src/main/java/com/anywayclear/util/AuctionScheduler.java index a0db4f5..bc9a16f 100644 --- a/src/main/java/com/anywayclear/util/AuctionScheduler.java +++ b/src/main/java/com/anywayclear/util/AuctionScheduler.java @@ -2,6 +2,7 @@ import com.anywayclear.entity.Produce; import com.anywayclear.repository.ProduceRepository; +import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -10,6 +11,7 @@ @Component @Transactional +@Slf4j public class AuctionScheduler { private final ProduceRepository produceRepository; @@ -17,8 +19,9 @@ public AuctionScheduler(ProduceRepository produceRepository) { this.produceRepository = produceRepository; } - @Scheduled(cron = "0 0/5 * * * ?", zone = "Asia/Seoul") + @Scheduled(cron = "0 0/1 * * * ?", zone = "Asia/Seoul") public void updateAuctionStatus() { + log.debug("스케줄링 시작"); for (Produce produce : produceRepository.findAll()) { if (produce.getStatus() == 0 && LocalDateTime.now().isAfter(produce.getStartDate())) { produce.setStatus(1);