Skip to content

Refactor: add department filed #134

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
Jjiggu merged 2 commits into from
Jul 22, 2025
Merged

Refactor: add department filed #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88c6645
feat(Store): getStoreByStoreId 반환 타입 StorePageReadDto로 변경
Jjiggu Jul 22, 2025
33445b6
Merge remote-tracking branch 'origin/refactor/#132-add-department-fil…
Jjiggu Jul 22, 2025
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: 1 addition & 1 deletion nowait-app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public interface StoreService {

StoreDepartmentReadResponse getAllStoresByPageAndDeparments(Pageable pageable);

StoreReadDto getStoreByStoreId(Long storeId);
StorePageReadDto getStoreByStoreId(Long storeId);

List<StorePageReadDto> searchStoresByName(String name);

Expand Down
8 changes: 6 additions & 2 deletions ...app-user-api/src/main/java/com/nowait/applicationuser/store/service/StoreServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<StoreImage> images = storeImageRepository.findByStore(store);
List<StoreImageUploadResponse> imageDto = images.stream()
.map(StoreImageUploadResponse::fromEntity)
.toList();

return StoreReadDto.fromEntity(store, imageDto);
return StorePageReadDto.fromEntity(store, imageDto, departmentName);
}

@Override
Expand Down