Skip to content

[TMO-62] 여행 거리 누적 계산 시 튜플 인덱스 오류 수정 #235

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
yuuuja merged 2 commits into from
Apr 24, 2025
Merged

[TMO-62] 여행 거리 누적 계산 시 튜플 인덱스 오류 수정 #235

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
0feb61e
[TMO-62] 여행 거리 누적 계산 시 튜플 인덱스 오류 수정
yuuuja Apr 23, 2025
1458071
[TMO-62] 순서 변경 반영
yuuuja Apr 23, 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
7 changes: 5 additions & 2 deletions src/main/java/swyp/swyp6_team7/profile/repository/VisitedCountryLogCustomRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ public List<Tuple> findVisitedCountriesWithStartDate(Integer userNumber) {
.select(
country.countryName,
country.continent,
country
country,
travel.endDate

)
.from(travel)
.join(travel.location, location)
Expand All @@ -84,7 +86,8 @@ public List<Tuple> findVisitedCountriesWithStartDate(Integer userNumber) {
.select(
country.countryName,
country.continent,
country
country,
travel.endDate
)
.from(companion)
.join(companion.travel, travel)
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/swyp/swyp6_team7/profile/service/ProfileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,13 @@ public Optional<Users> getUserByUserNumber(Integer userNumber) {
public ProfileViewResponse getProfileView(Integer userNumber) {
try {
log.info("내 프로필 조회 시작 - userNumber: {}", userNumber);
Users user = userRepository.findUserWithTags(userNumber)
.orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));

Integer visitedCountryCount=visitedCountryLogService.calculateVisitedCountryCount(userNumber);
//TODO
Integer travelBadgeCount=0;

Users user = userRepository.findUserWithTags(userNumber)
.orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다."));
return new ProfileViewResponse(user, visitedCountryCount, travelBadgeCount);
} catch (Exception e) {
log.error("내 프로필 조회 중 에러 발생 - userNumber: {}", userNumber, e);
Expand Down