Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat]: Main Template 팀에 배정하기전 스텝 불러오기 #172

Merged
merged 1 commit into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package com.kusitms.mainservice.domain.roadmap.controller;

import com.kusitms.mainservice.domain.roadmap.dto.request.RoadmapSharingRequestDto;
import com.kusitms.mainservice.domain.roadmap.dto.response.CustomRoadmapStepDto;
import com.kusitms.mainservice.domain.roadmap.service.RoadmapManageService;
import com.kusitms.mainservice.global.common.SuccessResponse;
import com.kusitms.mainservice.global.config.auth.UserId;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RequiredArgsConstructor
@RequestMapping("/api/manage/roadmap")
@RestController
Expand All @@ -18,4 +21,11 @@ public ResponseEntity<SuccessResponse<?>> createRoadmap(@UserId Long userId, @Re
roadmapManageService.createSharingRoadmap(userId, roadmapSharingRequestDto);
return SuccessResponse.created(null);
}

@GetMapping
public ResponseEntity<SuccessResponse<?>> getCustomSpaceStep(@UserId Long userId, @RequestParam String title){
final List<CustomRoadmapStepDto> customRoadmapStepDtoList = roadmapManageService.getTeamRoadmapTitle(userId, title);
return SuccessResponse.ok(customRoadmapStepDtoList);

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.kusitms.mainservice.domain.roadmap.dto.response;

import com.kusitms.mainservice.domain.roadmap.domain.CustomRoadmapSpace;
import lombok.Builder;
import lombok.Getter;

@Builder
@Getter
public class CustomRoadmapStepDto {
private Long stepId;
private String title;
public static CustomRoadmapStepDto of(CustomRoadmapSpace customRoadmapSpace){
return CustomRoadmapStepDto.builder()
.stepId(customRoadmapSpace.getId())
.title(customRoadmapSpace.getTitle())
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
import com.kusitms.mainservice.domain.roadmap.domain.CustomRoadmapSpace;
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;

public interface CustomRoadmapSpaceRepository extends JpaRepository<CustomRoadmapSpace, Long> {
List<CustomRoadmapSpace> findAllByCustomRoadmapId(Long id);
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
package com.kusitms.mainservice.domain.roadmap.service;

import com.kusitms.mainservice.domain.roadmap.domain.Roadmap;
import com.kusitms.mainservice.domain.roadmap.domain.RoadmapSpace;
import com.kusitms.mainservice.domain.roadmap.domain.RoadmapTemplate;
import com.kusitms.mainservice.domain.roadmap.domain.RoadmapType;
import com.kusitms.mainservice.domain.roadmap.domain.*;
import com.kusitms.mainservice.domain.roadmap.dto.request.RoadmapSharingRequestDto;
import com.kusitms.mainservice.domain.roadmap.dto.request.StepDto;
import com.kusitms.mainservice.domain.roadmap.repository.RoadmapRepository;
import com.kusitms.mainservice.domain.roadmap.repository.RoadmapSpaceRepository;
import com.kusitms.mainservice.domain.roadmap.repository.RoadmapTemplateRepository;
import com.kusitms.mainservice.domain.roadmap.dto.response.CustomRoadmapStepDto;
import com.kusitms.mainservice.domain.roadmap.repository.*;
import com.kusitms.mainservice.domain.template.domain.Template;
import com.kusitms.mainservice.domain.template.repository.TemplateRepository;
import com.kusitms.mainservice.domain.user.domain.User;
Expand All @@ -18,11 +14,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

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;
import static com.kusitms.mainservice.global.error.ErrorCode.*;

@RequiredArgsConstructor
@Transactional
Expand All @@ -33,13 +30,27 @@ public class RoadmapManageService {
private final RoadmapSpaceRepository roadmapSpaceRepository;
private final TemplateRepository templateRepository;
private final RoadmapTemplateRepository roadmapTemplateRepository;
private final CustomRoadmapRepository customRoadmapRepository;
private final CustomRoadmapSpaceRepository customRoadmapSpaceRepository;
public void createSharingRoadmap(Long userId, RoadmapSharingRequestDto roadmapSharingRequestDto) {
User user = getUserFromUserId(userId);
RoadmapType roadmapType = getEnumRoadmapTypeFromStringRoadmapType(roadmapSharingRequestDto.getRoadmapType());
Roadmap createdRoadmap = Roadmap.createRoadmap(roadmapSharingRequestDto, roadmapType, user);
saveRoadmap(createdRoadmap);
saveRoadmapSpace(roadmapSharingRequestDto,createdRoadmap);
}
public List<CustomRoadmapStepDto> getTeamRoadmapTitle(Long userId, String title){
CustomRoadmap customRoadmap = customRoadmapRepository.findByUserIdAndTitle(userId, title).orElseThrow(()->new EntityNotFoundException(ROADMAP_NOT_FOUND));
List<CustomRoadmapStepDto> customRoadmapStepDtoList = createCustomRoadmapStepDto(customRoadmap);
return customRoadmapStepDtoList;
}
private List<CustomRoadmapStepDto> createCustomRoadmapStepDto(CustomRoadmap customRoadmap){
List<CustomRoadmapSpace> customRoadmapSpaces = customRoadmapSpaceRepository.findAllByCustomRoadmapId(customRoadmap.getId());

return customRoadmapSpaces.stream()
.map(space -> CustomRoadmapStepDto.of(space))
.collect(Collectors.toList());
}
private void saveRoadmapSpace(RoadmapSharingRequestDto roadmapSharingRequestDto,Roadmap createdRoadmap){
for (int i = 0; i < roadmapSharingRequestDto.getSteps().size(); i++) {
StepDto stepDto = roadmapSharingRequestDto.getSteps().get(i);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.kusitms.mainservice.domain.roadmap.domain.CustomRoadmapTemplate;
import com.kusitms.mainservice.domain.roadmap.dto.response.CustomRoadmapDetailResponseDto;
import com.kusitms.mainservice.domain.roadmap.dto.response.CustomRoadmapSpaceDetailResponseDto;
import com.kusitms.mainservice.domain.roadmap.dto.response.CustomRoadmapStepDto;
import com.kusitms.mainservice.domain.roadmap.repository.CustomRoadmapRepository;
import com.kusitms.mainservice.domain.roadmap.repository.CustomRoadmapSpaceRepository;
import com.kusitms.mainservice.domain.roadmap.repository.CustomRoadmapTemplateRepository;
Expand Down Expand Up @@ -32,6 +33,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -131,6 +133,7 @@ public void saveTemplateByUserId(Long userId, Long templateId) {
saveCustomTemplate(customTemplate);
saveCustomTemplateContent(template, customTemplate);
}

private void saveTemplateDownload(TemplateDownload templateDownload){
templateDownloadRepository.save(templateDownload);
}
Expand Down