AlekseyGur · AlekseyGur · Dec 21, 2024 · Dec 19, 2024 · Dec 19, 2024 · Dec 19, 2024
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,3 @@
+# Верхний регистр для констант
+[*.{java,scala,js,py}]
+upper_case_constants = true
diff --git a/src/ru/alexgur/kanban/exceptions/ManagerAddTaskException.java b/src/ru/alexgur/kanban/exceptions/ManagerAddTaskException.java
@@ -0,0 +1,7 @@
+package ru.alexgur.kanban.exceptions;
+
+public class ManagerAddTaskException extends RuntimeException {
+    public ManagerAddTaskException(final String message) {
+        super(message);
+    }
+}
diff --git a/src/ru/alexgur/kanban/model/Epic.java b/src/ru/alexgur/kanban/model/Epic.java
@@ -4,10 +4,12 @@
 
 import ru.alexgur.kanban.service.TaskType;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 
 public class Epic extends Task {
     private List<Integer> subTasksIds = new ArrayList<>();
+    private LocalDateTime endTime; // дата и время завершения всех задач
 
     public Epic() {
         super();
@@ -21,6 +23,14 @@ public List<Integer> getSubTasksIds() {
         return subTasksIds;
     }
 
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
     public void setSubTasksIds(List<Integer> subTasksIds) {
         List<Integer> subTasksIdsFiltered = new ArrayList<>();
         for (Integer id : subTasksIds) {
@@ -46,8 +56,24 @@ public TaskType getType() {
 
     @Override
     public String toString() {
-        return "Task [id=" + id + ", name=" + getName() + ", text=" + getText() + ", status=" + getStatus()
-                + ", subTasksIds=" + subTasksIds + "]";
-    }
+        String start = "";
+        if (getStartTime() != null) {
+            start = getStartTime().format(dateTimeFormatter);
+        }
+
+        long durationStr = 0;
+        if (getDuration().isZero()) {
+            durationStr = getDuration().toMinutes();
+        }
 
+        return "Task [id=" + id +
+                ", type=" + getType() +
+                ", name=" + getName() +
+                ", text=" + getText() +
+                ", status=" + getStatus() +
+                ", startTime=" + start +
+                ", duration=" + durationStr +
+                ", subTasksIds=" + subTasksIds +
+                "]";
+    }
 }
diff --git a/src/ru/alexgur/kanban/model/SubTask.java b/src/ru/alexgur/kanban/model/SubTask.java
@@ -31,7 +31,24 @@ public TaskType getType() {
 
     @Override
     public String toString() {
-        return "Task [id=" + id + ", name=" + getName() + ", text=" + getText() + ", status=" + getStatus()
-                + ", epycId=" + epicId + "]";
+        String start = "";
+        if (getStartTime() != null) {
+            start = getStartTime().format(dateTimeFormatter);
+        }
+
+        long durationStr = 0;
+        if (getDuration().isZero()) {
+            durationStr = getDuration().toMinutes();
+        }
+
+        return "Task [id=" + id +
+                ", type=" + getType() +
+                ", name=" + getName() +
+                ", text=" + getText() +
+                ", status=" + getStatus() +
+                ", startTime=" + start +
+                ", duration=" + durationStr +
+                ", epycId=" + epicId +
+                "]";
     }
 }
diff --git a/src/ru/alexgur/kanban/model/Task.java b/src/ru/alexgur/kanban/model/Task.java
@@ -1,5 +1,9 @@
 package ru.alexgur.kanban.model;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 import ru.alexgur.kanban.service.Status;
 import ru.alexgur.kanban.service.TaskType;
 
@@ -9,6 +13,34 @@ public class Task {
     private String name; // название задачи
     private String text; // текст задачи
     private Status status; // статус задачи
+    private Duration duration = Duration.ZERO; // продолжительность задачи в минутах
+    private LocalDateTime startTime; // дата и время старта выполнения задачи
+    public static DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public Task setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+        return this;
+    }
+
+    public Duration getDuration() {
+        return duration;
+    }
+
+    public LocalDateTime getEndTime() {
+        if (getStartTime() == null) {
+            return null;
+        }
+        return startTime.plus(duration);
+    }
+
+    public Task setDuration(Duration duration) {
+        this.duration = duration;
+        return this;
+    }
 
     public Task() {
         this.status = Status.NEW;
@@ -53,6 +85,10 @@ public String getText() {
         return text;
     }
 
+    public static <T extends Task> int compareToStartTimeAsc(T a, T b) {
+        return a.getStartTime().isBefore(b.getStartTime()) ? -1 : 1;
+    }
+
     public Task setText(String text) {
         this.text = text;
         return this;
@@ -98,6 +134,23 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        return "Task [id=" + id + ", name=" + getName() + ", text=" + getText() + ", status=" + getStatus() + "]";
+        String start = "";
+        if (getStartTime() != null) {
+            start = getStartTime().format(dateTimeFormatter);
+        }
+
+        long durationStr = 0;
+        if (getDuration().isZero()) {
+            durationStr = getDuration().toMinutes();
+        }
+
+        return "Task [id=" + id +
+                ", type=" + getType() +
+                ", name=" + getName() +
+                ", text=" + getText() +
+                ", status=" + getStatus() +
+                ", startTime=" + start +
+                ", duration=" + durationStr +
+                "]";
     }
 }
diff --git a/src/ru/alexgur/kanban/service/FileBackedTaskManager.java b/src/ru/alexgur/kanban/service/FileBackedTaskManager.java
@@ -12,9 +12,13 @@
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 public class FileBackedTaskManager extends InMemoryTaskManager {
     private File fileToSave;
+    private DateTimeFormatter dateTimeFormatter = Task.dateTimeFormatter;
     private String eol = "\n";
     private String csvSplitter = ";";
 
@@ -142,6 +146,7 @@ public static FileBackedTaskManager loadFromFile(File file) {
         }
 
         taskManager.updateEpicsSubTasksIds();
+        taskManager.updateEpicsDurationStartEndTime();
         taskManager.setFile(file);
         return taskManager;
     }
@@ -152,7 +157,7 @@ private void save() {
         }
 
         try (FileWriter fileWriter = new FileWriter(fileToSave)) {
-            String csvHeader = "id,type,name,status,description,epic";
+            String csvHeader = "id,type,name,description,status,start,duration,epic";
             fileWriter.write(csvHeader + eol);
 
             for (List<? extends Task> target : List.of(getTasks(), getSubTasks(), getEpics())) {
@@ -170,15 +175,30 @@ private <T extends Task> String toString(T task) {
         if (task instanceof SubTask) {
             epicId = String.valueOf(((SubTask) task).getEpicId());
         }
+
+        String start = "";
+        if (task.getStartTime() != null) {
+            start = task.getStartTime().format(dateTimeFormatter);
+        }
+
+        long duration = 0;
+        if (task.getDuration().isZero()) {
+            duration = task.getDuration().toMinutes();
+        }
+
         return task.id
                 + csvSplitter
                 + task.getType()
                 + csvSplitter
                 + task.getName()
                 + csvSplitter
+                + task.getText()
+                + csvSplitter
                 + task.getStatus()
                 + csvSplitter
-                + task.getText()
+                + start
+                + csvSplitter
+                + duration
                 + csvSplitter
                 + epicId
                 + csvSplitter
@@ -190,25 +210,36 @@ private Object fromString(String line) {
 
         int id = Integer.valueOf(args[0]);
         TaskType type = TaskType.valueOf(args[1]);
-        Status status = Status.valueOf(args[3]);
         String name = args[2];
-        String text = args[4];
+        String text = args[3];
+        Status status = Status.valueOf(args[4]);
+        LocalDateTime startTime = LocalDateTime.parse(args[5], dateTimeFormatter);
+        int durationMinutes = Integer.valueOf(args[6]);
 
         switch (type) {
             case TASK:
                 Task task = new Task(id);
-                task.setName(name).setText(text).setStatus(status);
+                task.setName(name)
+                        .setText(text)
+                        .setStatus(status)
+                        .setStartTime(startTime)
+                        .setDuration(Duration.ofMinutes(durationMinutes));
                 return task;
             case SUBTASK:
-                int epicId = Integer.valueOf(args[5]);
+                int epicId = Integer.valueOf(args[7]);
 
                 SubTask subTask = new SubTask(id);
-                subTask.setName(name).setText(text).setStatus(status);
-                subTask.setEpicId(epicId);
+                subTask.setEpicId(epicId)
+                        .setName(name)
+                        .setText(text)
+                        .setStatus(status)
+                        .setStartTime(startTime)
+                        .setDuration(Duration.ofMinutes(durationMinutes));
                 return subTask;
             case EPIC:
                 Epic epic = new Epic(id);
-                epic.setName(name).setText(text);
+                epic.setName(name)
+                        .setText(text);
                 return epic;
         }
         return null;

diff --git a/src/ru/alexgur/kanban/service/InMemoryHistoryManager.java b/src/ru/alexgur/kanban/service/InMemoryHistoryManager.java
@@ -28,10 +28,8 @@ public void add(Task task) {
 
     @Override
     public List<Task> getHistory() {
-        List<Task> listTasks = new ArrayList<>();
-        for (Node node : getTasks()) {
-            listTasks.add(node.getTask());
-        }
+        List<Task> listTasks = getTasks().stream()
+                .map(x -> x.getTask()).toList();
         return listTasks;
     }