diff --git a/tracky-web/src/main/java/kernel360/trackyweb/car/application/CarService.java b/tracky-web/src/main/java/kernel360/trackyweb/car/application/CarService.java index c748ee20..430c9611 100644 --- a/tracky-web/src/main/java/kernel360/trackyweb/car/application/CarService.java +++ b/tracky-web/src/main/java/kernel360/trackyweb/car/application/CarService.java @@ -23,10 +23,8 @@ import kernel360.trackyweb.car.application.dto.response.CarResponse; import kernel360.trackyweb.car.application.dto.response.MdnWithBizResponse; import kernel360.trackyweb.car.domain.provider.CarDomainProvider; -import kernel360.trackyweb.car.domain.provider.MdnStatus; import kernel360.trackyweb.car.infrastructure.util.ExcelGenerator; import kernel360.trackyweb.common.sse.GlobalSseEvent; -import kernel360.trackyweb.dashboard.domain.CarStatus; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/tracky-web/src/main/java/kernel360/trackyweb/car/domain/MdnStatus.java b/tracky-web/src/main/java/kernel360/trackyweb/car/domain/MdnStatus.java new file mode 100644 index 00000000..bfc4efd0 --- /dev/null +++ b/tracky-web/src/main/java/kernel360/trackyweb/car/domain/MdnStatus.java @@ -0,0 +1,11 @@ +package kernel360.trackyweb.car.domain; + + +import kernel360.trackycore.core.domain.entity.enums.CarStatus; + +public record MdnStatus( + String mdn, + String carPlate, + CarStatus status +) { } + diff --git a/tracky-web/src/main/java/kernel360/trackyweb/car/infrastructure/repository/CarDomainRepositoryCustomImpl.java b/tracky-web/src/main/java/kernel360/trackyweb/car/infrastructure/repository/CarDomainRepositoryCustomImpl.java index 95633c73..418c9cf9 100644 --- a/tracky-web/src/main/java/kernel360/trackyweb/car/infrastructure/repository/CarDomainRepositoryCustomImpl.java +++ b/tracky-web/src/main/java/kernel360/trackyweb/car/infrastructure/repository/CarDomainRepositoryCustomImpl.java @@ -2,6 +2,7 @@ import static kernel360.trackycore.core.domain.entity.QBizEntity.*; import static kernel360.trackycore.core.domain.entity.QCarEntity.*; +import static kernel360.trackycore.core.domain.entity.QRentEntity.*; import java.time.LocalDateTime; import java.util.List; diff --git a/tracky-web/src/main/java/kernel360/trackyweb/rent/infrastructure/repository/RentRepositoryCustomImpl.java b/tracky-web/src/main/java/kernel360/trackyweb/rent/infrastructure/repository/RentRepositoryCustomImpl.java index e9b43214..7d7155dc 100644 --- a/tracky-web/src/main/java/kernel360/trackyweb/rent/infrastructure/repository/RentRepositoryCustomImpl.java +++ b/tracky-web/src/main/java/kernel360/trackyweb/rent/infrastructure/repository/RentRepositoryCustomImpl.java @@ -121,7 +121,7 @@ public List findOverlappingRent(String mdn, LocalDateTime start, Loc .selectFrom(rent) .where( rent.car.mdn.eq(mdn), - rent.rentStatus.notIn("CANCELED", "DELETED"), + rent.rentStatus.notIn(RentStatus.CANCELED, RentStatus.DELETED), rent.rentStime.lt(end), rent.rentEtime.gt(start) )