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

Weekly -> Develop
kakao-tech-campus-2nd-step3 · Nov 9, 2024 · 0c65d49 · 0c65d49
2 parents 7146f00 + 630265a
commit 0c65d49
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/team1/BE/seamless/entity/TaskEntity.java b/src/main/java/team1/BE/seamless/entity/TaskEntity.java
@@ -25,11 +25,12 @@ public TaskEntity(
         MemberEntity member,
         LocalDateTime startDate,
         LocalDateTime endDate,
-        Integer progress) {
+        Integer progress,
+        Status status) {
         this.name = name;
         this.description = description;
         this.progress = progress;
-        this.status = Status.PENDING;
+        this.status = status;
         this.priority = priority;
         this.isDeleted = false;
         this.projectEntity = project;

diff --git a/src/main/java/team1/BE/seamless/mapper/TaskMapper.java b/src/main/java/team1/BE/seamless/mapper/TaskMapper.java
@@ -23,7 +23,8 @@ public TaskEntity toEntity(ProjectEntity project, MemberEntity member, TaskCreat
             member,
             taskCreate.getStartDate(),
             taskCreate.getEndDate(),
-            taskCreate.getProgress());
+            taskCreate.getProgress(),
+            taskCreate.getStatus());
     }
 
     public TaskEntity toUpdate(TaskEntity task, TaskUpdate update) {

diff --git a/...1/BE/seamless/e2e/ProjectServiceTest.java → ...team1/BE/seamless/e2e/ProjectE2ETest.java b/...1/BE/seamless/e2e/ProjectServiceTest.java → ...team1/BE/seamless/e2e/ProjectE2ETest.java
@@ -26,7 +26,7 @@
 import team1.BE.seamless.service.ProjectService;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-class ProjectServiceTest {
+class ProjectE2ETest {
     @LocalServerPort
     private int port;
     private String url = "http://localhost:";
@@ -35,7 +35,7 @@ class ProjectServiceTest {
     private HttpHeaders headers = new HttpHeaders();
     private final ProjectService projectService;
     @Autowired
-    public ProjectServiceTest(TestRestTemplate restTemplate, ProjectService projectService) {
+    public ProjectE2ETest(TestRestTemplate restTemplate, ProjectService projectService) {
         this.restTemplate = restTemplate;
         this.projectService = projectService;
     }