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 @@ -14,11 +14,6 @@ public class BizProvider {

private final BizRepository bizRepository;

public BizEntity getBiz(Long id) {
return bizRepository.findById(id)
.orElseThrow(() -> GlobalException.throwError(ErrorCode.BIZ_NOT_FOUND));
}

public BizEntity getBiz(String bizUuid) {
return bizRepository.findByBizUuid(bizUuid)
.orElseThrow(() -> GlobalException.throwError(ErrorCode.BIZ_NOT_FOUND));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ public ApiResponse<CarDetailResponse> searchOne(String mdn) {
* @return 등록 성공한 차량 detail
*/
@Transactional
public ApiResponse<CarDetailResponse> create(CarCreateRequest carCreateRequest) {
public ApiResponse<CarDetailResponse> create(String bizUuid, CarCreateRequest carCreateRequest) {
DeviceEntity device = deviceProvider.getDevice(1L);

// device 세팅 넣은 car 객체 <- 임시로 모든 차량은 device 세팅 1번
BizEntity biz = bizProvider.getBiz(1L);
BizEntity biz = bizProvider.getBiz(bizUuid);

carProvider.existsByMdnOps(carCreateRequest.mdn());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,14 @@ public Page<CarEntity> searchCarByFilter(
}

public CarEntity update(CarEntity car) {

globalSseEvent.sendEvent(SseEvent.CAR_UPDATED);

return carDomainRepository.save(car);
}

public CarEntity save(CarEntity car) {

globalSseEvent.sendEvent(SseEvent.CAR_CREATED);

return carDomainRepository.save(car);
}

public void delete(String mdn) {
globalSseEvent.sendEvent(SseEvent.CAR_DELETED);

carDomainRepository.deleteByMdn(mdn);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public List<String> findAllMdnByBizId(String bizUuid) {
@Override
public Page<CarEntity> searchCarByFilter(String bizUuid, String search, CarStatus status, CarType carType,
Pageable pageable) {



BooleanBuilder builder = new BooleanBuilder()
.and(carEntity.biz.bizUuid.eq(bizUuid))
.and(isContainsCarMdnOrCarPlate(search))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ApiResponse<List<CarResponse>> getAllBySearchFilter(
ApiResponse<CarDetailResponse> searchOne(@PathVariable String mdn);

@Operation(summary = "차량 신규 등록", description = "차량 신규 등록 API")
ApiResponse<CarDetailResponse> create(@RequestBody CarCreateRequest carCreateRequest);
ApiResponse<CarDetailResponse> create(@RequestBody CarCreateRequest carCreateRequest, @Schema(hidden = true) @AuthenticationPrincipal MemberPrincipal memberPrincipal);

@Operation(summary = "차량 정보 수정", description = "차량 정보를 수정하는 API")
ApiResponse<CarDetailResponse> update(@RequestBody CarUpdateRequest carUpdateRequest);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ public ApiResponse<CarDetailResponse> searchOne(

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

@PatchMapping("")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,10 @@ public ApiResponse<Statistics> getStatistics() {
public ApiResponse<String> updateStatusToReturn(@PathVariable String rentUuid) {
return dashBoardService.updateStatusToReturn(rentUuid);
}

@GetMapping("/geo")
public ApiResponse<Map<String, Integer>> getGeoData() {
Map<String, Integer> geoMap = dashBoardService.getGeoData();
return ApiResponse.success(geoMap);
}
}