Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weekly -> Develop #116

Merged
merged 4 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/team1/BE/seamless/entity/TaskEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/team1/BE/seamless/mapper/TaskMapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:";
Expand All @@ -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;
}
Expand Down