From 8f0eb617d45b32c7ddde70390687ba8389b79318 Mon Sep 17 00:00:00 2001 From: Taehun88 Date: Mon, 3 Feb 2025 16:35:59 +0900 Subject: [PATCH] fix: change request parameter --- .../project/backlog/BacklogRequestDto.java | 1 - .../service/project/ProjectServiceImpl.java | 94 ++----------------- 2 files changed, 10 insertions(+), 85 deletions(-) diff --git a/src/main/java/com/example/prdoit/dto/project/backlog/BacklogRequestDto.java b/src/main/java/com/example/prdoit/dto/project/backlog/BacklogRequestDto.java index 829858f..1b9478a 100644 --- a/src/main/java/com/example/prdoit/dto/project/backlog/BacklogRequestDto.java +++ b/src/main/java/com/example/prdoit/dto/project/backlog/BacklogRequestDto.java @@ -13,6 +13,5 @@ public class BacklogRequestDto { private String projectId; private List backlogListDto; - private int iteration; } diff --git a/src/main/java/com/example/prdoit/service/project/ProjectServiceImpl.java b/src/main/java/com/example/prdoit/service/project/ProjectServiceImpl.java index 8e585ad..35035a8 100644 --- a/src/main/java/com/example/prdoit/service/project/ProjectServiceImpl.java +++ b/src/main/java/com/example/prdoit/service/project/ProjectServiceImpl.java @@ -60,70 +60,6 @@ public String createProject(ProjectCreateDto projectCreateDto) { .build(); try{ projectTableRepository.save(projectTable); - if(projectCreateDto.getPainPoint() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(1) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } - if(projectCreateDto.getTarget() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(2) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } - if(projectCreateDto.getUseCase() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(3) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } - if(projectCreateDto.getUserStory() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(4) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } - if(projectCreateDto.getFunction() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(5) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } - if(projectCreateDto.getTask() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(6) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } - if(projectCreateDto.getBacklog() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(7) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } - if(projectCreateDto.getBurndown() == 1){ - ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() - .projectId(projectTable) - .projectLevelContent("") - .projectLevel(8) - .build(); - projectLevelContentTableRepository.save(projectLevelContentTable); - } log.info("[createProject] 프로젝트 생성 완료"); return uuid; } catch (CustomException e){ @@ -159,7 +95,12 @@ public ProjectResponseDto getProject(String projectId) { public ProjectContentResponseDto getProjectContent(String projectId, int projectLevel) { log.info("[getProjectContent] 프로젝트 컨텐츠 조회 시작"); ProjectTable projectTable = projectTableRepository.findById(projectId).orElseThrow(() -> new CustomException("존재하지 않는 프로젝트입니다.")); - ProjectLevelContentTable projectLevelContentTable = projectLevelContentTableRepository.findByProjectIdAndProjectLevel(projectTable, projectLevel); + ProjectLevelContentTable projectLevelContentTable = projectLevelContentTableRepository. + findByProjectIdAndProjectLevel(projectTable, projectLevel) != null ? projectLevelContentTableRepository.findByProjectIdAndProjectLevel(projectTable, projectLevel) : null; + + if(projectLevelContentTable == null){ + return null; + } return ProjectContentResponseDto.builder() .projectContent(projectLevelContentTable.getProjectLevelContent()) .projectLevel(projectLevelContentTable.getProjectLevel()) @@ -191,16 +132,12 @@ public List getProjectList(String userId) { public void createProjectContent(ProjectContentDto projectContentDto) { log.info("[createProjectContent] 프로젝트 컨텐츠 생성 시작"); ProjectTable projectTable = projectTableRepository.findById(projectContentDto.getProjectId()).orElseThrow(() -> new CustomException("존재하지 않는 프로젝트입니다.")); - ProjectLevelContentTable projectLevelContentTable = projectLevelContentTableRepository.findByProjectIdAndProjectLevel(projectTable, projectContentDto.getProjectLevel()); - if(projectLevelContentTable == null){ - throw new CustomException("존재하지 않는 프로젝트 레벨입니다."); - } - if(!Objects.equals(projectLevelContentTable.getProjectLevelContent(), "")){ - throw new CustomException("이미 컨텐츠가 생성되어 있습니다."); - } try{ - projectLevelContentTable.setProjectLevelContent(projectContentDto.getProjectContent()); + ProjectLevelContentTable projectLevelContentTable = ProjectLevelContentTable.builder() + .projectLevel(projectContentDto.getProjectLevel()) + .projectLevelContent(projectContentDto.getProjectContent()) + .build(); projectLevelContentTableRepository.save(projectLevelContentTable); switch (projectContentDto.getProjectLevel()){ case 1: @@ -325,11 +262,6 @@ public void createBacklog(BacklogRequestDto backLogRequestDto) { throw new CustomException("백로그를 생성할 수 없는 프로젝트입니다."); } ProjectLevelContentTable projectLevelContentTable = projectLevelContentTableRepository.findByProjectIdAndProjectLevel(projectTable, 7); - ProjectLevelContentTable projectBurndownChart = projectLevelContentTableRepository.findByProjectIdAndProjectLevel(projectTable, 8); - if(!Objects.equals(projectLevelContentTable.getProjectLevelContent(), "")){ - throw new CustomException("이미 백로그가 생성되어 있습니다."); - } - try{ List backlogListDtos = backLogRequestDto.getBacklogListDto(); for(BacklogListDto backlogListDto : backlogListDtos){ @@ -349,12 +281,6 @@ public void createBacklog(BacklogRequestDto backLogRequestDto) { .build(); backlogTableRepository.save(backlogTable); } - projectLevelContentTable.setProjectLevelContent(String.valueOf(backLogRequestDto.getIteration())); - projectBurndownChart.setProjectLevelContent(String.valueOf(backLogRequestDto.getIteration())); - projectLevelContentTableRepository.save(projectLevelContentTable); - projectLevelContentTableRepository.save(projectBurndownChart); - projectTable.setProjectLevel7(2); - projectTableRepository.save(projectTable); } catch (CustomException e){ log.error(e.getMessage()); throw new CustomException(e.getMessage());