Merge pull request #125 from Kusitms-28th-MeetUp-C/feature/117-roadmap

[refactor]:Main #117 roadmapManageService 코드 정리
Kusitms-28th-MeetUp-C · Nov 18, 2023 · 9295c0e · 9295c0e
2 parents fdf3229 + 5edc640
commit 9295c0e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/...ce/src/main/java/com/kusitms/mainservice/domain/article/controller/ArticleController.java b/...ce/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/...ce/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapManageService.java b/...ce/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
@@ -37,30 +38,32 @@ 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);
-        return optemplate.get();
+        return templateRepository.findById(templateId)
+                .orElseThrow(() -> new EntityNotFoundException(TEMPLATE_NOT_FOUND));
     }
     private void saveRoadmap(Roadmap createdRoadmap){
         roadmapRepository.save(createdRoadmap);
-//        roadmapSpaceRepository.save(createdRoadmapSpace);
     }
     private void saveRoadmapSpace(RoadmapSpace createdRoadmapSpace){
         roadmapSpaceRepository.save(createdRoadmapSpace);

diff --git a/.../java/com/kusitms/mainservice/domain/template/dto/response/CreateTemplateResponseDto.java b/.../java/com/kusitms/mainservice/domain/template/dto/response/CreateTemplateResponseDto.java
@@ -1,15 +1,18 @@
 package com.kusitms.mainservice.domain.template.dto.response;
 
+import com.kusitms.mainservice.domain.template.domain.Template;
 import lombok.Builder;
 import lombok.Getter;
 
 @Builder
 @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/.../src/main/java/com/kusitms/mainservice/domain/template/service/TemplateManageService.java b/.../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) {