사용하지 않는 초기데이터 세팅 제거

backend/ddang/script/prod-deploy-script.sh

@@ -4,17 +4,66 @@ ABSPATH=$(readlink -f $0) # /home/ubuntu/prod-deploy-script.sh
 ABSDIR=$(dirname $ABSPATH) # /home/ubuntu
 APPNAME="ddang-0.0.1-SNAPSHOT"
 APPDIR=${ABSDIR}/${APPNAME} # /home/ubuntu/ddang-0.0.1-SNAPSHOT
+PORT_A=8080
+PORT_B=8081
+DEFAULT_ACTUATOR_PORT=3000
+ANOTHER_ACTUATOR_PORT=3001
 
-echo "구동중인 애플리케이션을 확인합니다."
+if curl -s "http://localhost:${PORT_A}" > /dev/null
+then
+    green_port=${PORT_B}
+    blue_port=${PORT_A}
+else
+    green_port=${PORT_A}
+    blue_port=${PORT_B}
+fi
 
-CURRENT_PID=$(pgrep -f ${APPNAME}.jar) # ddang-0.0.1-SNAPSHOT.jar
+if curl -s "http://localhost:${green_port}" > /dev/null
+then
+  echo "그린 서버가 이미 동작 중입니다."
+  exit 255
+fi
 
-if [ ! -z ${CURRENT_PID} ]; then
-        echo "기존 애플리케이션이 실행중이므로 종료합니다."
-        kill -15 ${CURRENT_PID}
-        sleep 5
+if curl -s "http://localhost:${DEFAULT_ACTUATOR_PORT}" > /dev/null
+then
+    actuator_port=${ANOTHER_ACTUATOR_PORT}
+else
+    actuator_port=${DEFAULT_ACTUATOR_PORT}
 fi
 
-echo "애플리케이션을 실행합니다."
+echo "그린 서버를 실행합니다. port number: ${green_port}"
+
+nohup java -jar ${ABSDIR}/${APPNAME}.jar --server.port=${green_port} --spring.profiles.active=prod --management.server.port=${actuator_port} 1>> prod.log 2>> prod_error.log & # /home/ubuntu/ddang-0.0.1-SNAPSHOT.jar
+
+for retry_count in $(seq 10)
+do
+    if curl -s "http://localhost:${green_port}" > /dev/null
+    then
+        echo "Health check success ✅ port number: ${green_port}"
+        break
+    fi
+
+    if [ $retry_count -eq 10 ]
+    then
+        echo "Health check failed ❌ port number: ${green_port}"
+        exit 1
+    fi
 
-nohup java -jar ${ABSDIR}/${APPNAME}.jar --spring.profiles.active=prod 1>> prod.log 2>> prod_error.log & # /home/ubuntu/ddang-0.0.1-SNAPSHOT.jar
+    echo "서버가 아직 실행되지 않았습니다... 시도 횟수: ${retry_count}"
+    sleep 10
+done
+
+echo "set \$service_port ${green_port};" | sudo tee /etc/nginx/conf.d/service-port.inc
+echo "set \$actuator_port ${actuator_port};" | sudo tee /etc/nginx/conf.d/actuator-port.inc
+sudo systemctl restart nginx
+
+echo "블루 서버를 종료합니다. port number: ${blue_port}"
+fuser -s -k ${blue_port}/tcp
+
+if curl -s "http://localhost:${blue_port}" > /dev/null
+then
+    echo "블루 서버가 아직 종료되지 않았습니다... 시도 횟수: ${blue_port}"
+    sleep 10
+else
+    echo "블루 서버가 종료되었습니다. port number: ${blue_port}"
+fi

backend/ddang/src/main/java/com/ddang/ddang/auction/application/AuctionService.java

@@ -7,38 +7,39 @@
 import com.ddang.ddang.auction.application.exception.AuctionNotFoundException;
 import com.ddang.ddang.auction.application.exception.UserForbiddenException;
 import com.ddang.ddang.auction.domain.Auction;
-import com.ddang.ddang.auction.infrastructure.persistence.JpaAuctionRepository;
+import com.ddang.ddang.auction.domain.repository.AuctionRepository;
 import com.ddang.ddang.auction.presentation.dto.request.ReadAuctionSearchCondition;
 import com.ddang.ddang.category.application.exception.CategoryNotFoundException;
 import com.ddang.ddang.category.domain.Category;
