Sprint 8 solution

src/model/Epic.java

@@ -1,9 +1,12 @@
 package model;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 
 public class Epic extends Task {
     private ArrayList<Integer> subtaskIds = new ArrayList<>();
+    private LocalDateTime endTime;
 
     public Epic(String name, String description) {
         super(name, description, Status.NEW);
@@ -34,19 +37,39 @@ public void removeSubtaskId(Integer subtaskId) {
         subtaskIds.remove(subtaskId);
     }
 
+    public void setEpicDuration(Duration duration) {
+        setDuration(duration);
+    }
+
+    public void setEpicStartTime(LocalDateTime startTime) {
+        setStartTime(startTime);
+    }
+
+    public void setEpicEndTime(LocalDateTime endTime) {
+        this.endTime = endTime;
+    }
+
+    @Override
+    public LocalDateTime getEndTime() {
+        return endTime;
+    }
+
     @Override
     public TaskType getType() {
         return TaskType.EPIC;
     }
 
     @Override
     public String toString() {
-        return "Epic{" +
-                "id=" + getId() +
-                ", name='" + getName() + '\'' +
-                ", description='" + getDescription() + '\'' +
-                ", status=" + getStatus() +
-                ", subtaskIds=" + subtaskIds +
-                '}';
-    }
-}
+        return "Epic{"
+                + "id=" + getId()
+                + ", name='" + getName() + '\''
+                + ", description='" + getDescription() + '\''
+                + ", status=" + getStatus()
+                + ", duration=" + getDuration()
+                + ", startTime=" + getStartTime()
+                + ", endTime=" + getEndTime()
+                + ", subtaskIds=" + subtaskIds
+                + '}';
+    }
+}

src/model/Subtask.java

@@ -1,12 +1,19 @@
 package model;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 public class Subtask extends Task {
     private int epicId;
 
     public Subtask(String name, String description, Status status, int epicId) {
-        super(name, description, status);
+        this(name, description, status, null, null, epicId);
+    }
+
+    public Subtask(String name, String description, Status status,
+                   Duration duration, LocalDateTime startTime, int epicId) {
+        super(name, description, status, duration, startTime);
         this.epicId = epicId;
     }
 
@@ -49,12 +56,15 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "Subtask{" +
-                "id=" + getId() +
-                ", name='" + getName() + '\'' +
-                ", description='" + getDescription() + '\'' +
-                ", status=" + getStatus() +
-                ", epicId=" + epicId +
-                '}';
+        return "Subtask{"
+                + "id=" + getId()
+                + ", name='" + getName() + '\''
+                + ", description='" + getDescription() + '\''
+                + ", status=" + getStatus()
+                + ", duration=" + getDuration()
+                + ", startTime=" + getStartTime()
+                + ", endTime=" + getEndTime()
+                + ", epicId=" + epicId
+                + '}';
     }
 }

src/model/Task.java

