Merge branch 'development'

# Conflicts:
#	.github/workflows/mainline-merge.yml

.github/workflows/merge-dev-into-main.yml → .github/workflows/mainline-merge.yml

@@ -1,4 +1,4 @@
-name: Merge Dev into Main
+name: Mainline merge
 
 on:
   workflow_dispatch:
@@ -36,4 +36,4 @@ jobs:
           git checkout main
           git pull origin main
           git merge --no-ff origin/development -m "GitHub Action: Merge development branch into main"
-          git push --force origin main
+          git push origin main

.github/workflows/continuous-integration.yml → .github/workflows/taskmanager-ci.yml

@@ -1,4 +1,4 @@
-name: Continuous Integration
+name: TaskManager CI
 
 on:
   push:

src/main/java/taskmanager/dto/TaskDTO.java

@@ -2,7 +2,7 @@
 
 import lombok.*;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -13,6 +13,6 @@ public class TaskDTO {
     private List<Long> labelIds;
     private String title;
     private Integer priority;
-    private Date dueDate;
+    private LocalDate dueDate;
     private String description;
 }

src/main/java/taskmanager/entity/Task.java

@@ -3,7 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 
 @Entity
@@ -23,7 +23,7 @@ public class Task {
 
     @OneToMany(fetch = FetchType.LAZY, mappedBy = "task")
     @NonNull
-    private List<Label> label;
+    private List<Label> labels;
 
     @NonNull
     private String title;
@@ -32,7 +32,7 @@ public class Task {
     private Integer priority;
 
     @NonNull
-    private Date dueDate;
+    private LocalDate dueDate;
 
     @NonNull
     private String description;

src/main/java/taskmanager/mapper/TaskMapper.java

@@ -13,7 +13,7 @@ public static TaskDTO toDto(Task task) {
         return new TaskDTO(
                 task.getId(),
                 task.getProject().getId(),
-                task.getLabel().stream().map(Label::getId).collect(Collectors.toList()),
+                task.getLabels().stream().map(Label::getId).collect(Collectors.toList()),
                 task.getTitle(),
                 task.getPriority(),
                 task.getDueDate(),

src/test/java/taskmanager/mapper/TaskMapperTests.java

@@ -0,0 +1,109 @@
+package taskmanager.mapper;
+
+import org.junit.jupiter.api.Test;
+
+import taskmanager.dto.TaskDTO;
+import taskmanager.entity.Label;
+import taskmanager.entity.Project;
+import taskmanager.entity.Task;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class TaskMapperTests {
+
+    @Test
+    void Should_MapTaskEntityToDto() {
+        // Arrange
+        Task task = getTask();
+        List<Long> taskLabelIds = getLabelIds(task.getLabels());
+
+        // Act
+        TaskDTO taskDTO = TaskMapper.toDto(task);
+
+        // Assert
+        assertNotNull(taskDTO);
+        assertEquals(task.getId(), taskDTO.getId());
+        assertEquals(task.getProject().getId(), taskDTO.getProjectId());
+        assertEquals(taskLabelIds, taskDTO.getLabelIds());
+        assertEquals(task.getTitle(), taskDTO.getTitle());
+        assertEquals(task.getPriority(), taskDTO.getPriority());
+        assertEquals(task.getDueDate(), taskDTO.getDueDate());
+        assertEquals(task.getDescription(), taskDTO.getDescription());
+    }
+
+    @Test
+    void Should_MapTaskDtoToTaskEntity() {
+        // Arrange
+        var project = new Project();
+        project.setId(23456L);
+
+        List<Label> labels = getLabelList(List.of(34567L, 45678L));
+        TaskDTO taskDto = getTaskDto(project, labels);
+
+        // Act
+        Task taskEntity = TaskMapper.toEntity(taskDto, project, labels);
+
+        // Assert
+        assertNotNull(taskEntity);
+        assertEquals(taskDto.getId(), taskEntity.getId());
+        assertEquals(project, taskEntity.getProject());
+        assertEquals(labels, taskEntity.getLabels());
+        assertEquals(taskDto.getTitle(), taskEntity.getTitle());
+        assertEquals(taskDto.getPriority(), taskEntity.getPriority());
+        assertEquals(taskDto.getDueDate(), taskEntity.getDueDate());
+        assertEquals(taskDto.getDescription(), taskEntity.getDescription());
+    }
+
+    private static List<Label> getLabelList(List<Long> labelIds) {
+        List<Label> labels = new ArrayList<>();
+
+        for (Long labelId : labelIds) {
+            var label = new Label();
+            label.setId(labelId);
+            labels.add(label);
+        }
+
+        return labels;
+    }
+
+    private static Task getTask() {
+        var project = new Project();
+        project.setId(12345L);
+
+        List<Label> labels = getLabelList(List.of(34567L, 45678L));
+
+        Task task = new Task(
+                project,
+                labels,
+                "Sample Task One",
+                5,
+                LocalDate.of(2024, 1, 1),
+                "This is the first sample task."
+        );
+        task.setId(10L);
+
+        return task;
+    }
+
+    private static TaskDTO getTaskDto(Project project, List<Label> labels) {
+        List<Long> labelIds = getLabelIds(labels);
+
+        return new TaskDTO(
+                12345L,
+                project.getId(),
+                labelIds,
+                "Sample Task Two",
+                5,
+                LocalDate.of(2024, 1, 1),
+                "This is the second sample task."
+        );
+    }
+
+    private static List<Long> getLabelIds(List<Label> labels) {
+        return labels.stream().map(Label::getId).toList();
+    }
+}