[fix/#403] get report with limjang detail

src/main/java/umc/th/juinjang/api/checklist/controller/ChecklistControllerV2.java

@@ -18,7 +18,7 @@
 import umc.th.juinjang.api.checklist.service.ChecklistQueryServiceV2;
 import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerAndReportResponseDTO;
 import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO;
-import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO;
+import umc.th.juinjang.api.checklist.service.response.ReportWithLimjangResponseDTO;
 import umc.th.juinjang.api.dto.ApiResponse;
 
 @RestController
@@ -41,7 +41,7 @@ public ApiResponse<List<ChecklistAnswerResponseDTO.AnswerDto>> getChecklistAnswe
 	@CrossOrigin
 	@Operation(summary = "리포트 조회 V2")
 	@GetMapping("/report/{noteId}")
-	public ApiResponse<ReportResponseDTO.ReportV2DTO> getReport(
+	public ApiResponse<ReportWithLimjangResponseDTO> getReport(
 		@PathVariable(name = "noteId") Long noteId) {
 		return ApiResponse.onSuccess(checklistQueryService.getReportByNoteId(noteId));
 	}

src/main/java/umc/th/juinjang/api/checklist/service/ChecklistQueryServiceV2.java

@@ -6,10 +6,11 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import umc.th.juinjang.api.checklist.service.converter.ReportConverter;
 import umc.th.juinjang.api.checklist.service.response.ChecklistAnswerResponseDTO;
-import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO;
+import umc.th.juinjang.api.checklist.service.response.ReportGetResponse;
+import umc.th.juinjang.api.checklist.service.response.ReportWithLimjangResponseDTO;
 import umc.th.juinjang.api.limjang.service.NoteFinder;
+import umc.th.juinjang.api.limjang.service.response.LimjangDetailGetResponse;
 import umc.th.juinjang.domain.limjang.model.Limjang;
 import umc.th.juinjang.domain.report.model.Report;
 
@@ -26,9 +27,9 @@ public List<ChecklistAnswerResponseDTO.AnswerDto> getChecklistAnswerListByLimjan
 		return checklistAnswerFinder.findByLimjangId(noteId);
 	}
 
-	public ReportResponseDTO.ReportV2DTO getReportByNoteId(Long noteId) {
-		Limjang limjang = noteFinder.getNoteByIdWhereDeletedIsFalse(noteId);
-		Report report = reportFinder.findReportByNote(limjang);
-		return ReportConverter.toReportV2Dto(report, limjang);
+	public ReportWithLimjangResponseDTO getReportByNoteId(Long noteId) {
+		Limjang note = noteFinder.getNoteByIdWithAddressAndNotePriceWhereDeletedIsFalse(noteId);
+		Report report = reportFinder.findReportByNote(note);
+		return new ReportWithLimjangResponseDTO(ReportGetResponse.of(report), LimjangDetailGetResponse.of(note));
 	}
 }

src/main/java/umc/th/juinjang/api/checklist/service/ReportFinder.java

@@ -4,13 +4,9 @@
 
 import org.springframework.stereotype.Component;
 
-import umc.th.juinjang.api.checklist.service.converter.ReportConverter;
-import umc.th.juinjang.api.checklist.service.response.ReportResponseDTO;
 import umc.th.juinjang.common.code.status.ErrorStatus;
 import umc.th.juinjang.common.exception.handler.ChecklistHandler;
-import umc.th.juinjang.common.exception.handler.LimjangHandler;
 import umc.th.juinjang.domain.limjang.model.Limjang;
-import umc.th.juinjang.domain.limjang.repository.LimjangRepository;
 import umc.th.juinjang.domain.report.model.Report;
 import umc.th.juinjang.domain.report.repository.ReportRepository;
 

src/main/java/umc/th/juinjang/api/checklist/service/response/ReportGetResponse.java

@@ -0,0 +1,27 @@
+package umc.th.juinjang.api.checklist.service.response;
+
+import umc.th.juinjang.domain.report.model.Report;
+
+public record ReportGetResponse(
+	Long reportId,
+	String indoorKeyWord,
+	String publicSpaceKeyWord,
+	String locationConditionsWord,
+	Float indoorRate,
+	Float publicSpaceRate,
+	Float locationConditionsRate,
+	Float totalRate
+) {
+	public static ReportGetResponse of(Report report) {
+		return new ReportGetResponse(
+			report.getReportId(),
+			report.getIndoorKeyword(),
+			report.getPublicSpaceKeyword(),
+			report.getLocationConditionsKeyword(),
+			report.getIndoorRate(),
+			report.getPublicSpaceRate(),
+			report.getLocationConditionsRate(),
+			report.getTotalRate()
+		);
+	}
+}

src/main/java/umc/th/juinjang/api/checklist/service/response/ReportResponseDTO.java

@@ -1,6 +1,10 @@
 package umc.th.juinjang.api.checklist.service.response;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import umc.th.juinjang.api.limjang.service.response.LimjangDetailResponseDTO;
 
 @AllArgsConstructor
@@ -25,21 +29,4 @@ public static class ReportDTO {
 		private Float locationConditionsRate;
 		private Float totalRate;
 	}
-
-	@Getter
-	@Setter
-	@NoArgsConstructor
-	@AllArgsConstructor
-	@Builder
-	public static class ReportV2DTO {
-		private Long reportId;
-		private String indoorKeyWord;
-		private String publicSpaceKeyWord;
-		private String locationConditionsWord;
-		private Float indoorRate;
-		private Float publicSpaceRate;
-		private Float locationConditionsRate;
-		private Float totalRate;
-		private Long limjangId;
-	}
 }

src/main/java/umc/th/juinjang/api/checklist/service/response/ReportWithLimjangResponseDTO.java

@@ -0,0 +1,14 @@
+package umc.th.juinjang.api.checklist.service.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import umc.th.juinjang.api.limjang.service.response.LimjangDetailGetResponse;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class ReportWithLimjangResponseDTO {
+	private ReportGetResponse reportDTO;
+	private LimjangDetailGetResponse limjangDto;
+}

src/main/java/umc/th/juinjang/api/limjang/service/NoteFinder.java

@@ -28,7 +28,7 @@ public Limjang getNoteByIdWhereDeletedIsFalse(long id) {
 			.orElseThrow(() -> new LimjangHandler(ErrorStatus.LIMJANG_NOTFOUND_ERROR));
 	}
 
-	protected Limjang getNoteByIdWithAddressAndNotePriceWhereDeletedIsFalse(long id) {
+	public Limjang getNoteByIdWithAddressAndNotePriceWhereDeletedIsFalse(long id) {
 		return limjangRepository.findByIdWithAddressAndNotePriceWhereDeletedIsFalse(id)
 			.orElseThrow(() -> new LimjangHandler(ErrorStatus.LIMJANG_NOTFOUND_ERROR));
 	}