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

[refactor]:Main #117 코드정리
Kusitms-28th-MeetUp-C · Nov 18, 2023 · 1ad982f · 1ad982f
2 parents e6cd96a + ba68f95
commit 1ad982f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 66 deletions.
diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/mypage/service/MyPageService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/mypage/service/MyPageService.java
@@ -5,12 +5,10 @@
 import com.kusitms.mainservice.domain.mypage.dto.resquest.ModifyUserProfileRequestDto;
 import com.kusitms.mainservice.domain.roadmap.domain.Roadmap;
 import com.kusitms.mainservice.domain.roadmap.dto.response.SearchBaseRoadmapResponseDto;
-import com.kusitms.mainservice.domain.roadmap.repository.RoadmapDownloadRepository;
 import com.kusitms.mainservice.domain.roadmap.repository.RoadmapRepository;
 import com.kusitms.mainservice.domain.roadmap.service.RoadmapService;
 import com.kusitms.mainservice.domain.template.domain.Template;
 import com.kusitms.mainservice.domain.template.dto.response.SearchBaseTemplateResponseDto;
-import com.kusitms.mainservice.domain.template.repository.TemplateDownloadRepository;
 import com.kusitms.mainservice.domain.template.repository.TemplateRepository;
 import com.kusitms.mainservice.domain.template.service.TemplateService;
 import com.kusitms.mainservice.domain.user.domain.User;

diff --git a/.../main/java/com/kusitms/mainservice/domain/roadmap/controller/CustomRoadmapController.java b/.../main/java/com/kusitms/mainservice/domain/roadmap/controller/CustomRoadmapController.java
@@ -1,14 +1,8 @@
 package com.kusitms.mainservice.domain.roadmap.controller;
 
-import com.kusitms.mainservice.domain.roadmap.dto.request.SearchRoadmapRequestDto;
-import com.kusitms.mainservice.domain.roadmap.dto.response.SearchBaseRoadmapResponseDto;
 import com.kusitms.mainservice.domain.roadmap.service.CustomRoadmapService;
 import com.kusitms.mainservice.global.common.SuccessResponse;
-import com.kusitms.mainservice.global.config.auth.UserId;
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.web.PageableDefault;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

diff --git a/...ce/src/main/java/com/kusitms/mainservice/domain/roadmap/controller/RoadmapController.java b/...ce/src/main/java/com/kusitms/mainservice/domain/roadmap/controller/RoadmapController.java
@@ -1,18 +1,11 @@
 package com.kusitms.mainservice.domain.roadmap.controller;
 
-import com.kusitms.mainservice.domain.roadmap.dto.request.RoadmapSharingRequestDto;
 import com.kusitms.mainservice.domain.roadmap.dto.request.SearchRoadmapRequestDto;
-import com.kusitms.mainservice.domain.roadmap.dto.response.BaseRoadmapResponseDto;
 import com.kusitms.mainservice.domain.roadmap.dto.response.RoadmapDetailInfoResponseDto;
 import com.kusitms.mainservice.domain.roadmap.dto.response.SearchBaseRoadmapResponseDto;
-import com.kusitms.mainservice.domain.roadmap.dto.response.SearchRoadmapResponseDto;
-import com.kusitms.mainservice.domain.roadmap.service.CustomRoadmapService;
 import com.kusitms.mainservice.domain.roadmap.service.RoadmapManageService;
 import com.kusitms.mainservice.domain.roadmap.service.RoadmapService;
-import com.kusitms.mainservice.domain.template.dto.response.GetTeamForSaveTemplateResponseDto;
-import com.kusitms.mainservice.domain.template.dto.response.TemplateDetailResponseDto;
 import com.kusitms.mainservice.global.common.SuccessResponse;
-import com.kusitms.mainservice.global.config.auth.UserId;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