-import com.ddang.ddang.category.infrastructure.persistence.JpaCategoryRepository;
+import com.ddang.ddang.category.domain.repository.CategoryRepository;
 import com.ddang.ddang.image.domain.AuctionImage;
 import com.ddang.ddang.image.domain.StoreImageProcessor;
 import com.ddang.ddang.image.domain.dto.StoreImageDto;
 import com.ddang.ddang.region.application.exception.RegionNotFoundException;
 import com.ddang.ddang.region.domain.AuctionRegion;
 import com.ddang.ddang.region.domain.Region;
-import com.ddang.ddang.region.infrastructure.persistence.JpaRegionRepository;
+import com.ddang.ddang.region.domain.repository.RegionRepository;
 import com.ddang.ddang.user.application.exception.UserNotFoundException;
 import com.ddang.ddang.user.domain.User;
-import com.ddang.ddang.user.infrastructure.persistence.JpaUserRepository;
-import java.time.LocalDateTime;
-import java.util.List;
+import com.ddang.ddang.user.domain.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
 public class AuctionService {
 
-    private final JpaUserRepository userRepository;
-    private final JpaAuctionRepository auctionRepository;
-    private final JpaRegionRepository regionRepository;
-    private final JpaCategoryRepository categoryRepository;
+    private final UserRepository userRepository;
+    private final AuctionRepository auctionRepository;
+    private final RegionRepository regionRepository;
+    private final CategoryRepository categoryRepository;
     private final StoreImageProcessor imageProcessor;
 
     @Transactional
@@ -79,7 +80,7 @@ private void validateAuctionRegions(final List<Region> thirdRegions) {
     }
 
     public ReadAuctionDto readByAuctionId(final Long auctionId) {
-        final Auction findAuction = auctionRepository.findAuctionById(auctionId)
+        final Auction findAuction = auctionRepository.findTotalAuctionById(auctionId)
                                                      .orElseThrow(() -> new AuctionNotFoundException(
                                                              "지정한 아이디에 대한 경매를 찾을 수 없습니다."
                                                      ));
@@ -91,8 +92,8 @@ public ReadAuctionsDto readAllByCondition(
             final Pageable pageable,
             final ReadAuctionSearchCondition readAuctionSearchCondition) {
         final Slice<Auction> auctions = auctionRepository.findAuctionsAllByCondition(
-                pageable,
-                readAuctionSearchCondition
+                readAuctionSearchCondition,
+                pageable
         );
 
         return ReadAuctionsDto.of(auctions, LocalDateTime.now());
@@ -112,7 +113,7 @@ public ReadAuctionsDto readAllByBidderId(final Long userId, final Pageable pagea
 
     @Transactional
     public void deleteByAuctionId(final Long auctionId, final Long userId) {
-        final Auction auction = auctionRepository.findAuctionById(auctionId)
+        final Auction auction = auctionRepository.findTotalAuctionById(auctionId)
                                                  .orElseThrow(() -> new AuctionNotFoundException(
                                                          "지정한 아이디에 대한 경매를 찾을 수 없습니다."
                                                  ));

backend/ddang/src/main/java/com/ddang/ddang/auction/application/dto/ReadAuctionDto.java

@@ -29,7 +29,8 @@ public record ReadAuctionDto(
         String sellerName,
         double sellerReliability,
         boolean isSellerDeleted,
-        AuctionStatus auctionStatus
+        AuctionStatus auctionStatus,
+        Long lastBidderId
 ) {
 
     public static ReadAuctionDto of(final Auction auction, final LocalDateTime targetTime) {
@@ -53,7 +54,8 @@ public static ReadAuctionDto of(final Auction auction, final LocalDateTime targe
                 auction.getSeller().getName(),
                 auction.getSeller().getReliability().getValue(),
                 auction.getSeller().isDeleted(),
-                auction.findAuctionStatus(targetTime)
+                auction.findAuctionStatus(targetTime),
+                convertLastBidderId(auction)
         );
     }
 
@@ -79,4 +81,12 @@ private static List<ReadRegionsDto> convertReadRegionsDto(final Auction auction)
                       .map(ReadRegionsDto::from)
                       .toList();
     }
+
+    private static Long convertLastBidderId(final Auction auction) {
+        if (auction.getLastBid() == null) {
+            return null;
+        }
+
+        return auction.getLastBid().getBidder().getId();
+    }
 }

backend/ddang/src/main/java/com/ddang/ddang/auction/application/dto/ReadChatRoomDto.java

@@ -1,4 +1,6 @@
 package com.ddang.ddang.auction.application.dto;
 
 public record ReadChatRoomDto(Long id, boolean isChatParticipant) {
+
+    public static ReadChatRoomDto CANNOT_CHAT_DTO = new ReadChatRoomDto(null, false);
 }

backend/ddang/src/main/java/com/ddang/ddang/auction/configuration/validator/ClosingTimeLimit.java

@@ -0,0 +1,19 @@
+package com.ddang.ddang.auction.configuration.validator;
+
+import jakarta.validation.Constraint;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = ClosingTimeValidator.class)
+public @interface ClosingTimeLimit {
+
+    String message() default "마감 시간은 현재 일자로부터 최대 30일까지 설정할 수 있습니다.";
+
+    Class[] groups() default {};
+
+    Class[] payload() default {};
+}

backend/ddang/src/main/java/com/ddang/ddang/auction/configuration/validator/ClosingTimeValidator.java

@@ -0,0 +1,22 @@
+package com.ddang.ddang.auction.configuration.validator;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+
+public class ClosingTimeValidator implements ConstraintValidator<ClosingTimeLimit, LocalDateTime> {
+
+    private static final int MAXIMUM_CLOSING_TIME_DAYS = 30;
+
+    @Override
+    public boolean isValid(final LocalDateTime target, final ConstraintValidatorContext context) {
+        if (target == null) {
+            return false;
+        }
+
+        final long days = ChronoUnit.DAYS.between(LocalDateTime.now(), target);
+
+        return days <= MAXIMUM_CLOSING_TIME_DAYS;
+    }
+}

backend/ddang/src/main/java/com/ddang/ddang/auction/infrastructure/persistence/dto/AuctionAndImageDto.java → backend/ddang/src/main/java/com/ddang/ddang/auction/domain/dto/AuctionAndImageDto.java

@@ -1,4 +1,4 @@
-package com.ddang.ddang.auction.infrastructure.persistence.dto;
+package com.ddang.ddang.auction.domain.dto;
 
 import com.ddang.ddang.auction.domain.Auction;
 import com.ddang.ddang.image.domain.AuctionImage;

backend/ddang/src/main/java/com/ddang/ddang/auction/domain/repository/AuctionAndImageRepository.java

@@ -0,0 +1,9 @@
+package com.ddang.ddang.auction.domain.repository;
+
+import com.ddang.ddang.auction.domain.dto.AuctionAndImageDto;
+import java.util.Optional;
+
+public interface AuctionAndImageRepository {
+
+    Optional<AuctionAndImageDto> findDtoByAuctionId(final Long auctionId);
+}

backend/ddang/src/main/java/com/ddang/ddang/auction/domain/repository/AuctionRepository.java

@@ -0,0 +1,33 @@
+package com.ddang.ddang.auction.domain.repository;
+
+import com.ddang.ddang.auction.domain.Auction;
+import com.ddang.ddang.auction.presentation.dto.request.ReadAuctionSearchCondition;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+
+public interface AuctionRepository {
+
+    Auction save(final Auction auction);
+
+    boolean existsById(final Long id);
+
+    Optional<Auction> findTotalAuctionById(final Long id);
+
+    Optional<Auction> findPureAuctionById(final Long id);
+
+    Slice<Auction> findAuctionsAllByCondition(
+            final ReadAuctionSearchCondition readAuctionSearchCondition,
+            final Pageable pageable
+    );
+
+    Slice<Auction> findAuctionsAllByUserId(final Long userId, final Pageable pageable);
+
+    Slice<Auction> findAuctionsAllByBidderId(final Long bidderId, final Pageable pageable);
+
+    boolean existsBySellerIdAndAuctionStatusIsOngoing(final Long userId, final LocalDateTime now);
+
+    boolean existsLastBidByUserIdAndAuctionStatusIsOngoing(final Long userId, final LocalDateTime now);
+}

backend/ddang/src/main/java/com/ddang/ddang/auction/infrastructure/persistence/AuctionRepositoryImpl.java

@@ -0,0 +1,71 @@
+package com.ddang.ddang.auction.infrastructure.persistence;
+
+import com.ddang.ddang.auction.domain.Auction;
+import com.ddang.ddang.auction.domain.repository.AuctionRepository;
+import com.ddang.ddang.auction.presentation.dto.request.ReadAuctionSearchCondition;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@RequiredArgsConstructor
+public class AuctionRepositoryImpl implements AuctionRepository {
+
+    private final JpaAuctionRepository jpaAuctionRepository;
+    private final QuerydslAuctionRepository querydslAuctionRepository;
+
+    @Override
+    public Auction save(final Auction auction) {
+        return jpaAuctionRepository.save(auction);
+    }
+
+    @Override
+    public boolean existsById(final Long id) {
+        return jpaAuctionRepository.existsById(id);
+    }
+
+    @Override
+    public Optional<Auction> findTotalAuctionById(final Long id) {
+        return jpaAuctionRepository.findTotalAuctionById(id);
+    }
+
+    @Override
+    public Optional<Auction> findPureAuctionById(final Long id) {
+        return jpaAuctionRepository.findPureAuctionById(id);
+    }
+
+    @Override
+    public Slice<Auction> findAuctionsAllByCondition(
+            final ReadAuctionSearchCondition readAuctionSearchCondition,
+            final Pageable pageable
+    ) {
+        return querydslAuctionRepository.findAuctionsAllByCondition(readAuctionSearchCondition, pageable);
+    }
+
+    @Override
+    public Slice<Auction> findAuctionsAllByUserId(final Long userId, final Pageable pageable) {
+        return querydslAuctionRepository.findAuctionsAllByUserId(userId, pageable);
+    }
+
+    @Override
+    public Slice<Auction> findAuctionsAllByBidderId(final Long bidderId, final Pageable pageable) {
+        return querydslAuctionRepository.findAuctionsAllByBidderId(bidderId, pageable);
+    }
+
+    @Override
+    public boolean existsBySellerIdAndAuctionStatusIsOngoing(final Long userId, final LocalDateTime now) {
+        return jpaAuctionRepository.existsBySellerIdAndDeletedIsFalseAndClosingTimeGreaterThanEqual(userId, now);
+    }
+
+    @Override
+    public boolean existsLastBidByUserIdAndAuctionStatusIsOngoing(final Long userId, final LocalDateTime now) {
+        return jpaAuctionRepository.existsByLastBidBidderIdAndDeletedIsFalseAndClosingTimeGreaterThanEqual(
+                userId,
+                now
+        );
+    }
+}

backend/ddang/src/main/java/com/ddang/ddang/auction/infrastructure/persistence/JpaAuctionRepository.java

@@ -2,10 +2,38 @@
 
 import com.ddang.ddang.auction.domain.Auction;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
+import java.time.LocalDateTime;
 import java.util.Optional;
 
-public interface JpaAuctionRepository extends JpaRepository<Auction, Long>, QuerydslAuctionRepository, QuerydslAuctionAndImageRepository {
+public interface JpaAuctionRepository extends JpaRepository<Auction, Long> {
 
-    Optional<Auction> findByIdAndDeletedIsFalse(final Long id);
+    @Query("""
+        SELECT a
+        FROM Auction a
+        LEFT JOIN FETCH a.auctionRegions ar
+        LEFT JOIN FETCh ar.thirdRegion tr
+        LEFT JOIN FETCH tr.firstRegion
+        LEFT JOIN FETCH tr.secondRegion
+        LEFT JOIN FETCH a.lastBid
+        JOIN FETCH a.subCategory sc
+        JOIN FETCH sc.mainCategory
+        JOIN FETCH a.seller
+        WHERE a.deleted = false AND a.id = :id
+    """)
+    Optional<Auction> findTotalAuctionById(final Long id);
+
+    @Query("SELECT a FROM Auction a WHERE a.deleted = false AND a.id = :id")
+    Optional<Auction> findPureAuctionById(final Long id);
+
+    boolean existsBySellerIdAndDeletedIsFalseAndClosingTimeGreaterThanEqual(
+            final Long userId,
+            final LocalDateTime now
+    );
+
+    boolean existsByLastBidBidderIdAndDeletedIsFalseAndClosingTimeGreaterThanEqual(
+            final Long userId,
+            final LocalDateTime now
+    );
 }