Skip to content

[Fix/#96] 지역 코드 매칭 로직 개선 #97

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
lilloo04 merged 2 commits into from
Sep 19, 2025
Merged

[Fix/#96] 지역 코드 매칭 로직 개선 #97

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
4af693e
fix: 지역 코드 매칭 로직 개선 및 정규화 지원
lilloo04 Sep 19, 2025
82aae40
refactor: 지역 코드 정규화 로직 제거
lilloo04 Sep 19, 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
38 changes: 29 additions & 9 deletions src/main/java/com/comma/soomteum/domain/place/service/TatsCnctrService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,34 @@ public Mono<TatsCnctrResponse.TatsCnctrResponseDto> getCnctrRate(
log.info("[TatsCnctr] 혼잡도 조회 시작: title='{}', area={}, sigungu={}",
req.getTitle(), req.getAreacode(), req.getSigungucode());

return Mono.fromCallable(() ->
regionRepository.findByKorAreaCodeAndKorSigunguCode(
req.getAreacode(), req.getSigungucode())
.orElseThrow(() -> {
log.error("[TatsCnctr] 지역 코드 조회 실패: area={}, sigungu={}",
req.getAreacode(), req.getSigungucode());
return new CustomException(ErrorCode.REGION_NOT_FOUND);
})
)
return Mono.fromCallable(() -> {
String areaCode = req.getAreacode();
String sigunguCode = req.getSigungucode();

log.debug("[TatsCnctr] 입력 코드: areacode='{}', sigungucode='{}'", areaCode, sigunguCode);

// 1. 먼저 정확한 area/sigungu 코드로 조회
var region = regionRepository.findByKorAreaCodeAndKorSigunguCode(areaCode, sigunguCode);
if (region.isPresent()) {
log.debug("[TatsCnctr] 정확한 매칭 성공: {}", region.get().getName());
return region.get();
}

// 2. area 코드만으로 조회 시도
log.warn("[TatsCnctr] 정확한 지역 코드 매칭 실패, area 코드만으로 재시도: area={}, sigungu={}",
areaCode, sigunguCode);

var regionByArea = regionRepository.findByKorAreaCode(areaCode);
if (regionByArea.isPresent()) {
log.info("[TatsCnctr] area 코드로 지역 찾음: {}", regionByArea.get().getName());
return regionByArea.get();
}

// 3. 모든 시도 실패
log.error("[TatsCnctr] 지역 코드 조회 완전 실패: area={}, sigungu={}",
areaCode, sigunguCode);
throw new CustomException(ErrorCode.REGION_NOT_FOUND);
})
.subscribeOn(Schedulers.boundedElastic())

.flatMap(region -> {
Expand Down Expand Up @@ -162,4 +181,5 @@ private static boolean isRetryable(Throwable t) {
private static void qpIfPresent(UriBuilder b, String name, String value) {
if (value != null && !value.isBlank()) b.queryParam(name, value);
}

}
5 changes: 4 additions & 1 deletion src/main/java/com/comma/soomteum/domain/region/repository/RegionRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
public interface RegionRepository extends JpaRepository<Region, Long> {
@EntityGraph(attributePaths = "cnctrSigungus")
Optional<Region> findByKorAreaCodeAndKorSigunguCode(String korAreaCode, String korSigunguCode);


@EntityGraph(attributePaths = "cnctrSigungus")
Optional<Region> findByKorAreaCode(String korAreaCode);

Optional<Region> findByName(String name);
}