Java sprint 8 v1.0

1EVILGUN1 · 1EVILGUN1 · commit aebd1f14b474 · 2024-06-06T22:36:32.000+03:00
В классе Task и его наследниках были добавлены переменные startTime, duration, endTime. В классе FileBackedTaskManager добавлены поля для времени старта и продолжительности. 2 forEach переделаны под Stream API в классе InMemoryTaskManager
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/ru/yandex/javacource/golotin/schedule/model/Epic.java b/src/ru/yandex/javacource/golotin/schedule/model/Epic.java
@@ -1,18 +1,20 @@
 package ru.yandex.javacource.golotin.schedule.model;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 
 public class Epic extends Task {
 
     private final List<Integer> subtaskIds = new ArrayList<>();
 
-    public Epic(String name, Status status, String description) {
-        super(name, status, description);
+    public Epic(String name, Status status, String description, Instant startTime, int duration) {
+        super(name, status, description, startTime, duration);
     }
 
-    public Epic(int id, String name, String description, Status status) {
-        super(name, status, description);
+    public Epic(int id, String name, String description, Status status, Instant startTime, int duration) {
+        super(name, status, description,startTime, duration);
         setId(id);
     }
 
@@ -36,6 +38,10 @@ public TaskType getType() {
         return TaskType.EPIC;
     }
 
+    public void setSumDurationSubtasks(Duration duration) {
+        setDuration(getDuration().plus(duration).toMinutesPart());
+    }
+
     @Override
     public String toString() {
         return "Epic{" +
diff --git a/src/ru/yandex/javacource/golotin/schedule/model/Subtask.java b/src/ru/yandex/javacource/golotin/schedule/model/Subtask.java
@@ -1,17 +1,19 @@
 package ru.yandex.javacource.golotin.schedule.model;
 
+import java.time.Instant;
+
 public class Subtask extends Task {
 
     private Integer epicId;
 
-    public Subtask(String name, Status status, String description, int epicId) {
+    public Subtask(String name, Status status, String description, Instant startTime, int duration, int epicId) {
 
-        super(name, status, description);
+        super(name, status, description, startTime, duration);
         setEpicId(epicId);
     }
 
-    public Subtask(int id, String name, String description, Status status, Integer epicId) {
-        super(name, status, description);
+    public Subtask(int id, String name, String description, Status status, Instant startTime, int duration, Integer epicId) {
+        super(name, status, description, startTime, duration);
         setId(id);
         setEpicId(epicId);
     }
diff --git a/src/ru/yandex/javacource/golotin/schedule/model/Task.java b/src/ru/yandex/javacource/golotin/schedule/model/Task.java
@@ -1,24 +1,37 @@
 package ru.yandex.javacource.golotin.schedule.model;
 
+import java.time.Duration;
 import java.util.Objects;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 
 public class Task {
     private int id;
     private String name;
     private String description;
     private Status status;
 
-    public Task(String name, Status status, String description) {
+    private Instant startTime; // LocalDateTime
+    private Duration duration; // минуты или Duration
+    private Instant endTime;
+
+    public Task(String name, Status status, String description, Instant startTime, int duration) {
         this.name = name;
         this.status = status;
         this.description = description;
+        this.startTime = startTime;
+        this.duration = Duration.ofMinutes(duration);
+        this.endTime = startTime.plus(duration, ChronoUnit.MINUTES);
     }
 
-    public Task(int id, String name, String description, Status status) {
+    public Task(int id, String name, String description, Status status,Instant startTime, int duration) {
         setId(id);
         this.name = name;
         this.status = status;
         this.description = description;
+        this.startTime = startTime;
+        this.duration = Duration.ofMinutes(duration);
+        this.endTime = startTime.plus(duration, ChronoUnit.MINUTES);
     }
 
     public int getId() {
@@ -61,6 +74,18 @@ public void setStatus(Status status) {
         this.status = status;
     }
 
+    public Instant getStartTime() {return startTime;}
+
+    public void setStartTime(Instant startTime) {this.startTime = startTime;}
+
+    public Duration getDuration() {return duration;}
+
+    public void setDuration(int duration) {this.duration = Duration.ofMinutes(duration);}
+
+    public Instant getEndTime() {return endTime;}
+
+    public void setEndTime(Instant endTime) {this.endTime = endTime;}
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -83,4 +108,6 @@ public String toString() {
                 ", status=" + status +
                 '}';
     }
+
+
 }
diff --git a/src/ru/yandex/javacource/golotin/schedule/service/FileBackedTaskManager.java b/src/ru/yandex/javacource/golotin/schedule/service/FileBackedTaskManager.java
@@ -6,6 +6,8 @@
 
 import java.nio.file.Files;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.Map;
 
 import ru.yandex.javacource.golotin.schedule.exception.ManagerSaveException;
@@ -41,10 +43,10 @@ public static FileBackedTaskManager loadFromFile(File file) {
                     taskManager.createTask(task);
                 } else if (task.getType() == TaskType.SUBTASK) {
                     taskManager.createSubtask(new Subtask(task.getId(), task.getName(), task.getDescription(),
-                            task.getStatus(), task.getEpicId()));
+                            task.getStatus(),task.getStartTime(),task.getDuration().toMinutesPart(), task.getEpicId()));
                 } else if (task.getType() == TaskType.EPIC) {
                     taskManager.createEpic(new Epic(task.getId(), task.getName(), task.getDescription(),
-                            task.getStatus()));
+                            task.getStatus(),task.getStartTime(),task.getDuration().toMinutesPart()));
                     for (Subtask subtask : taskManager.subtasks.values()) {// Поиск подзадач эпика
                         if (subtask.getEpicId() == task.getId()) {
                             Epic epic = taskManager.epics.get(task.getId());
@@ -135,15 +137,17 @@ public static Task taskFromString(String value) {
         final String name = values[2];
         final Status status = Status.valueOf(values[3]);
         final String description = values[4];
+        final Instant startTime = Instant.parse(values[5]);
+        final Duration duration = Duration.parse(values[6]);
         if (type == TaskType.TASK) {
-            return new Task(id, name, description, status);
+            return new Task(id, name, description, status, startTime, duration.toMinutesPart());
         }
         if (type == TaskType.SUBTASK) {
             final int epicId = Integer.parseInt(values[5]);
-            return new Subtask(id, name, description, status, epicId);
+            return new Subtask(id, name, description, status, startTime, duration.toMinutesPart(), epicId);
         }
 
-        return new Epic(id, name, description, status);
+        return new Epic(id, name, description, status, startTime, duration.toMinutesPart());
     }
 
     protected void saveToFile() {
diff --git a/src/ru/yandex/javacource/golotin/schedule/service/InMemoryTaskManager.java b/src/ru/yandex/javacource/golotin/schedule/service/InMemoryTaskManager.java
@@ -1,15 +1,14 @@
 package ru.yandex.javacource.golotin.schedule.service;
 
+import ru.yandex.javacource.golotin.schedule.exception.ManagerSaveException;
 import ru.yandex.javacource.golotin.schedule.exception.NotFoundException;
 import ru.yandex.javacource.golotin.schedule.model.Epic;
 import ru.yandex.javacource.golotin.schedule.model.Status;
 import ru.yandex.javacource.golotin.schedule.model.Subtask;
 import ru.yandex.javacource.golotin.schedule.model.Task;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 public class InMemoryTaskManager implements TaskManager {
@@ -18,7 +17,7 @@ public class InMemoryTaskManager implements TaskManager {
     protected final Map<Integer, Epic> epics;
     protected final Map<Integer, Subtask> subtasks;
     protected final HistoryManager historyManager;
-
+    protected final Set<Task> prioritizedTasks = new TreeSet<>(Comparator.comparing(Task::getStartTime));
 
     public InMemoryTaskManager(HistoryManager historyManager) {
         this.historyManager = historyManager; // 3
@@ -31,6 +30,7 @@ public InMemoryTaskManager(HistoryManager historyManager) {
     public Task createTask(Task task) {// создание Task
         final int id = ++counterId;
         task.setId(id);
+        addPriorityTask(task);
         tasks.put(id, task);
         return task;
     }
@@ -39,6 +39,7 @@ public Task createTask(Task task) {// создание Task
     public Epic createEpic(Epic epic) {// создание Epic
         final int id = ++counterId;
         epic.setId(id);
+        addPriorityTask(epic);
         epics.put(id, epic);
         return epic;
     }
@@ -51,8 +52,10 @@ public Subtask createSubtask(Subtask subtask) {// создание Subtask
         if (epic == null) {
             return null;
         }
+        epic.setSumDurationSubtasks(subtask.getDuration());
         final int id = ++counterId;
         subtask.setId(id);
+        addPriorityTask(subtask);
         subtasks.put(id, subtask);
         epic.addSubtaskId(subtask.getId());
         updateEpicStatus(epicId);
@@ -61,37 +64,39 @@ public Subtask createSubtask(Subtask subtask) {// создание Subtask
 
     @Override
     public void updateTask(Task task) {// обновление Task
-        final int id = task.getId();
-        final Task savedTask = tasks.get(id);
+        final Task savedTask = tasks.get(task.getId());
         if (savedTask == null) {
             return;
         }
-        tasks.put(id, task);
+        addPriorityTask(task);
+        tasks.put(task.getId(), task);
     }
 
     @Override
     public void updateEpic(Epic epic) {// обновление Epic
-        Epic savedEpic = epics.get(epic.getId());
+       final Epic savedEpic = epics.get(epic.getId());
         if (savedEpic == null) {
             return;
         }
         savedEpic.setName(epic.getName());
         savedEpic.setDescription(epic.getDescription());
+        addPriorityTask(savedEpic);
+        epics.put(epic.getId(), epic);
     }
 
     @Override
     public void updateSubtask(Subtask subtask) {// обновление Subtask
-        final int id = subtask.getId();
         final int epicId = subtask.getEpicId();
-        final Subtask savedSubtask = subtasks.get(id);
+        final Subtask savedSubtask = subtasks.get(subtask.getId());
         if (savedSubtask == null) {
             return;
         }
         final Epic epic = epics.get(epicId);
         if (epic == null) {
             return;
         }
-        subtasks.put(id, subtask);
+        addPriorityTask(savedSubtask);
+        subtasks.put(subtask.getId(), subtask);
         updateEpicStatus(epicId);// обновление статуса у Epic
     }
 
@@ -155,13 +160,13 @@ public List<Epic> getEpics() {
     @Override
     public List<Subtask> getEpicSubtasks(int epicId) {// получаем список Epic с Subtasks
         Epic epic = epics.get(epicId);
-        ArrayList<Subtask> getSubtasks = null;
-        for (Integer subtaskId : epic.getSubtaskIds()) {
-            if (this.subtasks.containsKey(subtaskId)) {
-                getSubtasks.add(this.subtasks.get(subtaskId));
-            }
-        }
-        return getSubtasks;
+//        ArrayList<Subtask> getSubtasks = null;
+//        for (Integer subtaskId : epic.getSubtaskIds()) {
+//            if (this.subtasks.containsKey(subtaskId)) {
+//                getSubtasks.add(this.subtasks.get(subtaskId));
+//            }
+//        }
+        return epic.getSubtaskIds().stream().map(subtasks::get).collect(Collectors.toList());
     }
 
     @Override
@@ -202,12 +207,15 @@ public List<Task> getHistory() {// получаем список истории
 
     private void updateEpicStatus(int epicId) {// обновление статуса Epic
         Epic epic = epics.get(epicId);
-        ArrayList<Subtask> subtasks = new ArrayList<>();
-        for (Integer subtaskId : epic.getSubtaskIds()) {
-            if (this.subtasks.containsKey(subtaskId)) {
-                subtasks.add(this.subtasks.get(subtaskId));
-            }
-        }
+        List<Subtask> subtasks = epic.getSubtaskIds().stream()
+                .filter(this.subtasks::containsKey)
+                .map(this.subtasks::get)
+                .toList();
+//        for (Integer subtaskId : epic.getSubtaskIds()) {
+//            if (this.subtasks.containsKey(subtaskId)) {
+//                subtasks.add(this.subtasks.get(subtaskId));
+//            }
+//        }
         for (Subtask statusSubtask : subtasks) {
             short subtaskNew = 0;
             short subtaskDone = 0;
@@ -232,4 +240,15 @@ private void updateEpicStatus(int epicId) {// обновление статус
         }
     }
 
+    private void addPriorityTask(Task task) {
+        for(Task t : prioritizedTasks){
+            if(t.getStartTime()==task.getStartTime()){
+                throw new ManagerSaveException("Пересечение с задачей "+ task.toString());
+            }
+        }
+        prioritizedTasks.add(task);
+    }
+    public List<Task> getPrioritizedTasks(){
+            return new ArrayList<>(prioritizedTasks);
+    }
 }
