From b1a3a10c60af862339037592737f0ed9a91f9d59 Mon Sep 17 00:00:00 2001 From: Cheon SeungJun <55969783+jun950829@users.noreply.github.com> Date: Thu, 8 May 2025 18:16:52 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20car=20=EC=83=9D=EC=84=B1=EC=8B=9C=20?= =?UTF-8?q?=EA=B3=A0=EC=A0=95=20bizid=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trackycore/core/domain/provider/BizProvider.java | 5 ----- .../kernel360/trackyweb/car/application/CarService.java | 4 ++-- .../trackyweb/car/domain/provider/CarDomainProvider.java | 8 -------- .../repository/CarDomainRepositoryCustomImpl.java | 3 +++ .../kernel360/trackyweb/car/presentation/CarApiDocs.java | 2 +- .../trackyweb/car/presentation/CarController.java | 5 +++-- .../dashboard/presentation/DashBoardController.java | 6 ++++++ 7 files changed, 15 insertions(+), 18 deletions(-) diff --git a/tracky-core/src/main/java/kernel360/trackycore/core/domain/provider/BizProvider.java b/tracky-core/src/main/java/kernel360/trackycore/core/domain/provider/BizProvider.java index 3fe7cee0..f1de1207 100644 --- a/tracky-core/src/main/java/kernel360/trackycore/core/domain/provider/BizProvider.java +++ b/tracky-core/src/main/java/kernel360/trackycore/core/domain/provider/BizProvider.java @@ -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)); 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 430c9611..ddf5f802 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 @@ -92,11 +92,11 @@ public ApiResponse searchOne(String mdn) { * @return 등록 성공한 차량 detail */ @Transactional - public ApiResponse create(CarCreateRequest carCreateRequest) { + public ApiResponse 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()); diff --git a/tracky-web/src/main/java/kernel360/trackyweb/car/domain/provider/CarDomainProvider.java b/tracky-web/src/main/java/kernel360/trackyweb/car/domain/provider/CarDomainProvider.java index f78404c2..1b804974 100644 --- a/tracky-web/src/main/java/kernel360/trackyweb/car/domain/provider/CarDomainProvider.java +++ b/tracky-web/src/main/java/kernel360/trackyweb/car/domain/provider/CarDomainProvider.java @@ -35,22 +35,14 @@ public Page 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); } 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 42d9b9e4..bc407274 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 @@ -48,6 +48,9 @@ public List findAllMdnByBizId(String bizUuid) { @Override public Page searchCarByFilter(String bizUuid, String search, CarStatus status, CarType carType, Pageable pageable) { + + + BooleanBuilder builder = new BooleanBuilder() .and(carEntity.biz.bizUuid.eq(bizUuid)) .and(isContainsCarMdnOrCarPlate(search)) diff --git a/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarApiDocs.java b/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarApiDocs.java index 1b8e34bc..91c77d0e 100644 --- a/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarApiDocs.java +++ b/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarApiDocs.java @@ -35,7 +35,7 @@ ApiResponse> getAllBySearchFilter( ApiResponse searchOne(@PathVariable String mdn); @Operation(summary = "차량 신규 등록", description = "차량 신규 등록 API") - ApiResponse create(@RequestBody CarCreateRequest carCreateRequest); + ApiResponse create(@RequestBody CarCreateRequest carCreateRequest, @Schema(hidden = true) @AuthenticationPrincipal MemberPrincipal memberPrincipal); @Operation(summary = "차량 정보 수정", description = "차량 정보를 수정하는 API") ApiResponse update(@RequestBody CarUpdateRequest carUpdateRequest); diff --git a/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarController.java b/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarController.java index ddc48868..8224e5f8 100644 --- a/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarController.java +++ b/tracky-web/src/main/java/kernel360/trackyweb/car/presentation/CarController.java @@ -63,9 +63,10 @@ public ApiResponse searchOne( @PostMapping("") public ApiResponse create( - @RequestBody CarCreateRequest carCreateRequest + @RequestBody CarCreateRequest carCreateRequest, + @Schema(hidden = true) @AuthenticationPrincipal MemberPrincipal memberPrincipal ) { - return carService.create(carCreateRequest); + return carService.create(memberPrincipal.bizUuid(), carCreateRequest); } @PatchMapping("") diff --git a/tracky-web/src/main/java/kernel360/trackyweb/dashboard/presentation/DashBoardController.java b/tracky-web/src/main/java/kernel360/trackyweb/dashboard/presentation/DashBoardController.java index 9e94d031..02d5b3b6 100644 --- a/tracky-web/src/main/java/kernel360/trackyweb/dashboard/presentation/DashBoardController.java +++ b/tracky-web/src/main/java/kernel360/trackyweb/dashboard/presentation/DashBoardController.java @@ -47,4 +47,10 @@ public ApiResponse getStatistics() { public ApiResponse updateStatusToReturn(@PathVariable String rentUuid) { return dashBoardService.updateStatusToReturn(rentUuid); } + + @GetMapping("/geo") + public ApiResponse> getGeoData() { + Map geoMap = dashBoardService.getGeoData(); + return ApiResponse.success(geoMap); + } }