diff --git a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/AnswerController.java b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/AnswerController.java index 8d0f9575..f0991cdb 100644 --- a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/AnswerController.java +++ b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/AnswerController.java @@ -99,6 +99,7 @@ public ResponseEntity> searchAnswers( description = """ 답변 ID로 해당 답변의 상세 정보와 리포트를 조회합니다. + - 일간 리포트 ID (dailyReportId, 리포트 없으면 null) - 질문 내용 (questionText) - 질문 카테고리 (interestCode) - 답변 작성일 (answerDate) @@ -206,6 +207,7 @@ public ResponseEntity> getCalendarRecent 특정 날짜의 답변 전체 정보를 조회합니다. 응답 데이터: + - 일간 리포트 ID (dailyReportId, 리포트 없으면 null) - 질문 내용 (questionText) - 질문 카테고리 (interestCode) - 답변 작성일 (answerDate) diff --git a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/dto/response/AnswerDetailResponse.java b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/dto/response/AnswerDetailResponse.java index 366468e2..abfe837d 100644 --- a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/dto/response/AnswerDetailResponse.java +++ b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/api/dto/response/AnswerDetailResponse.java @@ -8,6 +8,9 @@ @Schema(description = "답변 상세 조회 응답") public record AnswerDetailResponse( + @Schema(description = "일간 리포트 ID (댓글·좋아요 조회 시 사용)", example = "42") + Long dailyReportId, + @Schema(description = "질문 내용", example = "오늘 가장 기뻤던 순간은?") String questionText, @@ -31,6 +34,7 @@ public record AnswerDetailResponse( ) { public static AnswerDetailResponse from(AnswerDetailDto dto, String imageUrl) { return new AnswerDetailResponse( + dto.dailyReportId(), dto.questionText(), dto.interestCode() != null ? dto.interestCode().name() : null, dto.answerDate(), diff --git a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/dto/AnswerDetailDto.java b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/dto/AnswerDetailDto.java index 8b6eb94f..354aaa31 100644 --- a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/dto/AnswerDetailDto.java +++ b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/dto/AnswerDetailDto.java @@ -10,6 +10,7 @@ * Repository 쿼리 결과를 담는 DTO */ public record AnswerDetailDto( + Long dailyReportId, String questionText, InterestCode interestCode, LocalDate answerDate, diff --git a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/AnswerEntryQueryRepository.java b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/AnswerEntryQueryRepository.java index c0c89904..f65a0e2f 100644 --- a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/AnswerEntryQueryRepository.java +++ b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/AnswerEntryQueryRepository.java @@ -108,7 +108,7 @@ List findRecentAnswers( */ @Query(""" select new com.devkor.ifive.nadab.domain.dailyreport.core.dto.AnswerDetailDto( - ae.question.questionText, ae.question.interest.code, ae.date, ae.content, dr.content, e.code, ae.imageKey + dr.id, ae.question.questionText, ae.question.interest.code, ae.date, ae.content, dr.content, e.code, ae.imageKey ) from AnswerEntry ae left join DailyReport dr on dr.answerEntry = ae and dr.status = com.devkor.ifive.nadab.domain.dailyreport.core.entity.DailyReportStatus.COMPLETED @@ -126,7 +126,7 @@ Optional findDetailByAnswerId( */ @Query(""" select new com.devkor.ifive.nadab.domain.dailyreport.core.dto.AnswerDetailDto( - ae.question.questionText, ae.question.interest.code, ae.date, ae.content, dr.content, e.code, ae.imageKey + dr.id, ae.question.questionText, ae.question.interest.code, ae.date, ae.content, dr.content, e.code, ae.imageKey ) from AnswerEntry ae left join DailyReport dr on dr.answerEntry = ae and dr.status = com.devkor.ifive.nadab.domain.dailyreport.core.entity.DailyReportStatus.COMPLETED diff --git a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/DailyReportRepository.java b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/DailyReportRepository.java index 02de7cdb..f4bfab72 100644 --- a/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/DailyReportRepository.java +++ b/src/main/java/com/devkor/ifive/nadab/domain/dailyreport/core/repository/DailyReportRepository.java @@ -44,6 +44,7 @@ public interface DailyReportRepository extends JpaRepository */ @Query(""" select new com.devkor.ifive.nadab.domain.dailyreport.core.dto.AnswerDetailDto( + dr.id, q.questionText, i.code, ae.date,