#82 feat : 리더, 프로젝트 유저 검증

TeamSynergyy · Apr 26, 2024 · 6a81934 · 6a81934
1 parent 69e0c0c
commit 6a81934
Showing 1 changed file with 23 additions and 3 deletions.
diff --git a/src/main/java/com/seoultech/synergybe/domain/project/service/ProjectService.java b/src/main/java/com/seoultech/synergybe/domain/project/service/ProjectService.java
@@ -69,10 +69,29 @@ public String createProject(String userId, CreateProjectRequest request) {
         return savedProject.getId();
     }
 
+    private void validateProjectUser(String userId, String projectId) {
+        Project project = findProjectById(projectId);
+        List<String> userListIds = project.getProjectUsers().stream().map(projectUser -> projectUser.getUser().getId()).toList();
+
+        if (!userListIds.contains(userId)) {
+            throw new ProjectBadRequestException("프로젝트 변경 권한이 없습니다.");
+        }
+    }
+
+    private void validateProjectLeader(String leaderId, String projectId) {
+        Project project = findProjectById(projectId);
+
+        if (!project.getLeaderId().equals(leaderId)) {
+            throw new ProjectBadRequestException("프로젝트 변경 권한이 없습니다.");
+        }
+    }
+
     @Transactional
     public void updateProject(String userId, UpdateProjectRequest request) {
         // todo
         // 프로젝트 멤버 검증
+        validateProjectUser(userId, request.projectId());
+
         Project project = this.findProjectById(request.projectId());
         Project updatedProject = project.updateProject(request);
         projectRepository.save(updatedProject);
@@ -81,9 +100,9 @@ public void updateProject(String userId, UpdateProjectRequest request) {
     public GetProjectResponse deleteProject(String userId, String projectId) {
         // todo
         // 프로젝트 리더 검증
-        Project project = this.findProjectById(projectId);
-
+        validateProjectLeader(userId, projectId);
 
+        Project project = this.findProjectById(projectId);
         projectRepository.delete(project);
 
         return GetProjectResponse.builder().build();
@@ -98,6 +117,7 @@ public GetProjectResponse getProject(String projectId) {
 
         return GetProjectResponse.builder()
                 .projectId(projectId)
+                .projectSequence(project.getSeq())
                 .name(project.getName().getName())
                 .content(project.getContent().getContent())
                 .field(project.getField().name())
@@ -111,7 +131,7 @@ public GetProjectResponse getProject(String projectId) {
     }
 
     public ListResponse<GetProjectResponse> getProjectList(Long end) {
-        List<Project> projects = projectRepository.findAllByEndId(end);
+        List<Project> projects = projectRepository.findAllByEndSequence(end);
 
         return (ListResponse<GetProjectResponse>) new ListResponse(projects);
     }