From 169fa71204fb64a7c9d5e6ff15d3e288a16a49db Mon Sep 17 00:00:00 2001 From: MiN <81948815+leesumin0526@users.noreply.github.com> Date: Sun, 28 Sep 2025 23:52:03 +1000 Subject: [PATCH 1/2] =?UTF-8?q?[REFACTOR/#157]=20-=20=EC=A0=84=ED=99=94?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=9D=91=EB=8B=B5=EC=97=90=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/assu/server/domain/admin/dto/AdminResponseDTO.java | 1 + .../assu/server/domain/admin/service/AdminServiceImpl.java | 1 + .../java/com/assu/server/domain/map/dto/MapResponseDTO.java | 3 +++ .../com/assu/server/domain/map/service/MapServiceImpl.java | 6 ++++++ .../assu/server/domain/partner/dto/PartnerResponseDTO.java | 1 + .../server/domain/partner/service/PartnerServiceImpl.java | 1 + 6 files changed, 13 insertions(+) diff --git a/src/main/java/com/assu/server/domain/admin/dto/AdminResponseDTO.java b/src/main/java/com/assu/server/domain/admin/dto/AdminResponseDTO.java index 13d0a26..6aa0df1 100644 --- a/src/main/java/com/assu/server/domain/admin/dto/AdminResponseDTO.java +++ b/src/main/java/com/assu/server/domain/admin/dto/AdminResponseDTO.java @@ -17,5 +17,6 @@ public static class RandomPartnerResponseDTO { private String partnerDetailAddress; private String partnerName; private String partnerUrl; + private String partnerPhone; } } diff --git a/src/main/java/com/assu/server/domain/admin/service/AdminServiceImpl.java b/src/main/java/com/assu/server/domain/admin/service/AdminServiceImpl.java index f0c5208..cfcdb41 100644 --- a/src/main/java/com/assu/server/domain/admin/service/AdminServiceImpl.java +++ b/src/main/java/com/assu/server/domain/admin/service/AdminServiceImpl.java @@ -58,6 +58,7 @@ public AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long admin .partnerAddress(picked.getAddress()) .partnerDetailAddress(picked.getDetailAddress()) .partnerUrl(picked.getMember().getProfileUrl()) + .partnerPhone(picked.getMember().getPhoneNum()) .build(); } diff --git a/src/main/java/com/assu/server/domain/map/dto/MapResponseDTO.java b/src/main/java/com/assu/server/domain/map/dto/MapResponseDTO.java index 8fc2b55..204352d 100644 --- a/src/main/java/com/assu/server/domain/map/dto/MapResponseDTO.java +++ b/src/main/java/com/assu/server/domain/map/dto/MapResponseDTO.java @@ -24,6 +24,7 @@ public static class PartnerMapResponseDTO { private Double latitude; private Double longitude; private String profileUrl; + private String phoneNumber; } @Getter @@ -41,6 +42,7 @@ public static class AdminMapResponseDTO { private Double latitude; private Double longitude; private String profileUrl; + private String phoneNumber; } @Getter @@ -64,6 +66,7 @@ public static class StoreMapResponseDTO { private Double latitude; private Double longitude; private String profileUrl; + private String phoneNumber; } diff --git a/src/main/java/com/assu/server/domain/map/service/MapServiceImpl.java b/src/main/java/com/assu/server/domain/map/service/MapServiceImpl.java index eeeee0c..0647116 100644 --- a/src/main/java/com/assu/server/domain/map/service/MapServiceImpl.java +++ b/src/main/java/com/assu/server/domain/map/service/MapServiceImpl.java @@ -73,6 +73,7 @@ public List getPartners(MapRequestDTO.View .latitude(p.getLatitude()) .longitude(p.getLongitude()) .profileUrl(url) + .phoneNumber(p.getMember().getPhoneNum()) .build(); }).toList(); } @@ -100,6 +101,7 @@ public List getAdmins(MapRequestDTO.ViewOnMa .latitude(a.getLatitude()) .longitude(a.getLongitude()) .profileUrl(url) + .phoneNumber(a.getMember().getPhoneNum()) .build(); }).toList(); } @@ -160,6 +162,7 @@ public List getStores(MapRequestDTO.ViewOnMa .latitude(s.getLatitude()) .longitude(s.getLongitude()) .profileUrl(profileUrl) + .phoneNumber(s.getPartner().getMember().getPhoneNum()) .build(); }).toList(); } @@ -220,6 +223,7 @@ else if (content.getOptionType() == OptionType.SERVICE) { .latitude(s.getLatitude()) .longitude(s.getLongitude()) .profileUrl(url) + .phoneNumber(s.getPartner().getMember().getPhoneNum()) .build(); }).toList(); } @@ -247,6 +251,7 @@ public List searchPartner(String keyword, .latitude(p.getLatitude()) .longitude(p.getLongitude()) .profileUrl(url) + .phoneNumber(p.getMember().getPhoneNum()) .build(); }).toList(); } @@ -274,6 +279,7 @@ public List searchAdmin(String keyword, Long .latitude(a.getLatitude()) .longitude(a.getLongitude()) .profileUrl(url) + .phoneNumber(a.getMember().getPhoneNum()) .build(); }).toList(); } diff --git a/src/main/java/com/assu/server/domain/partner/dto/PartnerResponseDTO.java b/src/main/java/com/assu/server/domain/partner/dto/PartnerResponseDTO.java index 82254bd..cdc2f2a 100644 --- a/src/main/java/com/assu/server/domain/partner/dto/PartnerResponseDTO.java +++ b/src/main/java/com/assu/server/domain/partner/dto/PartnerResponseDTO.java @@ -27,5 +27,6 @@ public static class AdminLiteDTO { private String adminDetailAddress; private String adminName; private String adminUrl; + private String adminPhone; } } diff --git a/src/main/java/com/assu/server/domain/partner/service/PartnerServiceImpl.java b/src/main/java/com/assu/server/domain/partner/service/PartnerServiceImpl.java index 265c0ea..f865fc2 100644 --- a/src/main/java/com/assu/server/domain/partner/service/PartnerServiceImpl.java +++ b/src/main/java/com/assu/server/domain/partner/service/PartnerServiceImpl.java @@ -48,6 +48,7 @@ public PartnerResponseDTO.RandomAdminResponseDTO getRandomAdmin(Long partnerId) .adminDetailAddress(a.getDetailAddress()) .adminName(a.getName()) .adminUrl(a.getMember().getProfileUrl()) + .adminPhone(a.getMember().getPhoneNum()) .build()) .collect(Collectors.toList()); From ececc1fa63814e397bdb68ae0a94c612f184dfc1 Mon Sep 17 00:00:00 2001 From: SJ Hwang Date: Mon, 29 Sep 2025 00:57:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Refactor/#169]=20-=20admin=EC=9D=B4=20BLAN?= =?UTF-8?q?K=EC=9D=98=20=ED=8C=8C=ED=8A=B8=EB=84=88=EC=9D=98=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EB=A5=BC=20=ED=99=95=EC=9D=B8=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/partnership/service/PartnershipServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java b/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java index aa3306a..0a744e7 100644 --- a/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java +++ b/src/main/java/com/assu/server/domain/partnership/service/PartnershipServiceImpl.java @@ -445,7 +445,7 @@ public PartnershipResponseDTO.AdminPartnershipWithPartnerResponseDTO checkPartne Partner partner = partnerRepository.findById(partnerId) .orElseThrow(() -> new DatabaseException(ErrorStatus.NO_SUCH_PARTNER)); - List targetStatuses = List.of(ActivationStatus.ACTIVE, ActivationStatus.SUSPEND); + List targetStatuses = List.of(ActivationStatus.ACTIVE, ActivationStatus.SUSPEND, ActivationStatus.BLANK); boolean isPartnered = paperRepository.existsByAdmin_IdAndPartner_IdAndIsActivatedIn(adminId, partnerId, targetStatuses); Long paperId = null;