refactor: redesign getReportDetails method. (73)

Author: Floodnut

src/main/java/scanner/history/service/ScanHistoryService.java

@@ -16,7 +16,6 @@
 import scanner.history.dto.report.ScanSummaryDto;
 import scanner.history.entity.ScanHistory;
 import scanner.history.entity.ScanHistoryDetail;
-import scanner.history.repository.ScanHistoryDetailsRepository;
 import scanner.history.repository.ScanHistoryRepository;
 import scanner.history.dto.report.ReportResponse;
 
@@ -27,35 +26,42 @@
 public class ScanHistoryService {
 
 	private final ScanHistoryRepository scanHistoryRepository;
-	private final ScanHistoryDetailsRepository scanHistoryDetailsRepository;
+
+	public VisualDto.Response getVisualization(Long reportId) {
+		ScanHistory history = scanHistoryRepository.findByHistorySeq(reportId)
+			.orElseThrow(() -> new ApiException(ResponseCode.NO_SCAN_RESULT));
+
+		return new VisualDto.Response(history.getHistorySeq(), history.getCreatedAt(), history.getVisual());
+	}
 
 	public List<ScanHistory> getHistoryList() {
 		return scanHistoryRepository.findTop10ByOrderByHistorySeqDesc();
 	}
 
 	@Transactional
 	public ReportResponse getReportDetails(Long reportId, Language lang) {
+		ScanHistory scanHistory = getScanHistory(reportId);
+		ScanSummaryDto.Content summaryDto = createSummaryDto(scanHistory, lang);
+		List<ScanHistoryDetailDto> detailsDto = createDetailsDto(scanHistory.getDetails(), lang);
+		return new ReportResponse(summaryDto, detailsDto);
+	}
 
-		ScanHistory history = scanHistoryRepository.findByHistorySeq(reportId)
+	private ScanHistory getScanHistory(Long reportId) {
+		return scanHistoryRepository.findByHistorySeq(reportId)
 			.orElseThrow(() -> new ApiException(ResponseCode.NO_SCAN_RESULT));
+	}
 
-		ScanSummaryDto.Content summaryDto = ScanSummaryDto.mapDtoByLanguage(history, lang);
+	private ScanSummaryDto.Content createSummaryDto(ScanHistory scanHistory, Language lang) {
+		return ScanSummaryDto.mapDtoByLanguage(scanHistory, lang);
+	}
 
-		List<ScanHistoryDetail> details = scanHistoryDetailsRepository.findByHistorySeq(reportId);
+	private List<ScanHistoryDetailDto> createDetailsDto(List<ScanHistoryDetail> details, Language lang) {
 		List<ScanHistoryDetailDto> detailsDto;
-		if (lang == Language.KOREAN)
+		if (lang == Language.KOREAN) {
 			detailsDto = details.stream().map(ScanHistoryDetailDto::toKor).collect(Collectors.toList());
-		else
+		} else {
 			detailsDto = details.stream().map(ScanHistoryDetailDto::toEng).collect(Collectors.toList());
-
-		return new ReportResponse(summaryDto, detailsDto);
-	}
-
-	public VisualDto.Response getVisualization(Long reportId) {
-
-		ScanHistory history = scanHistoryRepository.findByHistorySeq(reportId)
-			.orElseThrow(() -> new ApiException(ResponseCode.NO_SCAN_RESULT));
-
-		return new VisualDto.Response(history.getHistorySeq(), history.getCreatedAt(), history.getVisual());
+		}
+		return detailsDto;
 	}
 }