Skip to content

[DEPLOY] v.43.1 1학기용 map에 나타낼 정보 수정 #261

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
BAEK0111 merged 2 commits into from
Feb 21, 2026
Merged

[DEPLOY] v.43.1 1학기용 map에 나타낼 정보 수정 #261

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
a5d644a
refactor/#249
BAEK0111 Feb 9, 2026
8ed04fb
Merge pull request #250 from ASSU-dev/refactor/#249-jw-refactor
BAEK0111 Feb 21, 2026
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
13 changes: 13 additions & 0 deletions src/main/java/com/assu/server/domain/map/controller/MapController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,19 @@ public BaseResponse<?> getLocations(
};
}

@Operation(
summary = "주변 장소 조회 API",
description = "공간 인덱싱에 들어갈 좌표 4개를 경도, 위도 순서로 입력해주세요 (user -> store 조회 / admin -> partner 조회 / partner -> admin 조회)"
)
@GetMapping("/nearby/v2")
public BaseResponse<?> getLocationsV2(
@ModelAttribute MapRequestDTO.ViewOnMapDTO viewport,
@AuthenticationPrincipal PrincipalDetails pd
) {
Long memberId = pd.getMember().getId();
return BaseResponse.onSuccess(SuccessStatus._OK, mapService.getStoresV2(viewport, memberId));
}

