Skip to content

[Feat] #226 리마인드 일기 조회가 더 자세한 위치를 반환하도록 수정 #240

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
Jinho622 merged 2 commits into from
Nov 26, 2025
Merged

[Feat] #226 리마인드 일기 조회가 더 자세한 위치를 반환하도록 수정 #240

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
c718f5a
fix: #226 리마인드 일기 조회가 자세한 위치를 반환하도록 수정
CHOYUNSIG Nov 22, 2025
3edaf81
Merge remote-tracking branch 'origin/develop' into feat/#226-remind-d…
CHOYUNSIG Nov 22, 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
6 changes: 3 additions & 3 deletions src/main/java/TtattaBackend/ttatta/converter/DiaryConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,16 @@ public static DiaryResponseDTO.MapResultDTO toMapResultDTO(Diaries diary, String
.build();
}

public static DiaryResponseDTO.RemindDiaryDTO toRemindDiaryDTO(Diaries diary, String presignedUrl, boolean isSingle) {
public static DiaryResponseDTO.RemindDiaryDTO toRemindDiaryDTO(Diaries diary, String presignedUrl, boolean isSingle, DecryptedLocation location) {
return DiaryResponseDTO.RemindDiaryDTO.builder()
.diaryId(diary.getId())
.diaryCategoryId(diary.getDiaryCategories().getId())
.date(diary.getDate())
.content(diary.getContent())
.image(presignedUrl)
.color(diary.getDiaryCategories().getColor())
.latitude(diary.getLocation().getY())
.longitude(diary.getLocation().getX())
.latitude(location.lat())
.longitude(location.lng())
.isSingle(isSingle)
.build();
}
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/TtattaBackend/ttatta/service/DiaryService/DiaryQueryServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,19 @@ public DiaryResponseDTO.RemindDiaryDTO getRemindDiary(Long diaryId) {
presignedUrl = s3Manager.generatePresignedUrlForView(objectKey);
}

DecryptedLocation location = envelopeCryptoService.decryptLatLng(
diary.getLatCipher(),
diary.getIvLat(),
diary.getLngCipher(),
diary.getIvLng(),
diary.getDekWrapped(),
diary.getKmsKeyId(),
diary.getUsers().getId()
);

Long count = diaryRepository.countByUsersAndClusterId(user, diary.getClusterId());

return DiaryConverter.toRemindDiaryDTO(diary, presignedUrl, count > 1);
return DiaryConverter.toRemindDiaryDTO(diary, presignedUrl, count > 1, location);
}

@Override
Expand Down