From 680dc5f6a8ee92d0bc72aa1fbee3c4acc297bf5f Mon Sep 17 00:00:00 2001
From: Bae Hyeonseo <haulqogustj@naver.com>
Date: Sat, 18 Nov 2023 17:18:22 +0900
Subject: [PATCH 1/3] =?UTF-8?q?[refactor]:Main=20#117=20roadmapManageServi?=
 =?UTF-8?q?ce=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../article/controller/ArticleController.java |  2 +-
 .../roadmap/service/RoadmapManageService.java | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/article/controller/ArticleController.java b/MainService/src/main/java/com/kusitms/mainservice/domain/article/controller/ArticleController.java
index 5eae8207..b3f33390 100644
--- a/MainService/src/main/java/com/kusitms/mainservice/domain/article/controller/ArticleController.java
+++ b/MainService/src/main/java/com/kusitms/mainservice/domain/article/controller/ArticleController.java
@@ -18,7 +18,7 @@ public class ArticleController {
     private final ArticleService articleService;
 
     @GetMapping
-    public ResponseEntity<SuccessResponse<?>> getAritcleList(){
+    public ResponseEntity<SuccessResponse<?>> getArticleList(){
         final List<ArticleResponseDto> articleResponseDtoList = articleService.getArticleList();
         return SuccessResponse.ok(articleResponseDtoList);
     }
diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java
index 0bfa498a..d8da6779 100644
--- a/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java
+++ b/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java
@@ -37,22 +37,25 @@ public void createSharingRoadmap(Long userId, RoadmapSharingRequestDto roadmapSh
         RoadmapType roadmapType = getEnumRoadmapTypeFromStringRoadmapType(roadmapSharingRequestDto.getRoadmapType());
         Roadmap createdRoadmap = Roadmap.createRoadmap(roadmapSharingRequestDto, roadmapType, user);
         saveRoadmap(createdRoadmap);
+        saveRoadmapSpace(roadmapSharingRequestDto,createdRoadmap);
+    }
+    private void saveRoadmapSpace(RoadmapSharingRequestDto roadmapSharingRequestDto,Roadmap createdRoadmap){
         for (int i = 0; i < roadmapSharingRequestDto.getSteps().size(); i++) {
             StepDto stepDto = roadmapSharingRequestDto.getSteps().get(i);
             RoadmapSpace createdRoadmapSpace = RoadmapSpace.createRoadmapSpace(stepDto, createdRoadmap, i+1);
             saveRoadmapSpace(createdRoadmapSpace);
-            for(Long templateId : stepDto.getTemplateIdList()){
-                Template template = getTemplateById(templateId);
-                RoadmapTemplate createRoadmapTemplate = RoadmapTemplate.createRoadmapTemplate(createdRoadmapSpace,template);
-                roadmapTemplateRepository.save(createRoadmapTemplate);
-            }
-            // 반복문 => step에 해당하는 template List 수 만큼
-                // template 객체 생성
-                // template 저장
-                // roadmap_template 관계 만들기 => roadmap, template
-                // roadmap_template 저장
+            saveRoadmapTemplate(stepDto, createdRoadmapSpace);
         }
-
+    }
+    private void saveRoadmapTemplate(StepDto stepDto, RoadmapSpace createdRoadmapSpace){
+        for(Long templateId : stepDto.getTemplateIdList()){
+            Template template = getTemplateById(templateId);
+            RoadmapTemplate createRoadmapTemplate = RoadmapTemplate.createRoadmapTemplate(createdRoadmapSpace,template);
+            saveRoadmapTemplate(createRoadmapTemplate);
+        }
+    }
+    private void saveRoadmapTemplate(RoadmapTemplate createRoadmapTemplate){
+        roadmapTemplateRepository.save(createRoadmapTemplate);
     }
     private Template getTemplateById(Long templateId){
         Optional<Template> optemplate = templateRepository.findById(templateId);
@@ -60,7 +63,6 @@ private Template getTemplateById(Long templateId){
     }
     private void saveRoadmap(Roadmap createdRoadmap){
         roadmapRepository.save(createdRoadmap);
-//        roadmapSpaceRepository.save(createdRoadmapSpace);
     }
     private void saveRoadmapSpace(RoadmapSpace createdRoadmapSpace){
         roadmapSpaceRepository.save(createdRoadmapSpace);

From cd45082a3ee3f36bcfbdad824091a7313f9ab4e9 Mon Sep 17 00:00:00 2001
From: Bae Hyeonseo <haulqogustj@naver.com>
Date: Sat, 18 Nov 2023 17:20:43 +0900
Subject: [PATCH 2/3] =?UTF-8?q?[refactor]:Main=20#117=20roadmapManageServi?=
 =?UTF-8?q?ce=20=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/roadmap/service/RoadmapManageService.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java
index d8da6779..bd913e57 100644
--- a/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java
+++ b/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java
@@ -21,6 +21,7 @@
 import java.util.Optional;
 
 import static com.kusitms.mainservice.domain.roadmap.domain.RoadmapType.getEnumRoadmapTypeFromStringRoadmapType;
+import static com.kusitms.mainservice.global.error.ErrorCode.TEMPLATE_NOT_FOUND;
 import static com.kusitms.mainservice.global.error.ErrorCode.USER_NOT_FOUND;
 
 @RequiredArgsConstructor
@@ -58,8 +59,8 @@ private void saveRoadmapTemplate(RoadmapTemplate createRoadmapTemplate){
         roadmapTemplateRepository.save(createRoadmapTemplate);
     }
     private Template getTemplateById(Long templateId){
-        Optional<Template> optemplate = templateRepository.findById(templateId);
-        return optemplate.get();
+        return templateRepository.findById(templateId)
+                .orElseThrow(() -> new EntityNotFoundException(TEMPLATE_NOT_FOUND));
     }
     private void saveRoadmap(Roadmap createdRoadmap){
         roadmapRepository.save(createdRoadmap);

From 5edc640ce09025850558dd041b8a4a0e81ed8fd5 Mon Sep 17 00:00:00 2001
From: Bae Hyeonseo <haulqogustj@naver.com>
Date: Sat, 18 Nov 2023 17:24:27 +0900
Subject: [PATCH 3/3] =?UTF-8?q?[fix]:Main=20#117=20templateService=20dto?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/dto/response/CreateTemplateResponseDto.java   | 7 +++++--
 .../domain/template/service/TemplateManageService.java     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/template/dto/response/CreateTemplateResponseDto.java b/MainService/src/main/java/com/kusitms/mainservice/domain/template/dto/response/CreateTemplateResponseDto.java
index 0f344db6..b03eaf72 100644
--- a/MainService/src/main/java/com/kusitms/mainservice/domain/template/dto/response/CreateTemplateResponseDto.java
+++ b/MainService/src/main/java/com/kusitms/mainservice/domain/template/dto/response/CreateTemplateResponseDto.java
@@ -1,5 +1,6 @@
 package com.kusitms.mainservice.domain.template.dto.response;
 
+import com.kusitms.mainservice.domain.template.domain.Template;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -7,9 +8,11 @@
 @Getter
 public class CreateTemplateResponseDto {
     private Long templateId;
-    public static CreateTemplateResponseDto of(Long templateId){
+    private String title;
+    public static CreateTemplateResponseDto of(Template template){
         return CreateTemplateResponseDto.builder()
-                .templateId(templateId)
+                .templateId(template.getId())
+                .title(template.getTitle())
                 .build();
     }
 }
diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/template/service/TemplateManageService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/template/service/TemplateManageService.java
index 2286ba46..30851973 100644
--- a/MainService/src/main/java/com/kusitms/mainservice/domain/template/service/TemplateManageService.java
+++ b/MainService/src/main/java/com/kusitms/mainservice/domain/template/service/TemplateManageService.java
@@ -74,7 +74,7 @@ public CreateTemplateResponseDto createSharingTemplate(Long userId, TemplateShar
         saveTemplate(createdTemplate);
         TemplateContent templateContent = createTemplateContent(createdTemplate.getId(), templateSharingRequestDto.getContent());
         saveTemplateContent(templateContent);
-        return CreateTemplateResponseDto.of(createdTemplate.getId());
+        return CreateTemplateResponseDto.of(createdTemplate);
     }
 
     public CustomTemplateDetailResponseDto getTeamTemplateDetailInfo(Long userId, String roadmapTitle, String teamTitle, Long templateId) {