Skip to content

Commit 2be63ae

Browse files
authored
Merge pull request #174 from ASSU-org/refactor/#157-modify-apis
[Refactor/#157] 응답에 전화번호 추가
2 parents 6bb296e + da8e843 commit 2be63ae

File tree

6 files changed

+13
-0
lines changed

6 files changed

+13
-0
lines changed

src/main/java/com/assu/server/domain/admin/dto/AdminResponseDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ public static class RandomPartnerResponseDTO {
1717
private String partnerDetailAddress;
1818
private String partnerName;
1919
private String partnerUrl;
20+
private String partnerPhone;
2021
}
2122
}

src/main/java/com/assu/server/domain/admin/service/AdminServiceImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long admin
5858
.partnerAddress(picked.getAddress())
5959
.partnerDetailAddress(picked.getDetailAddress())
6060
.partnerUrl(picked.getMember().getProfileUrl())
61+
.partnerPhone(picked.getMember().getPhoneNum())
6162
.build();
6263
}
6364

src/main/java/com/assu/server/domain/map/dto/MapResponseDTO.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static class PartnerMapResponseDTO {
2424
private Double latitude;
2525
private Double longitude;
2626
private String profileUrl;
27+
private String phoneNumber;
2728
}
2829

2930
@Getter
@@ -41,6 +42,7 @@ public static class AdminMapResponseDTO {
4142
private Double latitude;
4243
private Double longitude;
4344
private String profileUrl;
45+
private String phoneNumber;
4446
}
4547

4648
@Getter
@@ -64,6 +66,7 @@ public static class StoreMapResponseDTO {
6466
private Double latitude;
6567
private Double longitude;
6668
private String profileUrl;
69+
private String phoneNumber;
6770

6871
}
6972

src/main/java/com/assu/server/domain/map/service/MapServiceImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public List<MapResponseDTO.PartnerMapResponseDTO> getPartners(MapRequestDTO.View
7373
.latitude(p.getLatitude())
7474
.longitude(p.getLongitude())
7575
.profileUrl(url)
76+
.phoneNumber(p.getMember().getPhoneNum())
7677
.build();
7778
}).toList();
7879
}
@@ -100,6 +101,7 @@ public List<MapResponseDTO.AdminMapResponseDTO> getAdmins(MapRequestDTO.ViewOnMa
100101
.latitude(a.getLatitude())
101102
.longitude(a.getLongitude())
102103
.profileUrl(url)
104+
.phoneNumber(a.getMember().getPhoneNum())
103105
.build();
104106
}).toList();
105107
}
@@ -160,6 +162,7 @@ public List<MapResponseDTO.StoreMapResponseDTO> getStores(MapRequestDTO.ViewOnMa
160162
.latitude(s.getLatitude())
161163
.longitude(s.getLongitude())
162164
.profileUrl(profileUrl)
165+
.phoneNumber(s.getPartner().getMember().getPhoneNum())
163166
.build();
164167
}).toList();
165168
}
@@ -220,6 +223,7 @@ else if (content.getOptionType() == OptionType.SERVICE) {
220223
.latitude(s.getLatitude())
221224
.longitude(s.getLongitude())
222225
.profileUrl(url)
226+
.phoneNumber(s.getPartner().getMember().getPhoneNum())
223227
.build();
224228
}).toList();
225229
}
@@ -247,6 +251,7 @@ public List<MapResponseDTO.PartnerMapResponseDTO> searchPartner(String keyword,
247251
.latitude(p.getLatitude())
248252
.longitude(p.getLongitude())
249253
.profileUrl(url)
254+
.phoneNumber(p.getMember().getPhoneNum())
250255
.build();
251256
}).toList();
252257
}
@@ -274,6 +279,7 @@ public List<MapResponseDTO.AdminMapResponseDTO> searchAdmin(String keyword, Long
274279
.latitude(a.getLatitude())
275280
.longitude(a.getLongitude())
276281
.profileUrl(url)
282+
.phoneNumber(a.getMember().getPhoneNum())
277283
.build();
278284
}).toList();
279285
}

src/main/java/com/assu/server/domain/partner/dto/PartnerResponseDTO.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,6 @@ public static class AdminLiteDTO {
2727
private String adminDetailAddress;
2828
private String adminName;
2929
private String adminUrl;
30+
private String adminPhone;
3031
}
3132
}

src/main/java/com/assu/server/domain/partner/service/PartnerServiceImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public PartnerResponseDTO.RandomAdminResponseDTO getRandomAdmin(Long partnerId)
4848
.adminDetailAddress(a.getDetailAddress())
4949
.adminName(a.getName())
5050
.adminUrl(a.getMember().getProfileUrl())
51+
.adminPhone(a.getMember().getPhoneNum())
5152
.build())
5253
.collect(Collectors.toList());
5354

0 commit comments

Comments
 (0)