Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,14 @@ public enum CarStatus {
CarStatus(String label) {
this.label = label;
}

public static CarStatus from(String value) {
if (value == null || value.isBlank())
return null;
try {
return CarStatus.valueOf(value.toUpperCase());
} catch (IllegalArgumentException e) {
return null;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,15 @@ public enum CarType {
CarType(String label) {
this.label = label;
}

public static CarType from(String value) {
if (value == null || value.isBlank())
return null;
try {
return CarType.valueOf(value.toUpperCase());
} catch (IllegalArgumentException e) {
return null;
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,14 @@ public enum RentStatus {
RentStatus(String label) {
this.label = label;
}

public static RentStatus from(String value) {
if (value == null || value.isBlank())
return null;
try {
return RentStatus.valueOf(value.toUpperCase());
} catch (IllegalArgumentException e) {
return null;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ public ApiResponse<List<CarResponse>> getAllBySearchFilter(String bizUuid,
Page<CarEntity> cars = carDomainProvider.searchCarByFilter(
bizUuid,
carSearchByFilterRequest.search(),
carSearchByFilterRequest.status(),
carSearchByFilterRequest.carType(),
carSearchByFilterRequest.toCarStatus(),
carSearchByFilterRequest.toCarType(),
carSearchByFilterRequest.toPageable());

Page<CarResponse> carResponses = cars.map(CarResponse::from);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

public record CarSearchByFilterRequest(
String search,
CarStatus status,
CarType carType,
String status,
String carType,
Integer page,
Integer size
) {
Expand All @@ -18,4 +18,12 @@ public Pageable toPageable() {
int safeSize = size != null ? size : 10;
return PageRequest.of(safePage, safeSize);
}

public CarStatus toCarStatus() {
return CarStatus.from(status);
}

public CarType toCarType() {
return CarType.from(carType);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,22 @@ public ApiResponse<CarDetailResponse> searchOne(
return carService.searchOne(mdn);
}

@PostMapping("")
@PostMapping()
public ApiResponse<CarDetailResponse> create(
@RequestBody CarCreateRequest carCreateRequest,
@Schema(hidden = true) @AuthenticationPrincipal MemberPrincipal memberPrincipal
) {
return carService.create(memberPrincipal.bizUuid(), carCreateRequest);
}

@PatchMapping("")
@PatchMapping()
public ApiResponse<CarDetailResponse> update(
@RequestBody CarUpdateRequest carUpdateRequest
) {
return carService.update(carUpdateRequest);
}

@DeleteMapping("")
@DeleteMapping()
public ApiResponse<CarDetailResponse> delete(
@RequestBody CarDeleteRequest carDeleteRequest
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public record RentSearchByFilterRequest(
String rentUuid,
String search,
RentStatus status,
String status,
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
LocalDate rentDate,
Integer page,
Expand All @@ -22,4 +22,9 @@ public Pageable toPageable() {
int safeSize = size != null ? size : 10;
return PageRequest.of(safePage, safeSize);
}

public RentStatus toRentStatus() {
return RentStatus.from(status);
}

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package kernel360.trackyweb.rent.infrastructure.repository;

import static kernel360.trackycore.core.domain.entity.QCarEntity.*;
import static kernel360.trackycore.core.domain.entity.QRentEntity.*;

import java.time.LocalDate;
Expand Down Expand Up @@ -71,9 +70,9 @@ public Page<RentEntity> searchRentByFilter(RentSearchByFilterRequest request, St
BooleanBuilder builder = new BooleanBuilder()
.and(rentEntity.car.biz.bizUuid.eq(bizUuid))
.and(isContainsRentUuid(request.rentUuid()))
.and(isEqualRentStatus(request.status()))
.and(isEqualRentStatus(request.toRentStatus()))
.and(isOverlapRentDate(request.rentDate()))
.and(isNotDeleted(request.status()));
.and(isNotDeleted(request.toRentStatus()));

JPAQuery<RentEntity> query = queryFactory
.selectFrom(rentEntity)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.