Реализация задач ТЗ спринта 8

src/app/Main.java

@@ -1,5 +1,8 @@
 package app;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
+
 import model.*;
 import service.Managers;
 import service.TaskManager;
@@ -42,16 +45,21 @@ public static void main(String[] args) {
     private static TaskManager getTaskManager() {
         TaskManager manager = Managers.getDefault();
 
-        Task taskA = new Task("Задача A", "Описание задачи A", Status.NEW);
-        Task taskB = new Task("Задача B", "Описание задачи B", Status.DONE);
+        LocalDateTime testDateTime = LocalDateTime.now();
+        Duration testDuration = Duration.ofMinutes(30);
+
+        Task taskA = new Task("Задача A", "Описание задачи A", Status.NEW,
+                testDuration, testDateTime);
+        Task taskB = new Task("Задача B", "Описание задачи B", Status.DONE,
+                testDuration, testDateTime.plus(Duration.ofHours(1)));
         Epic epicA = new Epic("Эпик A", "Описание эпика с тремя подзадачами");
         Epic epicB = new Epic("Эпик B", "Описание эпика без подзадач");
         SubTask subTaskA = new SubTask("Подзадача A1", "Подзадача 1 эпика A",
-                Status.NEW, 3);
+                Status.NEW, 3, testDuration, testDateTime.plus(Duration.ofHours(2)));
         SubTask subTaskB = new SubTask("Подзадача A2", "Подзадача 2 эпика A",
-                Status.DONE, 3);
+                Status.DONE, 3, testDuration, testDateTime.plus(Duration.ofHours(3)));
         SubTask subTaskC = new SubTask("Подзадача A3", "Подзадача 3 эпика A",
-                Status.NEW, 3);
+                Status.NEW, 3, testDuration, testDateTime.plus(Duration.ofHours(4)));
 
         manager.createTask(taskA); // id = 1
         manager.createTask(taskB); // id = 2