@Operation(
summary = "검색어 기반 장소 조회 API",
description = "검색어를 입력해주세요. (user → store 전체조회 / admin → partner 전체조회 / partner → admin 전체조회)"
Expand Down
29 changes: 29 additions & 0 deletions 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 @@ -70,6 +70,35 @@ public static class StoreMapResponseDTO {
private String phoneNumber;
}

@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public static class StoreMapResponseV2DTO {
private Long storeId;
private Long adminId;
private String adminName;
private String name;
private String address;
private Integer rate;
private CriterionType criterionType;
private OptionType optionType;
private Integer people;
private Long cost;
private String category;
private String note;
private Long discountRate;
private boolean hasPartner;
private Double latitude;
private Double longitude;
private String profileUrl;
private String phoneNumber;
private String partner1;
private String partner2;
private String benefit1;
private String benefit2;
}

@Getter @NoArgsConstructor @AllArgsConstructor @Builder
public static class PlaceSuggestionDTO {
private String placeId; // kakao place id
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/assu/server/domain/map/service/MapService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public interface MapService {
List<MapResponseDTO.AdminMapResponseDTO> getAdmins(MapRequestDTO.ViewOnMapDTO viewport, Long memberId);
List<MapResponseDTO.PartnerMapResponseDTO> getPartners(MapRequestDTO.ViewOnMapDTO viewport, Long memberId);
List<MapResponseDTO.StoreMapResponseDTO> getStores(MapRequestDTO.ViewOnMapDTO viewport, Long memberId);
List<MapResponseDTO.StoreMapResponseV2DTO> getStoresV2(MapRequestDTO.ViewOnMapDTO viewport, Long memberId);

List<MapResponseDTO.StoreMapResponseDTO> searchStores(String keyword);
List<MapResponseDTO.PartnerMapResponseDTO> searchPartner(String keyword, Long memberId);
Expand Down
132 changes: 132 additions & 0 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 @@ -19,6 +19,8 @@
import com.assu.server.domain.partnership.repository.PaperRepository;
import com.assu.server.domain.store.entity.Store;
import com.assu.server.domain.store.repository.StoreRepository;
import com.assu.server.domain.user.entity.UserPaper;
import com.assu.server.domain.user.repository.UserPaperRepository;
import com.assu.server.global.apiPayload.code.status.ErrorStatus;
import com.assu.server.global.config.KakaoLocalClient;
import com.assu.server.global.exception.DatabaseException;
Expand All @@ -36,6 +38,8 @@
import java.util.List;
import java.util.stream.Collectors;

import static reactor.core.publisher.Mono.when;

@Service
@RequiredArgsConstructor
public class MapServiceImpl implements MapService {
Expand All @@ -48,6 +52,7 @@ public class MapServiceImpl implements MapService {
private final GeometryFactory geometryFactory;
private final GoodsRepository goodsRepository;
private final AmazonS3Manager amazonS3Manager;
private final UserPaperRepository userPaperRepository;

@Override
public List<MapResponseDTO.PartnerMapResponseDTO> getPartners(MapRequestDTO.ViewOnMapDTO viewport, Long memberId) {
Expand Down Expand Up @@ -172,6 +177,133 @@ public List<MapResponseDTO.StoreMapResponseDTO> getStores(MapRequestDTO.ViewOnMa
}).toList();
}

@Override
public List<MapResponseDTO.StoreMapResponseV2DTO> getStoresV2(MapRequestDTO.ViewOnMapDTO viewport, Long memberId) {
final String wkt = toWKT(viewport);
final List<Store> stores = storeRepository.findAllWithinViewport(wkt);
final List<UserPaper> userPapers = userPaperRepository.findActivePartnershipsByStudentId(memberId, java.time.LocalDate.now());

return stores.stream().map(s -> {
final boolean hasPartner = (s.getPartner() != null);

// 사용자의 제휴권으로 이 매장에서 받을 수 있는 혜택 수집 (최대 2개)
List<PaperContent> benefits = new java.util.ArrayList<>();
for (UserPaper userPaper : userPapers) {
if (benefits.size() >= 2) break;

Paper paper = userPaper.getPaper();
if (paper.getStore() != null && paper.getStore().getId().equals(s.getId())) {
PaperContent content = paperContentRepository.findLatestValidByStoreIdNative(
s.getId(),
ActivationStatus.ACTIVE.name(),
OptionType.SERVICE.name(),
OptionType.DISCOUNT.name(),
CriterionType.PRICE.name(),
CriterionType.HEADCOUNT.name()
).orElse(null);

if (content != null) {
benefits.add(content);
}
}
}

// 혜택 텍스트 생성
String partner1 = null;
String benefit1 = null;
String partner2 = null;
String benefit2 = null;

if (!benefits.isEmpty()) {
PaperContent content1 = benefits.get(0);
partner1 = content1.getPaper() != null && content1.getPaper().getPartner() != null
? content1.getPaper().getPartner().getName() : null;
benefit1 = generateBenefitText(content1);
}

if (benefits.size() > 1) {
PaperContent content2 = benefits.get(1);
partner2 = content2.getPaper() != null && content2.getPaper().getPartner() != null
? content2.getPaper().getPartner().getName() : null;
benefit2 = generateBenefitText(content2);
}

// admin 정보
final Long adminId = paperRepository.findTopPaperByStoreId(s.getId())
.map(p -> p.getAdmin() != null ? p.getAdmin().getId() : null)
.orElse(null);

String adminName = null;
if (adminId != null) {
final Admin admin = adminRepository.findById(adminId).orElse(null);
adminName = (admin != null ? admin.getName() : null);
}

// S3 presigned URL
final String key = (s.getPartner() != null && s.getPartner().getMember() != null)
? s.getPartner().getMember().getProfileUrl() : null;
final String profileUrl = (key != null && !key.isBlank())
? amazonS3Manager.generatePresignedUrl(key) : null;

// phoneNumber
final String phoneNumber = (s.getPartner() != null
&& s.getPartner().getMember() != null
&& s.getPartner().getMember().getPhoneNum() != null)
? s.getPartner().getMember().getPhoneNum()
: "";

return MapResponseDTO.StoreMapResponseV2DTO.builder()
.storeId(s.getId())
.adminId(adminId)
.adminName(adminName)
.name(s.getName())
.address(s.getAddress() != null ? s.getAddress() : s.getDetailAddress())
.rate(s.getRate())
.hasPartner(hasPartner)
.latitude(s.getLatitude())
.longitude(s.getLongitude())
.profileUrl(profileUrl)
.phoneNumber(phoneNumber)
.partner1(partner1)
.benefit1(benefit1)
.partner2(partner2)
.benefit2(benefit2)
.build();
}).toList();
}

private String generateBenefitText(PaperContent content) {
if (content == null) return null;

OptionType optionType = content.getOptionType();
CriterionType criterionType = content.getCriterionType();

if (optionType == OptionType.SERVICE) {
if (criterionType == CriterionType.PRICE) {
String cost = content.getCost() != null ? content.getCost().toString() : "-";
String gift = content.getCategory() != null ? content.getCategory() : "상품";
return cost + "원 이상 구매 시 " + gift + " 증정";
} else if (criterionType == CriterionType.HEADCOUNT) {
String people = content.getPeople() != null ? content.getPeople().toString() : "-";
String gift = content.getCategory() != null ? content.getCategory() : "상품";
return people + "명 이상 방문 시 " + gift + " 증정";
}
return "서비스 혜택";
} else if (optionType == OptionType.DISCOUNT) {
if (criterionType == CriterionType.PRICE) {
String cost = content.getCost() != null ? content.getCost().toString() : "-";
String rate = content.getDiscount() != null ? content.getDiscount().toString() : "-";
return cost + "원 이상 구매 시 " + rate + "% 할인";
} else if (criterionType == CriterionType.HEADCOUNT) {
String people = content.getPeople() != null ? content.getPeople().toString() : "-";
String rate = content.getDiscount() != null ? content.getDiscount().toString() : "-";
return people + "명 이상 방문 시 " + rate + "% 할인";
}
return "할인 혜택";
}
return null;
}

@Override
public List<MapResponseDTO.StoreMapResponseDTO> searchStores(String keyword) {
List<Store> stores = storeRepository.findByNameContainingIgnoreCaseOrderByIdDesc(keyword);
Expand Down