Merge pull request #153 from kakao-tech-campus-2nd-step3/weekly

오류 수정
kakao-tech-campus-2nd-step3 · Nov 14, 2024 · 6cc74a9 · 6cc74a9
2 parents 027953a + f544688
commit 6cc74a9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/src/main/java/team1/be/seamless/init/ProjectCreator.java b/src/main/java/team1/be/seamless/init/ProjectCreator.java
@@ -28,5 +28,15 @@ public void creator() {
                 LocalDateTime.of(2024, 10, 1, 0, 0, 0),
                 LocalDateTime.of(2025, 10, 1, 0, 0, 0)
             ), "[email protected]", Role.USER.getKey());
+
+        projectService.createProject(
+            new ProjectCreate(
+                "프로젝트 이름2",
+                "프로젝트 설명2",
+                "https://example.com/image2.jpg",
+                List.of(1L, 2L, 3L),
+                LocalDateTime.of(2024, 11, 11, 0, 0, 0),
+                LocalDateTime.of(2025, 11, 11, 0, 0, 0)
+            ), "[email protected]", Role.USER.getKey());
     }
 }
diff --git a/src/main/java/team1/be/seamless/service/ProjectService.java b/src/main/java/team1/be/seamless/service/ProjectService.java
@@ -71,9 +71,6 @@ public Page<ProjectDetail> getProjectList(ProjectDTO.getList param, String email
      * @return : 해당 Id의 프로젝트의 정보를 반환 repository 조회시 존재 하지 않을 경우 Throw Not Found
      */
     public ProjectDetail getProject(long projectId, String email, String role) {
-        //USER만 권한 존재
-        validateRole(role);
-
         ProjectEntity projectEntity = projectRepository.findByIdAndIsDeletedFalse(projectId)
             .orElseThrow(() -> new BaseHandler(HttpStatus.NOT_FOUND, "프로젝트가 존재하지 않음"));
 
@@ -187,9 +184,6 @@ public ProjectDetail updateProject(long projectId, ProjectUpdate update, String
                 }
             });
 
-
-
-
         projectMapper.toUpdate(projectEntity, update, newProjectOptionEntities);
 
         return projectMapper.toDetail(projectEntity);

diff --git a/src/main/java/team1/be/seamless/service/TaskService.java b/src/main/java/team1/be/seamless/service/TaskService.java
@@ -51,9 +51,6 @@ public TaskDetail getTask(Long taskId) {
 
     public Page<TaskWithOwnerDetail> getTaskList(Long projectId, String status, String priority, Long ownerId, getList param) {
 
-//        MemberEntity memberEntity = memberRepository.findByIdAndIsDeleteFalse(ownerId)
-//                    .orElseThrow(() -> new BaseHandler(HttpStatus.NOT_FOUND, "존재하지 않는 멤버"));
-
         Page<TaskEntity> taskEntities = taskRepository.findByProjectIdAndOptionalFilters(
             projectId, status, priority, ownerId, param.toPageable());
 

diff --git a/src/test/java/team1/be/seamless/e2e/TaskE2ETest.java b/src/test/java/team1/be/seamless/e2e/TaskE2ETest.java
@@ -89,7 +89,7 @@ public void setUp() {
         HttpEntity<Long> requestEntity = new HttpEntity(body, headers);
 
         ResponseEntity<String> responseEntity = restTemplate.exchange(
-            url + port + "/api/project/1/task", POST, requestEntity, String.class);
+            url + port + "/api/project/2/task", POST, requestEntity, String.class);
 
         assertThat(responseEntity.getStatusCode()).isEqualTo(BAD_REQUEST);
     }
@@ -104,7 +104,7 @@ public void setUp() {
         HttpEntity<Long> requestEntity = new HttpEntity(body, headers);
 
         ResponseEntity<String> responseEntity = restTemplate.exchange(
-            url + port + "/api/project/1/task", POST, requestEntity, String.class);
+            url + port + "/api/project/2/task", POST, requestEntity, String.class);
 
         assertThat(responseEntity.getStatusCode()).isEqualTo(BAD_REQUEST);
     }
@@ -113,12 +113,12 @@ public void setUp() {
     @Test
     public void 프로젝트_삭제시_태스크_조회_실패() {
         // 프로젝트 삭제
-        projectService.deleteProject(1L, "[email protected]", Role.USER.toString());
+        projectService.deleteProject(2L, "[email protected]", Role.USER.toString());
 
         HttpEntity<Long> requestEntity = new HttpEntity<>(headers);
 
         ResponseEntity<String> responseEntity = restTemplate.exchange(
-            url + port + "/api/project/task/1", GET, requestEntity, String.class);
+            url + port + "/api/project/task/2", GET, requestEntity, String.class);
 
         assertThat(responseEntity.getStatusCode()).isEqualTo(NOT_FOUND);
     }

diff --git a/src/test/java/team1/be/seamless/service/TaskServiceTest.java b/src/test/java/team1/be/seamless/service/TaskServiceTest.java
@@ -131,7 +131,6 @@ void setUp() {
             "HIGH",
             1L,
             taskParam.toPageable())).thenReturn(tasks);
-        when(memberRepository.findByIdAndIsDeleteFalse(1L)).thenReturn(Optional.of(memberEntity));
         when(taskMapper.toDetailWithOwner(any(TaskEntity.class)))
             .thenReturn(mock(TaskDTO.TaskWithOwnerDetail.class));
 
@@ -148,7 +147,6 @@ void setUp() {
         assertThat(result.getTotalElements()).isEqualTo(2);
         verify(taskRepository, times(1)).findByProjectIdAndOptionalFilters(
             1L, "IN_PROGRESS", "HIGH", 1L, taskParam.toPageable());
-        verify(memberRepository, times(1)).findByIdAndIsDeleteFalse(1L);
         verify(taskMapper, atLeastOnce()).toDetailWithOwner(any(TaskEntity.class));
     }