diff --git a/...a/com/kusitms/mainservice/domain/roadmap/dto/response/CustomRoadmapDetailResponseDto.java b/...a/com/kusitms/mainservice/domain/roadmap/dto/response/CustomRoadmapDetailResponseDto.java
@@ -16,7 +16,7 @@ public class CustomRoadmapDetailResponseDto {
     private RoadmapType roadmapType;
     private LocalDate startTime;
     private LocalDate endTime;
-    private List<CustomRoadmapSpaceDetailResponseDto> roadmapDetailList;
+    private List<CustomRoadmapSpaceDetailResponseDto> roadmapList;
 
     public static CustomRoadmapDetailResponseDto of(CustomRoadmap roadmap, List<CustomRoadmapSpaceDetailResponseDto> roadmapDetailList) {
         return CustomRoadmapDetailResponseDto.builder()
@@ -25,7 +25,7 @@ public static CustomRoadmapDetailResponseDto of(CustomRoadmap roadmap, List<Cust
                 .roadmapType(roadmap.getRoadmapType())
                 .startTime(roadmap.getStartDate())
                 .endTime(roadmap.getEndDate())
-                .roadmapDetailList(roadmapDetailList)
+                .roadmapList(roadmapDetailList)
                 .build();
     }
 }
diff --git a/...ce/src/main/java/com/kusitms/mainservice/domain/roadmap/service/CustomRoadmapService.java b/...ce/src/main/java/com/kusitms/mainservice/domain/roadmap/service/CustomRoadmapService.java
@@ -1,16 +1,7 @@
 package com.kusitms.mainservice.domain.roadmap.service;
 
 import com.kusitms.mainservice.domain.roadmap.domain.*;
-import com.kusitms.mainservice.domain.roadmap.dto.request.RoadmapSharingRequestDto;
 import com.kusitms.mainservice.domain.roadmap.repository.CustomRoadmapSpaceRepository;
-import com.kusitms.mainservice.domain.roadmap.repository.RoadmapRepository;
-import com.kusitms.mainservice.domain.roadmap.repository.RoadmapSpaceRepository;
-import com.kusitms.mainservice.domain.template.domain.Template;
-import com.kusitms.mainservice.domain.template.domain.TemplateContent;
-import com.kusitms.mainservice.domain.template.domain.TemplateType;
-import com.kusitms.mainservice.domain.template.dto.request.TemplateSharingRequestDto;
-import com.kusitms.mainservice.domain.user.domain.User;
-import com.kusitms.mainservice.domain.user.repository.UserRepository;
 import com.kusitms.mainservice.global.error.exception.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/roadmap/service/RoadmapService.java
@@ -11,8 +11,6 @@
 import com.kusitms.mainservice.domain.template.repository.TemplateRepository;
 import com.kusitms.mainservice.domain.user.domain.User;
 import com.kusitms.mainservice.domain.user.dto.response.DetailUserResponseDto;
-import com.kusitms.mainservice.domain.user.service.AuthService;
-import com.kusitms.mainservice.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;

diff --git a/...ain/java/com/kusitms/mainservice/domain/template/controller/TemplateManageController.java b/...ain/java/com/kusitms/mainservice/domain/template/controller/TemplateManageController.java
@@ -5,7 +5,6 @@
 import com.kusitms.mainservice.domain.template.dto.request.TemplateTeamRequestDto;
 import com.kusitms.mainservice.domain.template.dto.response.CreateTemplateResponseDto;
 import com.kusitms.mainservice.domain.template.dto.response.CustomTemplateDetailResponseDto;
-import com.kusitms.mainservice.domain.template.dto.response.OriginalTemplateResponseDto;
 import com.kusitms.mainservice.domain.template.dto.response.TemplateDownloadDetailResponseDto;
 import com.kusitms.mainservice.domain.template.service.TemplateManageService;
 import com.kusitms.mainservice.global.common.SuccessResponse;

diff --git a/.../java/com/kusitms/mainservice/domain/template/dto/response/TemplateDetailResponseDto.java b/.../java/com/kusitms/mainservice/domain/template/dto/response/TemplateDetailResponseDto.java
@@ -16,19 +16,19 @@ public class TemplateDetailResponseDto {
     private String templateType;
     private String title;
     private TemplateDetailIntroResponseDto templateIntro;
-    private List<TemplateContent> templateContentList;
+    private String templateContent;
     private List<TemplateDetailBaseRelateDto> relatedTemplate;
     private TemplateDetailConnectRoadmapDto roadmapIdAndConnectRoadmap;
     private DetailUserResponseDto user;
 
-    public static TemplateDetailResponseDto of(Template template, TemplateDetailIntroResponseDto templateIntro,List<TemplateContent> templateContentList , TemplateDetailConnectRoadmapDto roadmapIdAndConnectRoadmap, List<TemplateDetailBaseRelateDto> relatedTemplate, DetailUserResponseDto user){
+    public static TemplateDetailResponseDto of(Template template, TemplateDetailIntroResponseDto templateIntro,String templateContent , TemplateDetailConnectRoadmapDto roadmapIdAndConnectRoadmap, List<TemplateDetailBaseRelateDto> relatedTemplate, DetailUserResponseDto user){
         return TemplateDetailResponseDto.builder()
                 .templateId(template.getId())
                 .templateType(template.getTemplateType().toString())
                 .title(template.getTitle())
                 .templateIntro(templateIntro)
                 .roadmapIdAndConnectRoadmap(roadmapIdAndConnectRoadmap)
-                .templateContentList(templateContentList)
+                .templateContent(templateContent)
                 .relatedTemplate(relatedTemplate)
                 .user(user)
                 .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
@@ -163,7 +163,7 @@ private CustomTemplate getCustomTemplateFromTemplateId(Long templateId) {
                 .orElseThrow(() -> new EntityNotFoundException(TEMPLATE_NOT_FOUND));
     }
 
-    private TemplateContent getTemplateContentFromTemplateId(Long templateId) {
+    public TemplateContent getTemplateContentFromTemplateId(Long templateId) {
         return templateContentRepository.findByTemplateId(templateId)
                 .orElseThrow(() -> new EntityNotFoundException(TEMPLATE_CONTENT_NOT_FOUND));
     }

diff --git a/...ervice/src/main/java/com/kusitms/mainservice/domain/template/service/TemplateService.java b/...ervice/src/main/java/com/kusitms/mainservice/domain/template/service/TemplateService.java
@@ -17,7 +17,6 @@
 import com.kusitms.mainservice.domain.user.domain.User;
 import com.kusitms.mainservice.domain.user.dto.response.DetailUserResponseDto;
 import com.kusitms.mainservice.domain.user.repository.UserRepository;
-import com.kusitms.mainservice.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -45,7 +44,7 @@ public class TemplateService {
     private final RoadmapRepository roadmapRepository;
     private final TeamRepository teamRepository;
     private final UserRepository userRepository;
-    private final UserService userService;
+    private final TemplateManageService templateManageService;
 
     public Page<SearchBaseTemplateResponseDto> searchTemplateByTitleAndRoadmapType(SearchTemplateRequsetDto searchTemplateRequsetDto, Pageable pageable) {
         Page<Template> templateList = getTemplateListByTitleAndTemplateType(searchTemplateRequsetDto, pageable);
@@ -57,11 +56,11 @@ public Page<SearchBaseTemplateResponseDto> searchTemplateByTitleAndRoadmapType(S
     public TemplateDetailResponseDto getTemplateDetail(Long templateId) {
         Template template = getTemplateByTemplateId(templateId);
         TemplateDetailIntroResponseDto templateDetailIntroResponseDto = createTemplateDetailIntroResponseDto(template);
-        List<TemplateContent> templateContentList = getTemplateContentListByTemplateId(template);
+        String templateContent = getTemplateContentByTemplateId(template).getContent();
         List<TemplateDetailBaseRelateDto> templateDetailBaseRelateDtoList = createTemplateDetailRelateTemplateDto(template);
         TemplateDetailConnectRoadmapDto roadmapIdAndConnectRoadmap = getRoadmapTitleResponseDto(template);
         DetailUserResponseDto detailUserResponseDto = createDetailUserResponseDto(template.getUser());
-        return TemplateDetailResponseDto.of(template, templateDetailIntroResponseDto, templateContentList, roadmapIdAndConnectRoadmap, templateDetailBaseRelateDtoList, detailUserResponseDto);
+        return TemplateDetailResponseDto.of(template, templateDetailIntroResponseDto, templateContent, roadmapIdAndConnectRoadmap, templateDetailBaseRelateDtoList, detailUserResponseDto);
 
     }
 
@@ -116,32 +115,9 @@ private TemplateDetailIntroBaseResponseDto createTemplateDetailIntroBaseResponse
         return TemplateDetailIntroBaseResponseDto.of(templateReviewResponseDto.getRatingAverage(), template.getEstimatedTime(), teamCount, templateReviewResponseDto.getReviewCount());
     }
 
-    private List<TemplateContent> getTemplateContentListByTemplateId(Template template) {
-        List<TemplateContent> templateContentList = templateContentRepository.findAllByTemplateId(template.getId());
-
-
-//    List<TemplateContent> filteredList = templateContentList.stream()
-//            .filter(tc -> tc.getAgendaNum() != null)
-//            .collect(Collectors.toList());
-//
-//
-//    filteredList.sort(Comparator.comparing(TemplateContent::getAgendaNum));
-//
-//    Map<Long, List<Map<String, String>>> result = new LinkedHashMap<>();
-//    List<Map<String, String>> contentList = new ArrayList<>();
-//
-//    for (TemplateContent templateContent : filteredList) {
-//        Map<String, String> contentMap = new LinkedHashMap<>();
-//        contentMap.put("agendaNum", String.valueOf(templateContent.getAgendaNum()));
-//        contentMap.put("agenda", templateContent.getAgenda());
-//        contentMap.put("content", templateContent.getContent());
-//        contentList.add(contentMap);
-//    }
-//
-//    result.put(template.getId(), contentList);
-
-
-        return templateContentList;
+    private TemplateContent getTemplateContentByTemplateId(Template template) {
+        TemplateContent templateContent = templateManageService.getTemplateContentFromTemplateId(template.getId());
+        return templateContent;
     }
 
 

diff --git a/MainService/src/test/java/com/kusitms/mainservice/MainServiceApplicationTests.java b/MainService/src/test/java/com/kusitms/mainservice/MainServiceApplicationTests.java
@@ -33,9 +33,7 @@ void contextLoads() {
         TemplateContent templateContent = new TemplateContent();
 
 
-        templateContent.setAgendaNum(2L);
-        templateContent.setTemplateId(2L);
-        templateContent.setAgenda("PT 주제 정하기");
+        templateContent.setTemplateId(1L);
         templateContent.setContent("내용2");
 
         templateContentRepository.save(templateContent);