Skip to content

[Deploy] v.34 지도 예외처리 수정 #214

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
sjhwang0 merged 2 commits into from
Oct 27, 2025
Merged

[Deploy] v.34 지도 예외처리 수정 #214

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
d33aa83
[Refactor/#169]
sjhwang0 Oct 27, 2025
5004a5c
Merge pull request #213 from ASSU-org/refactor/#169-update-partnershi…
sjhwang0 Oct 27, 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
1 change: 0 additions & 1 deletion src/main/java/com/assu/server/domain/map/dto/MapResponseDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ public static class StoreMapResponseDTO {
private Double longitude;
private String profileUrl;
private String phoneNumber;

}

@Getter @NoArgsConstructor @AllArgsConstructor @Builder
Expand Down
24 changes: 18 additions & 6 deletions src/main/java/com/assu/server/domain/map/service/MapServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ public List<MapResponseDTO.StoreMapResponseDTO> getStores(MapRequestDTO.ViewOnMa
: null;
final String profileUrl = (key != null ? amazonS3Manager.generatePresignedUrl(key) : null);

// phoneNumber null-safe 처리 (빈 문자열로 변환)
final String phoneNumber = (s.getPartner() != null
&& s.getPartner().getMember() != null
&& s.getPartner().getMember().getPhoneNum() != null)
? s.getPartner().getMember().getPhoneNum()
: "";

// 2-4) DTO 빌드 (content null 허용)
return MapResponseDTO.StoreMapResponseDTO.builder()
.storeId(s.getId())
Expand All @@ -162,7 +169,7 @@ public List<MapResponseDTO.StoreMapResponseDTO> getStores(MapRequestDTO.ViewOnMa
.latitude(s.getLatitude())
.longitude(s.getLongitude())
.profileUrl(profileUrl)
.phoneNumber(s.getPartner().getMember().getPhoneNum())
.phoneNumber(phoneNumber)
.build();
}).toList();
}
Expand All @@ -174,9 +181,7 @@ public List<MapResponseDTO.StoreMapResponseDTO> searchStores(String keyword) {
return stores.stream().map(s -> {
boolean hasPartner = s.getPartner() != null;
PaperContent content = paperContentRepository.findTopByPaperStoreIdOrderByIdDesc(s.getId())
.orElseThrow(
() -> new GeneralException(ErrorStatus.NO_SUCH_CONTENT)
);
.orElse(null);

String key = (s.getPartner() != null) ? s.getPartner().getMember().getProfileUrl() : null;
String url = amazonS3Manager.generatePresignedUrl(key);
Expand Down Expand Up @@ -206,9 +211,16 @@ else if (content.getOptionType() == OptionType.SERVICE) {
}
}

// phoneNumber null-safe 처리 (빈 문자열로 변환)
String phoneNumber = (s.getPartner() != null
&& s.getPartner().getMember() != null
&& s.getPartner().getMember().getPhoneNum() != null)
? s.getPartner().getMember().getPhoneNum()
: "";

return MapResponseDTO.StoreMapResponseDTO.builder()
.storeId(s.getId())
.adminName(admin.getName())
.adminName(admin != null ? admin.getName() : null)
.adminId(adminId)
.name(s.getName())
.address(s.getAddress() != null ? s.getAddress() : s.getDetailAddress())
Expand All @@ -223,7 +235,7 @@ else if (content.getOptionType() == OptionType.SERVICE) {
.latitude(s.getLatitude())
.longitude(s.getLongitude())
.profileUrl(url)
.phoneNumber(s.getPartner().getMember().getPhoneNum())
.phoneNumber(phoneNumber)
.build();
}).toList();
}
Expand Down