Merge pull request #47 from potenday-project/develop

Develop
potenday-project · Dec 16, 2023 · df9f995 · df9f995
2 parents 78fb860 + a9e42d3
commit df9f995
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/main/java/mvc/promiseme/project/dto/MemberRequestDTO.java b/src/main/java/mvc/promiseme/project/dto/MemberRequestDTO.java
@@ -0,0 +1,13 @@
+package mvc.promiseme.project.dto;
+
+import lombok.*;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+@Builder
+public class MemberRequestDTO {
+    private String email;
+    private String role;
+}
diff --git a/src/main/java/mvc/promiseme/project/dto/ProjectRequestDTO.java b/src/main/java/mvc/promiseme/project/dto/ProjectRequestDTO.java
@@ -18,5 +18,5 @@ public class ProjectRequestDTO {
     private LocalDate start;
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate deadline;
-    private List<MemberDTO> memberList;
+    private List<MemberRequestDTO> memberList;
 }
diff --git a/src/main/java/mvc/promiseme/project/service/ProjectServiceImpl.java b/src/main/java/mvc/promiseme/project/service/ProjectServiceImpl.java
@@ -4,6 +4,7 @@
 import mvc.promiseme.common.exception.ErrorCode;
 import mvc.promiseme.common.exception.UserException;
 import mvc.promiseme.project.dto.MemberDTO;
+import mvc.promiseme.project.dto.MemberRequestDTO;
 import mvc.promiseme.project.dto.ProjectRequestDTO;
 import mvc.promiseme.project.dto.ProjectResponseDTO;
 import mvc.promiseme.project.entity.Member;
@@ -15,6 +16,7 @@
 import mvc.promiseme.project.repository.RoleRepository;
 import mvc.promiseme.todo.dto.TodoRequestDTO;
 import mvc.promiseme.todo.entity.Todo;
+import mvc.promiseme.todo.repository.TodoRepository;
 import mvc.promiseme.users.entity.Users;
 import mvc.promiseme.users.repository.UserRepository;
 import org.springframework.stereotype.Service;
@@ -30,6 +32,7 @@ public class ProjectServiceImpl implements ProjectService {
     private final UserRepository userRepository;
     private final MemberRepository memberRepository;
     private final RoleRepository roleRepository;
+    private final TodoRepository todoRepository;
     @Override
     @Transactional
     public List<ProjectResponseDTO> projectAll(Long userId) {
@@ -54,17 +57,17 @@ public Long insert(ProjectRequestDTO projectRequestDTO) {
             Project project = p.mapToEntity(projectRequestDTO);
             projectRepository.save(project);
             System.out.println("projectId : " + project.getProjectId());
-            List<MemberDTO> memberList = projectRequestDTO.getMemberList();
+            List<MemberRequestDTO> memberList = projectRequestDTO.getMemberList();
 
-            for(MemberDTO m : memberList){
+            for(MemberRequestDTO m : memberList){
                 Role r = new Role();
                 Role role = roleRepository.findByName(m.getRole());
                 if(role==null) {
                     role = Role.builder().name(m.getRole()).build();
                     roleRepository.save(role);
                 }
                 System.out.println("role name "+role.getName());
-                Users user = userRepository.findById(m.getUserId()).orElseThrow(() -> new NoSuchElementException("[ERROR] 해당하는 사용자가 존재하지 않습니다."));
+                Users user = userRepository.findByEmailIgnoreCase(m.getEmail());
                 Member member = Member.builder().project(project).role(role).users(user).status(MemberStatus.PARTICIPATION).build();
                 memberRepository.save(member);
             }
@@ -77,6 +80,9 @@ public Long insert(ProjectRequestDTO projectRequestDTO) {
 
     @Override
     public int progress(Long projectId) {
+        Project project= projectRepository.findById(projectId).orElseThrow(()->new NoSuchElementException("프로젝트를 찾을 수 없습니다."));
+        List<Todo> todoList= todoRepository.findByProject(project);
+        if(todoList.isEmpty()) return 0;
         return projectRepository.getProgress(projectId);
 
     }

diff --git a/src/main/java/mvc/promiseme/todo/repository/TodoRepository.java b/src/main/java/mvc/promiseme/todo/repository/TodoRepository.java
@@ -1,6 +1,7 @@
 package mvc.promiseme.todo.repository;
 
 import mvc.promiseme.project.entity.Member;
+import mvc.promiseme.project.entity.Project;
 import mvc.promiseme.todo.entity.Todo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
@@ -9,4 +10,6 @@
 
 public interface TodoRepository extends JpaRepository<Todo,Long> {
     List<Todo> findByMemberAndAndTodoDate(Member member, LocalDate todoDate);
+
+    List<Todo> findByProject(Project project);
 }