@@ -1,17 +1,27 @@
 package model;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.Objects;
 
 public class Task {
     private int id;
     private String name;
     private String description;
     private Status status;
+    private Duration duration;
+    private LocalDateTime startTime;
 
     public Task(String name, String description, Status status) {
+        this(name, description, status, null, null);
+    }
+
+    public Task(String name, String description, Status status, Duration duration, LocalDateTime startTime) {
         this.name = name;
         this.description = description;
         this.status = status;
+        this.duration = duration;
+        this.startTime = startTime;
     }
 
     public TaskType getType() {
@@ -50,6 +60,29 @@ public void setStatus(Status status) {
         this.status = status;
     }
 
+    public Duration getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Duration duration) {
+        this.duration = duration;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+    public LocalDateTime getEndTime() {
+        if (startTime == null || duration == null) {
+            return null;
+        }
+        return startTime.plus(duration);
+    }
+
     // Переопределение методов equals и hashCode для ID
     @Override
     public boolean equals(Object obj) {
@@ -71,6 +104,9 @@ public String toString() {
                 + ", name='" + name + '\''
                 + ", description='" + description + '\''
                 + ", status=" + status
+                + ", duration=" + duration
+                + ", startTime=" + startTime
+                + ", endTime=" + getEndTime()
                 + '}';
     }
 }

src/service/FileBackedTaskManager.java

@@ -12,6 +12,8 @@
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.TreeMap;
 
 public class FileBackedTaskManager extends InMemoryTaskManager {
@@ -24,7 +26,7 @@ public FileBackedTaskManager(File file) {
     // Сохраняет текущее состояние менеджера в CSV-файл
     private void save() {
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
-            writer.write("id,type,name,status,description,epic");
+            writer.write("id,type,name,status,description,duration,startTime,epic");
             writer.newLine();
 
             TreeMap<Integer, Task> allTasks = new TreeMap<>();
@@ -50,26 +52,35 @@ private void save() {
         }
     }
 
-    // Преобразует задачу в строку формата CSV
+    // Преобразует задачу в строку формата CSV с учетом времени и продолжительности
     private String toString(Task task) {
         StringBuilder builder = new StringBuilder();
 
         builder.append(task.getId()).append(",");
         builder.append(task.getType()).append(",");
-
         builder.append(task.getName()).append(",");
         builder.append(task.getStatus()).append(",");
         builder.append(task.getDescription()).append(",");
 
-        if (task instanceof Subtask) {
+        if (task.getDuration() != null) {
+            builder.append(task.getDuration().toMinutes());
+        }
+        builder.append(",");
+
+        if (task.getStartTime() != null) {
+            builder.append(task.getStartTime());
+        }
+        builder.append(",");
+
+        if (task.getType() == TaskType.SUBTASK) {
             Subtask subtask = (Subtask) task;
             builder.append(subtask.getEpicId());
         }
 
         return builder.toString();
     }
 
-    // Преобразует строку CSV в объект задачи
+    // Преобразует строку CSV в объект задачи с учетом времени и продолжительности
     private static Task fromString(String value) {
         String[] fields = value.split(",", -1);
 
@@ -79,16 +90,26 @@ private static Task fromString(String value) {
         Status status = Status.valueOf(fields[3]);
         String description = fields[4];
 
+        Duration duration = null;
+        if (!fields[5].isBlank()) {
+            duration = Duration.ofMinutes(Long.parseLong(fields[5]));
+        }
+
+        LocalDateTime startTime = null;
+        if (!fields[6].isBlank()) {
+            startTime = LocalDateTime.parse(fields[6]);
+        }
+
         Task task;
 
         if (taskType == TaskType.TASK) {
-            task = new Task(name, description, status);
+            task = new Task(name, description, status, duration, startTime);
         } else if (taskType == TaskType.EPIC) {
             task = new Epic(name, description);
             task.setStatus(status);
         } else {
-            int epicId = Integer.parseInt(fields[5]);
-            task = new Subtask(name, description, status, epicId);
+            int epicId = Integer.parseInt(fields[7]);
+            task = new Subtask(name, description, status, duration, startTime, epicId);
         }
 
         task.setId(id);

src/service/InMemoryHistoryManager.java

@@ -25,6 +25,8 @@ private Task makeSnapshot(Task task) {
                     original.getName(),
                     original.getDescription(),
                     original.getStatus(),
+                    original.getDuration(),
+                    original.getStartTime(),
                     original.getEpicId()
             );
             copy.setId(original.getId());
@@ -35,9 +37,18 @@ private Task makeSnapshot(Task task) {
             copy.setId(original.getId());
             copy.setStatus(original.getStatus());
             copy.setSubtaskIds(original.getSubtaskIds());
+            copy.setEpicDuration(original.getDuration());
+            copy.setEpicStartTime(original.getStartTime());
+            copy.setEpicEndTime(original.getEndTime());
             return copy;
         } else {
-            Task copy = new Task(task.getName(), task.getDescription(), task.getStatus());
+            Task copy = new Task(
+                    task.getName(),
+                    task.getDescription(),
+                    task.getStatus(),
+                    task.getDuration(),
+                    task.getStartTime()
+            );
             copy.setId(task.getId());
             return copy;
         }