diff --git a/src/main/java/TtattaBackend/ttatta/converter/DiaryConverter.java b/src/main/java/TtattaBackend/ttatta/converter/DiaryConverter.java index 2fd58bb..244659c 100644 --- a/src/main/java/TtattaBackend/ttatta/converter/DiaryConverter.java +++ b/src/main/java/TtattaBackend/ttatta/converter/DiaryConverter.java @@ -230,7 +230,7 @@ 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()) @@ -238,8 +238,8 @@ public static DiaryResponseDTO.RemindDiaryDTO toRemindDiaryDTO(Diaries diary, St .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(); } diff --git a/src/main/java/TtattaBackend/ttatta/service/DiaryService/DiaryQueryServiceImpl.java b/src/main/java/TtattaBackend/ttatta/service/DiaryService/DiaryQueryServiceImpl.java index 5190978..ebe3ffa 100644 --- a/src/main/java/TtattaBackend/ttatta/service/DiaryService/DiaryQueryServiceImpl.java +++ b/src/main/java/TtattaBackend/ttatta/service/DiaryService/DiaryQueryServiceImpl.java @@ -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