From 430f71c974d7155c6f72ff5bfce969d9decad600 Mon Sep 17 00:00:00 2001 From: sunandrabbit Date: Sat, 9 Nov 2024 20:38:48 +0900 Subject: [PATCH 1/2] =?UTF-8?q?rename=20:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../e2e/{ProjectServiceTest.java => ProjectE2ETest.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/test/java/team1/BE/seamless/e2e/{ProjectServiceTest.java => ProjectE2ETest.java} (98%) diff --git a/src/test/java/team1/BE/seamless/e2e/ProjectServiceTest.java b/src/test/java/team1/BE/seamless/e2e/ProjectE2ETest.java similarity index 98% rename from src/test/java/team1/BE/seamless/e2e/ProjectServiceTest.java rename to src/test/java/team1/BE/seamless/e2e/ProjectE2ETest.java index c66b7b2b..b38821c0 100644 --- a/src/test/java/team1/BE/seamless/e2e/ProjectServiceTest.java +++ b/src/test/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; } From 630265aecad5c4b88cdfdbba524d59f03f28884d Mon Sep 17 00:00:00 2001 From: sunandrabbit Date: Sat, 9 Nov 2024 21:04:52 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EC=83=9D=EC=84=B1=EC=8B=9C?= =?UTF-8?q?=EC=97=90=20=EC=9E=85=EB=A0=A5=EC=82=B0=20status=20=EA=B0=92?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=83=9D=EC=84=B1=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/team1/BE/seamless/entity/TaskEntity.java | 5 +++-- src/main/java/team1/BE/seamless/mapper/TaskMapper.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/team1/BE/seamless/entity/TaskEntity.java b/src/main/java/team1/BE/seamless/entity/TaskEntity.java index b1f07a3f..b2f8a5d9 100644 --- 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 index 699f8aa7..1eb07e82 100644 --- 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) {