@@ -66,9 +74,7 @@ private static TaskManager getTaskManager() {
     private static void printAllTasks(TaskManager manager) {
         System.out.println();
         System.out.println("Задачи:");
-        for (Task task : manager.getTasks()) {
-            System.out.println(task);
-        }
+        manager.getTasks().forEach(System.out::println);
         System.out.println();
 
         System.out.println("Эпики:");
@@ -82,15 +88,11 @@ private static void printAllTasks(TaskManager manager) {
         System.out.println();
 
         System.out.println("Подзадачи:");
-        for (Task subtask : manager.getSubTasks()) {
-            System.out.println(subtask);
-        }
+        manager.getSubTasks().forEach(System.out::println);
         System.out.println();
 
         System.out.println("История:");
-        for (Task task : manager.getHistory()) {
-            System.out.println(task);
-        }
+        manager.getHistory().forEach(System.out::println);
         System.out.println();
     }
 }

src/model/Epic.java

@@ -1,9 +1,13 @@
 package model;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class Epic extends Task {
     private Map<Integer, Status> relatedSubTaskMap;
+    private LocalDateTime endTime;
 
     public Epic(String title, String description) {
         super(title, description, Status.NEW);
@@ -59,6 +63,33 @@ public void updateSubTask(SubTask subTask) {
         }
     }
 
+    public void updateTimeFrame(TreeSet<SubTask> sortedSubTasks) {
+        TreeSet<SubTask> allSubTasks = sortedSubTasks;
+
+        Duration totalDuration = Duration.ofMinutes(
+                allSubTasks.stream()
+                        .reduce(
+                                0L,
+                                (subtotal, subTask) -> subtotal + subTask.getDuration().toMinutes(), Long::sum)
+        );
+
+        allSubTasks = sortedSubTasks.stream()
+                .filter(s -> s.getStartTime().isPresent())
+                .collect(Collectors.toCollection(TreeSet::new));
+
+        LocalDateTime startTime;
+        if (allSubTasks.isEmpty()) {
+            startTime = null;
+            setEndTime(null);
+        } else {
+            startTime = allSubTasks.getFirst().getStartTime().get();
+            SubTask lastSubTask = allSubTasks.getLast();
+            setEndTime(lastSubTask.getStartTime().get().plus(lastSubTask.getDuration()));
+        }
+        setStartTime(startTime);
+        setDuration(totalDuration);
+    }
+
     @Override
     public Status getStatus() {
         boolean isAllNew = true;
@@ -86,6 +117,15 @@ public Status getStatus() {
         }
     }
 
+    @Override
+    public Optional<LocalDateTime> getEndTime() {
+        return Optional.ofNullable(endTime);
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
     @Override
     public String toCSV(int headersCount) {
         return super.toCSV(headersCount).replace("TASK", "EPIC");
@@ -114,12 +154,23 @@ public boolean equals(Object object) {
 
     @Override
     public String toString() {
-        return "Epic{" +
-                "subTaskIdList=" + getSubTaskIdList() +
-                ", id=" + super.getId() +
-                ", title='" + super.getTitle() + '\'' +
-                ", description.length='" + super.getDescription().length() + '\'' +
-                ", status=" + getStatus() +
-                '}';
+        String durationString;
+
+        try {
+            durationString = String.valueOf(super.getDuration().toMinutes());
+        } catch (NullPointerException e) {
+            durationString = "N/A";
+        }
+        return String.format("Epic{subTaskIdList=%s, id=%d, title='%s', description.length='%d', "
+                        + "status=%s, startTime=%s, duration=%s min, endTime=%s}",
+                getSubTaskIdList(),
+                super.getId(),
+                super.getTitle(),
+                super.getDescription().length(),
+                super.getStatus(),
+                super.getFormatterStartTime(),
+                durationString,
+                super.getFormattedEndTime()
+        );
     }
 }

src/model/SubTask.java

@@ -1,15 +1,28 @@
 package model;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 public class SubTask extends Task {
     private final int epicId;
 
-    public SubTask(String title, String description, Status status, int epicId) {
+    protected SubTask(String title, String description, Status status, int epicId) {
         super(title, description, status);
         this.epicId = epicId;
     }
 
+    public SubTask(String title, String description, Status status, int epicId, Duration duration) {
+        this(title, description, status, epicId);
+        super.setDuration(duration);
+    }
+
+    public SubTask(String title, String description, Status status, int epicId,
+                   Duration duration, LocalDateTime startTime) {
+        this(title, description, status, epicId, duration);
+        super.setStartTime(startTime);
+    }
+
     public int getEpicId() {
         return epicId;
     }
@@ -43,12 +56,16 @@ public boolean equals(Object object) {
 
     @Override
     public String toString() {
-        return "SubTask{" +
-                "epicId=" + getEpicId() +
-                ", id=" + super.getId() +
-                ", title='" + super.getTitle() + '\'' +
-                ", description.length='" + super.getDescription().length() + '\'' +
-                ", status=" + super.getStatus() +
-                '}';
+        return String.format("SubTask{epicId=%d, id=%d, title='%s', description.length='%d', "
+                        + "status=%s, startTime=%s, duration=%d min, endTime=%s}",
+                getEpicId(),
+                super.getId(),
+                super.getTitle(),
+                super.getDescription().length(),
+                super.getStatus(),
+                super.getFormatterStartTime(),
+                super.getDuration().toMinutes(),
+                super.getFormattedEndTime()
+        );
     }
 }

src/model/Task.java

@@ -1,19 +1,36 @@
 package model;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.Objects;
+import java.util.Optional;
 
-public class Task {
+import service.utils.Utils;
+
+public class Task implements Comparable<Task> {
     private final String title;
     private final String description;
     private final Status status;
+    private Duration duration;
+    private LocalDateTime startTime;
     private int id;
 
-    public Task(String title, String description, Status status) {
+    protected Task(String title, String description, Status status) {
         this.title = title;
         this.description = description;
         this.status = status;
     }
 
+    public Task(String title, String description, Status status, Duration duration) {
+        this(title, description, status);
+        this.duration = duration;
+    }
+
+    public Task(String title, String description, Status status, Duration duration, LocalDateTime startTime) {
+        this(title, description, status, duration);
+        this.startTime = startTime;
+    }
+
     public int getId() {
         return id;
     }
@@ -34,13 +51,82 @@ public Status getStatus() {
         return status;
     }
 
+    public Optional<LocalDateTime> getEndTime() {
+        return Optional.ofNullable(startTime).map(time -> time.plus(duration));
+    }
+
+    public Duration getDuration() {
+        return duration;
+    }
+
+    protected void setDuration(Duration duration) {
+        this.duration = duration;
+    }
+
+    public Optional<LocalDateTime> getStartTime() {
+        return Optional.ofNullable(startTime);
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    protected String getFormatterStartTime() {
+        String startTimeString = "N/A";
+
+        if (getStartTime().isPresent()) {
+            startTimeString = getStartTime().get().format(Utils.formatter);
+        }
+
+        return startTimeString;
+    }
+
+    protected String getFormattedEndTime() {
+        String endTimeString = "N/A";
+
+        if (getEndTime().isPresent()) {
+            endTimeString = getEndTime().get().format(Utils.formatter);
+        }
+
+        return endTimeString;
+    }
+
     public String toCSV(int headersCount) {
-        return String.format("%s,%s,%s,%s,%s", id, "TASK", title, status, description);
+        String duration;
+        try {
+            duration = String.valueOf(getDuration().toMinutes());
+        } catch (NullPointerException e) {
+            duration = "0";
+        }
+        return String.format("%s,%s,%s,%s,%s,%s,%s",
+                id, "TASK", title, status, description,
+                getFormatterStartTime(), duration);
+    }
+
+    @Override
+    public int compareTo(Task task) {
+        Optional<LocalDateTime> timeA = this.getStartTime();
+        Optional<LocalDateTime> timeB = task.getStartTime();
+
+        if (timeA.isEmpty() && timeB.isEmpty()) {
+            return 0;
+        }
+
+        if (timeA.isPresent() && timeB.isEmpty()) {
+            return -1;
+        }
+
+        if (timeA.isEmpty()) {
+            return 1;
+        }
+
+        return timeA.get().compareTo(timeB.get());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(getId(), getTitle(), getDescription(), getStatus());
+        return Objects.hash(getId(), getTitle(), getDescription(),
+                getStatus(), getStartTime(), getDuration(), getEndTime());
     }
 
     @Override
@@ -59,16 +145,23 @@ public boolean equals(Object object) {
         return (this.id == task.id
                 && Objects.equals(this.title, task.title)
                 && Objects.equals(this.description, task.description)
+                && Objects.equals(this.getStartTime(), task.getStartTime())
+                && Objects.equals(this.duration, task.getDuration())
+                && Objects.equals(this.getEndTime(), task.getEndTime())
                 && this.getStatus() == task.getStatus());
     }
 
     @Override
     public String toString() {
-        return "Task{" +
-                "id=" + getId() +
-                ", title='" + getTitle() + '\'' +
-                ", description.length='" + getDescription().length() + '\'' +
-                ", status=" + getStatus() +
-                '}';
+        return String.format("Task{id=%d, title='%s', description.length='%d', "
+                        + "status=%s, startTime=%s, duration=%d min, endTime=%s}",
+                getId(),
+                getTitle(),
+                getDescription().length(),
+                getStatus(),
+                getFormatterStartTime(),
+                getDuration().toMinutes(),
+                getFormattedEndTime()
+        );
     }
 }