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.

Sign up for GitHub

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

♻️ [Refactor] 기존에 있던 개발자 검색 후 해당 값 등록 #134

Merged
merged 1 commit into from
Jul 10, 2024
Merged

♻️ [Refactor] 기존에 있던 개발자 검색 후 해당 값 등록 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/ssuPlector/dto/request/ProjectDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static class ProjectRequestDTO {
@MaxSizeThree private List<DevTools> devToolList;
@MaxSizeThree private List<TechStack> techStackList;

private List<ProjectDeveloperRequestDTO> projectDevloperList;
private List<Long> projectDevloperList;
}

@Getter
Expand Down
26 changes: 14 additions & 12 deletions src/main/java/ssuPlector/service/project/ProjectServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import ssuPlector.domain.category.Category;
import ssuPlector.domain.category.DevLanguage;
import ssuPlector.domain.category.DevTools;
import ssuPlector.domain.category.Part;
import ssuPlector.domain.category.TechStack;
import ssuPlector.dto.request.ProjectDTO.ProjectListRequestDto;
import ssuPlector.dto.response.ProjectDTO.ProjectListResponseDto;
Expand Down Expand Up @@ -119,28 +120,29 @@ public Long createProject(ProjectRequestDTO requestDTO, MultipartFile image) {
}

@Transactional
public List<ProjectDeveloper> createProjectDeveloperList(
List<ProjectDeveloperRequestDTO> requestDTOList) {
return requestDTOList.stream()
public List<ProjectDeveloper> createProjectDeveloperList(List<Long> developerIdList) {
return developerIdList.stream()
.map(this::createProjectDeveloper)
.collect(Collectors.toList());
}

@Transactional
public ProjectDeveloper createProjectDeveloper(ProjectDeveloperRequestDTO requestDTO) {

Developer developer = developerRepository.findByEmail(requestDTO.getEmail()).orElse(null);
public ProjectDeveloper createProjectDeveloper(Long developerId) {
Developer developer =
developerRepository
.findById(developerId)
.orElseThrow(
() -> new GlobalException(GlobalErrorCode.DEVELOPER_NOT_FOUND));

ProjectDeveloper newProjectDeveloper =
ProjectDeveloper.builder()
.name(requestDTO.getName())
.partList(requestDTO.getPartList())
.isTeamLeader(requestDTO.getIsTeamLeader())
.name(developer.getName())
.partList(List.of(new Part[] {developer.getPart1(), developer.getPart2()}))
.isTeamLeader(false)
.build();

if (developer != null) { // 계정이 있는 프로젝트 부원인 경우
developer.addProjectDeveloper(newProjectDeveloper);
}
// 계정이 있는 프로젝트 부원인 경우
developer.addProjectDeveloper(newProjectDeveloper);
return newProjectDeveloper;
}
}
Loading