Skip to content

WEB - MdnStatus 누락 과 서버 에러 사항 수정 #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jun950829 merged 1 commit into from
May 4, 2025
Merged

WEB - MdnStatus 누락 과 서버 에러 사항 수정 #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tracky-web/src/main/java/kernel360/trackyweb/car/application/CarService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
11 changes: 11 additions & 0 deletions tracky-web/src/main/java/kernel360/trackyweb/car/domain/MdnStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
) { }

1 change: 1 addition & 0 deletions ...java/kernel360/trackyweb/car/infrastructure/repository/CarDomainRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/kernel360/trackyweb/rent/infrastructure/repository/RentRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public List<RentEntity> 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)
)
Expand Down