diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java index f8bf540a..3df99912 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java @@ -17,7 +17,7 @@ public interface StoreService { StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable pageable); - StoreReadDto getStoreByStoreId(Long storeId); + StorePageReadDto getStoreByStoreId(Long storeId); List searchStoresByName(String name); diff --git a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java index 566e91ea..8b9a5a5e 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java +++ b/nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java @@ -125,18 +125,22 @@ public StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable page @Override @Transactional(readOnly = true) - public StoreReadDto getStoreByStoreId(Long storeId) { + public StorePageReadDto getStoreByStoreId(Long storeId) { if (storeId == null) throw new StoreParamEmptyException(); Store store = storeRepository.findByStoreIdAndDeletedFalse(storeId) .orElseThrow(StoreNotFoundException::new); + String departmentName = departmentRepository.findById(store.getDepartmentId()) + .map(Department::getName) + .orElse("Unknown Department"); + List images = storeImageRepository.findByStore(store); List imageDto = images.stream() .map(StoreImageUploadResponse::fromEntity) .toList(); - return StoreReadDto.fromEntity(store, imageDto); + return StorePageReadDto.fromEntity(store, imageDto, departmentName); } @Override