Изменён тип поля completed на status в классе Task для использования перечисления TaskStatus. Добавлены методы для изменения статуса задачи: markCompleted, markInProgress и markCanceled. Обновлён класс TaskPrinter для отображения статуса задачи. Изменены методы в классе TodoApp для работы с новым статусом задач. Улучшена читаемость кода и логика управления задачами.

2025-05-20 20:17:46 +03:00 · 2025-05-20 20:17:46 +03:00 · 2db26eb77a
commit 2db26eb77a
parent 1932cdb297
3 changed files with 129 additions and 79 deletions
--- a/todo/src/main/java/ru/kamask/pet/Task.java
+++ b/todo/src/main/java/ru/kamask/pet/Task.java
@ -9,7 +9,7 @@ class Task {
    private int id;
    private String title;
    private String description;
-    private boolean completed;
+    private TaskStatus status;
    private LocalDate createdAt;

    static {
@ -19,6 +19,7 @@ class Task {

    {
        id = ++nextId;
+        status = TaskStatus.NEW;
        createdAt = LocalDate.now();
        taskCount++;
    }
@ -32,35 +33,20 @@ class Task {
        System.out.println("Колличество дел: " + taskCount);
    }

-    void printInfo() {
-        String stringCompleted = completed ? "[х]" : "[ ]";
-        System.out.printf("%-3d | %-20s | %s\n", id, title, stringCompleted);
+    boolean isCompleted() {
+        return status == TaskStatus.COMPLETED;
    }

-    void printInfo(boolean full) {
-        if (!full) {
-            printInfo();
-            return;
-        }
-
-        String template = """
-
-                ──────────────────────────────
-                Номер: %-3d
-                Дата создания: %s
-                Статус: %s
-                Название: %-20s
-                ------------------------------
-                %s
-
-                """;
-        ;
-        String stringCompleted = completed ? "выполнено" : "не выполнено";
-        System.out.printf(template, id, createdAt, stringCompleted, title, description);
+    void markCompleted() {
+        status = TaskStatus.COMPLETED;
    }

-    void toggleCompleted() {
-        completed = !completed;
+    void markInProgress() {
+        status = TaskStatus.IN_PROGRESS;
+    }
+
+    void markCanceled() {
+        status = TaskStatus.CANCELLED;
    }

    int getId() {
@ -71,13 +57,26 @@ class Task {
        return title;
    }

-    boolean getCompleted() {
-        return completed;
+    TaskStatus getStatus() {
+        return status;
    }

    static class TaskPrinter {
-        void print(Task task) {
-            task.printInfo(true);
+        static void print(Task task) {
+            String template = """
+
+                    ──────────────────────────────
+                    Номер: %-3d
+                    Дата создания: %s
+                    Статус: %s
+                    Название: %-20s
+                    ------------------------------
+                    %s
+
+                    """;
+            ;
+            String stringCompleted = task.status.getColorCode() + task.status.getDescription() + "\u001B[0m";
+            System.out.printf(template, task.id, task.createdAt, stringCompleted, task.title, task.description);
        }
    }

--- a/todo/src/main/java/ru/kamask/pet/TaskStatus.java
+++ b/todo/src/main/java/ru/kamask/pet/TaskStatus.java
@ -1,25 +1,25 @@
 package ru.kamask.pet;

 public enum TaskStatus {
-    NEW("Новое") {
-        @Override
-        String getColorCode() {
-            return "\u001B[32m";
-        }
-    },
-    IN_PROGRESS("В работе") {
-        @Override
-        String getColorCode() {
-            return "\u001B[35m";
-        }
-    },
-    COMPLETED("Сделано") {
+    NEW("новое") {
        @Override
        String getColorCode() {
            return "\u001B[34m";
        }
    },
-    CANCELLED("Отменено") {
+    IN_PROGRESS("в работе") {
+        @Override
+        String getColorCode() {
+            return "\u001B[35m";
+        }
+    },
+    COMPLETED("сделано") {
+        @Override
+        String getColorCode() {
+            return "\u001B[32m";
+        }
+    },
+    CANCELLED("отменено") {
        @Override
        String getColorCode() {
            return "\u001B[31m";
--- a/todo/src/main/java/ru/kamask/pet/TodoApp.java
+++ b/todo/src/main/java/ru/kamask/pet/TodoApp.java
@ -14,11 +14,7 @@ public class TodoApp {
        TodoApp app = new TodoApp();
        taskManager = app.new TaskManager();

-        TaskStatus status = TaskStatus.valueOf("NEW");
-
-        System.out.println(status.getDescription());
-
-        // app.run();
+        app.run();

    }

@ -73,14 +69,32 @@ public class TodoApp {
    }

    private static void displayTask(Task task) {
-        task.printInfo(true);
-        String firstOption = task.getCompleted() ? "[1]Не выполнено" : "[1]Выполнено";
-        int input = requestIntFromInput(firstOption + " [0]Главное меню\n\nВвод:",
-                new int[] { 0, 1 });
-        if (input == 1) {
-            task.toggleCompleted();
-            displayTask(task);
+        Task.TaskPrinter.print(task);
+
+        String firstOption = switch (task.getStatus()) {
+            case NEW, CANCELLED -> "Начать";
+            case IN_PROGRESS -> "Выполнено";
+            case COMPLETED -> "Доделать";
+        };
+
+        int input = requestIntFromInput("[1]" + firstOption + " [2]Отменить [0]Главное меню\n\nВвод:",
+                new int[] { 0, 1, 2 });
+
+        switch (input) {
+            case 0:
+                return;
+            case 1: {
+                switch (task.getStatus()) {
+                    case NEW, CANCELLED, COMPLETED -> taskManager.markInProgress(task.getId());
+                    case IN_PROGRESS -> taskManager.markCompleted(task.getId());
+                }
+                break;
+            }
+            case 2:
+                taskManager.markCanceled(task.getId());
        }
+
+        displayTask(task);
    }

    private static void displayTasks() {
@ -106,7 +120,7 @@ public class TodoApp {

                """);

-        printAll(tasks);
+        taskManager.printTasks();

        int[] variantsInput = new int[tasksCounter + 1];
        for (int i = 0; i < tasksCounter; i++)
@ -154,46 +168,83 @@ public class TodoApp {
        } while (true);
    }

-    private static void printAll(Task... tasks) {
-        for (Task t : tasks)
-            if (t != null)
-                t.printInfo();
-    }
-
-    private static boolean markTaskCompletedById(Task[] tasks, int id) {
-        for (Task t : tasks)
-            if (t != null && t.getId() == id) {
-                if (!t.getCompleted())
-                    t.toggleCompleted();
-                return true;
-            }
-        return false;
-    }
-
    private class TaskManager {
        void addTask(Task task) {
            tasks[tasksCounter++] = task;
        }

-        void markCompleted(int id) {
-            markTaskCompletedById(tasks, id);
+        boolean markCompleted(int id) {
+            for (int i = 0; i < tasksCounter; i++)
+                if (tasks[i].getId() == id) {
+                    TaskAction action = new TaskAction() {
+                        @Override
+                        public void execute(Task task) {
+                            task.markCompleted();
+                        }
+                    };
+                    action.execute(tasks[i]);
+                    return true;
+                }
+            return false;
+        }
+
+        boolean markInProgress(int id) {
+            for (int i = 0; i < tasksCounter; i++)
+                if (tasks[i].getId() == id) {
+                    TaskAction action = new TaskAction() {
+                        @Override
+                        public void start(Task task) {
+                            task.markInProgress();
+                        }
+                    };
+                    action.start(tasks[i]);
+                    return true;
+                }
+            return false;
+        }
+
+        boolean markCanceled(int id) {
+            for (int i = 0; i < tasksCounter; i++)
+                if (tasks[i].getId() == id) {
+                    TaskAction action = new TaskAction() {
+                        @Override
+                        public void cancel(Task task) {
+                            task.markCanceled();
+                        }
+                    };
+                    action.cancel(tasks[i]);
+                    return true;
+                }
+            return false;
        }

        void printTasks() {
            class ShortTaskPrinter {
                void print(Task task) {
-                    System.out.printf("%-3s | %s\n", task.getId(), task.getTitle());
+                    int id = task.getId();
+                    String title = task.getTitle();
+                    TaskStatus status = task.getStatus();
+
+                    String stringCompleted = status.getColorCode() + status.getDescription() + "\u001B[0m";
+                    System.out.printf("%-3d | %-20s | %s\n", id, title, stringCompleted);
                }
            }

-            ShortTaskPrinter p = new ShortTaskPrinter();
+            ShortTaskPrinter printer = new ShortTaskPrinter();
            for (int i = 0; i < Task.taskCount; i++)
-                p.print(tasks[i]);
+                printer.print(tasks[i]);
        }

    }

    interface TaskAction {
-        void execute(Task task);
+        default void execute(Task task) {
+        };
+
+        default void start(Task task) {
+        };
+
+        default void cancel(Task task) {
+        };
    }
 }