diff --git a/Admin/src/main/java/com/seveneleven/project/dto/PutProject.java b/Admin/src/main/java/com/seveneleven/project/dto/PutProject.java index 643834e4..f59ca4c6 100644 --- a/Admin/src/main/java/com/seveneleven/project/dto/PutProject.java +++ b/Admin/src/main/java/com/seveneleven/project/dto/PutProject.java @@ -1,6 +1,5 @@ package com.seveneleven.project.dto; -import com.seveneleven.entity.member.Company; import com.seveneleven.entity.project.Project; import com.seveneleven.entity.project.ProjectAuthorization; import com.seveneleven.entity.project.ProjectTag; @@ -49,8 +48,6 @@ public String toString() { public Project updateProject( Project project, - Company customer, - Company developer, ProjectType projectType ) { return project.update( @@ -63,8 +60,6 @@ public Project updateProject( startDate, endDate, finalApprovalDate, - customer, - developer, projectType, bnsManager ); diff --git a/Admin/src/main/java/com/seveneleven/project/service/AdminProjectServiceImpl.java b/Admin/src/main/java/com/seveneleven/project/service/AdminProjectServiceImpl.java index f3e219cf..97b407ae 100644 --- a/Admin/src/main/java/com/seveneleven/project/service/AdminProjectServiceImpl.java +++ b/Admin/src/main/java/com/seveneleven/project/service/AdminProjectServiceImpl.java @@ -68,11 +68,11 @@ public Project updateProject(Long id, PutProject.Request request) { } } - Company customer = adminCompanyReader.getCompany(request.getCustomerId()); - Company developer = adminCompanyReader.getCompany(request.getDeveloperId()); +// Company customer = adminCompanyReader.getCompany(request.getCustomerId()); +// Company developer = adminCompanyReader.getCompany(request.getDeveloperId()); ProjectType projectType = adminProjectTypeReader.getProjectType(request.getProjectTypeId()); - Project updatedProject = request.updateProject(project, customer, developer, projectType); + Project updatedProject = request.updateProject(project, projectType); return adminProjectStore.store(updatedProject); } diff --git a/Common/src/main/java/com/seveneleven/entity/project/Project.java b/Common/src/main/java/com/seveneleven/entity/project/Project.java index b5d3014c..16a0b00d 100644 --- a/Common/src/main/java/com/seveneleven/entity/project/Project.java +++ b/Common/src/main/java/com/seveneleven/entity/project/Project.java @@ -124,14 +124,10 @@ public Project update( LocalDate startDate, LocalDate endDate, LocalDateTime approvalDate, - Company customer, - Company developer, ProjectType ProjectType, String bnsManager ) { this.projectName = name; - this.customer = customer; - this.developer = developer; this.projectDescription = description; this.projectType = ProjectType; this.projectStatusCode = statusCode; diff --git a/Common/src/main/java/com/seveneleven/entity/project/constant/MemberType.java b/Common/src/main/java/com/seveneleven/entity/project/constant/MemberType.java index 2f5e0767..61a6f000 100644 --- a/Common/src/main/java/com/seveneleven/entity/project/constant/MemberType.java +++ b/Common/src/main/java/com/seveneleven/entity/project/constant/MemberType.java @@ -6,7 +6,7 @@ @Getter @AllArgsConstructor public enum MemberType { - ADMIN("admin"), + ADMIN("ADMIN"), CLIENT("client"), DEVELOPER("developer"); diff --git a/Main/src/main/java/com/seveneleven/project/dto/GetProjectStep.java b/Main/src/main/java/com/seveneleven/project/dto/GetProjectStep.java index 9096cdd0..cb06a4a6 100644 --- a/Main/src/main/java/com/seveneleven/project/dto/GetProjectStep.java +++ b/Main/src/main/java/com/seveneleven/project/dto/GetProjectStep.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; public class GetProjectStep { @@ -16,7 +17,7 @@ public class GetProjectStep { @NoArgsConstructor public static class Response { private Long projectId; - private List projectStepInfo; + private List projectStepInfo = new ArrayList<>(); @Override public String toString() { @@ -25,9 +26,17 @@ public String toString() { '}'; } - public Response(Long projectId, List projectStepInfo) { + private Response(Long projectId) { this.projectId = projectId; - this.projectStepInfo = projectStepInfo; + this.projectStepInfo = new ArrayList<>(); + } + + public static Response create(Long projectId) { + return new Response(projectId); + } + + public void add(ProjectStep projectStep, List checklists) { + projectStepInfo.add(ProjectStepInfo.toDto(projectStep, projectStepInfo.size() + 1, checklists)); } } @@ -46,15 +55,15 @@ public String toString() { '}'; } - private ProjectStepInfo(ProjectStep projectStep, List projectChecklist) { + private ProjectStepInfo(ProjectStep projectStep, Integer order, List projectChecklist) { stepId = projectStep.getId(); stepName = projectStep.getStepName(); - stepOrder = projectStep.getStepOrder(); + stepOrder = order; this.projectChecklist = projectChecklist.stream().map(ProjectChecklist::new).toList(); } - public static ProjectStepInfo toDto(ProjectStep projectStep, List projectChecklist) { - return new ProjectStepInfo(projectStep, projectChecklist); + public static ProjectStepInfo toDto(ProjectStep projectStep, Integer order, List projectChecklist) { + return new ProjectStepInfo(projectStep, order, projectChecklist); } } diff --git a/Main/src/main/java/com/seveneleven/project/service/ProjectStepServiceImpl.java b/Main/src/main/java/com/seveneleven/project/service/ProjectStepServiceImpl.java index 044ebea1..fa338302 100644 --- a/Main/src/main/java/com/seveneleven/project/service/ProjectStepServiceImpl.java +++ b/Main/src/main/java/com/seveneleven/project/service/ProjectStepServiceImpl.java @@ -39,15 +39,13 @@ public GetStepChecklist.Response getStepChecklist(Long stepId) { public GetProjectStep.Response getProjectStep(Long projectId) { List projectSteps = stepReader.getProjectStep(projectId); - List projectStepInfos = projectSteps.stream().map(stepInfo -> { - List checklists = checklistReader.read(stepInfo.getId()); - return GetProjectStep.ProjectStepInfo.toDto( - stepInfo, - checklists - ); - }).toList(); - - return new GetProjectStep.Response(projectId, projectStepInfos); + GetProjectStep.Response response = GetProjectStep.Response.create(projectId); + + projectSteps.forEach(stepInfo -> { + response.add(stepInfo, checklistReader.read(stepInfo.getId())); + }); + + return response; } @Override