Merge pull request #201 from Travlocks/refactor/#197-canvas

[fix] #197 템플릿 캔버스 조회 시 블록 기본 이미지 URL 미적용 수정

Author: jeondain

src/main/java/org/umc/travlocksserver/domain/template/dto/response/TemplateCanvasVlockDTO.java

@@ -14,7 +14,7 @@ public record TemplateCanvasVlockDTO(
 	ConnectionPortType outputPort,
 	Integer nextMoveMinutes,
 	VlockBriefDTO vlock) {
-	public static TemplateCanvasVlockDTO from(TemplateVlock cur, int nextMoveMinutes) {
+	public static TemplateCanvasVlockDTO from(TemplateVlock cur, int nextMoveMinutes, String s3Domain) {
 		return new TemplateCanvasVlockDTO(
 			cur.getId(),
 			cur.getOrderNo(),
@@ -24,6 +24,6 @@ public static TemplateCanvasVlockDTO from(TemplateVlock cur, int nextMoveMinutes
 			cur.getInputPort(),
 			cur.getOutputPort(),
 			nextMoveMinutes,
-			VlockBriefDTO.from(cur.getVlock()));
+			VlockBriefDTO.from(cur.getVlock(), s3Domain));
 	}
 }

src/main/java/org/umc/travlocksserver/domain/template/service/query/TemplateCanvasQueryService.java

@@ -17,6 +17,7 @@
 import org.umc.travlocksserver.domain.template.repository.TemplateDayRepository;
 import org.umc.travlocksserver.domain.template.repository.TemplateRepository;
 import org.umc.travlocksserver.domain.template.repository.TemplateVlockRepository;
+import org.umc.travlocksserver.global.aws.S3Properties;
 
 import lombok.RequiredArgsConstructor;
 
@@ -32,6 +33,8 @@ public class TemplateCanvasQueryService {
 
 	private final TemplateRouteQueryService templateRouteQueryService;
 
+	private final S3Properties s3Properties;
+
 	public TemplateCanvasResponseDTO getTemplateCanvas(Long templateId, Integer dayNo) {
 
 		Template template = templateRepository.findById(templateId)
@@ -59,7 +62,7 @@ public TemplateCanvasResponseDTO getTemplateCanvas(Long templateId, Integer dayN
 			totalStayHours += cur.getStayHours();
 			totalMoveMinutes += nextMoveMinutes;
 
-			vlocks.add(TemplateCanvasVlockDTO.from(cur, nextMoveMinutes));
+			vlocks.add(TemplateCanvasVlockDTO.from(cur, nextMoveMinutes, s3Properties.domain()));
 		}
 
 		double totalMoveHours = Math.round(((double)totalMoveMinutes / 60.0) * 100) / 100.0;

src/main/java/org/umc/travlocksserver/domain/vlock/dto/response/VlockBriefDTO.java

@@ -8,11 +8,15 @@ public record VlockBriefDTO(
 	String category,
 	String coverImgUrl
 ) {
-	public static VlockBriefDTO from(Vlock vlock) {
+	public static VlockBriefDTO from(Vlock vlock, String s3Domain) {
+		String coverImgUrl = vlock.getCoverImgUrl();
+		if (coverImgUrl == null || coverImgUrl.isBlank()) {
+			coverImgUrl = s3Domain + vlock.getVlockCategory().getDefaultCreationImageKey();
+		}
 		return new VlockBriefDTO(
 			vlock.getId(),
 			vlock.getName(),
 			vlock.getVlockCategory().getName(),
-			vlock.getCoverImgUrl());
+			coverImgUrl);
 	}
 }