Merge pull request 'feature/tasks/enum-status-and-idgen' (#19) from feature/tasks/enum-status-and-idgen into main

Reviewed-on: #19

todo/src/main/java/ru/kamask/pet/Task.java

@@ -1,32 +1,75 @@
 package ru.kamask.pet;
 
-public class Task {
+import java.time.LocalDate;
+
+class Task {
+    static int taskCount = 0;
+
+    enum TaskIdGenerator {
+        INSTANCE;
+
+        private int currentId = 1;
+
+        int nextId() {
+            return currentId++;
+        }
+    }
+
     private int id;
     private String title;
     private String description;
-    private boolean completed = false;
+    private TaskStatus status;
+    private LocalDate createdAt;
+
+    Task(String title, String description) {
+        id = TaskIdGenerator.INSTANCE.nextId();
+        status = TaskStatus.NEW;
+        createdAt = LocalDate.now();
+        taskCount++;
 
-    Task(int id, String title, String description) {
-        this.id = id;
         this.title = title;
         this.description = description;
+    };
+
+    static void printTotalTasksCreated() {
+        System.out.println("Колличество дел: " + taskCount);
     }
 
-    public void printInfo() {
+    int getId() {
-        String stringCompleted = completed ? "[х]" : "[ ]";
+        return id;
-        System.out.printf("%-3d | %-20s | %s\n", id, title, stringCompleted);
     }
 
-    public void printInfo(boolean full) {
+    String getTitle() {
-        if (!full) {
+        return title;
-            printInfo();
-            return;
     }
 
+    boolean isCompleted() {
+        return status == TaskStatus.COMPLETED;
+    }
+
+    void markCompleted() {
+        status = TaskStatus.COMPLETED;
+    }
+
+    void markInProgress() {
+        status = TaskStatus.IN_PROGRESS;
+    }
+
+    void markCanceled() {
+        status = TaskStatus.CANCELLED;
+    }
+
+    TaskStatus getStatus() {
+        return status;
+    }
+
+    static class TaskPrinter {
+        static void print(Task task) {
             String template = """
 
                     ──────────────────────────────
                     Номер: %-3d
+                    Дата создания: %s
                     Статус: %s
                     Название: %-20s
                     ------------------------------
@@ -34,19 +77,9 @@ public class Task {
 
                     """;
             ;
-        String stringCompleted = completed ? "выполнено" : "не выполнено";
+            String stringCompleted = task.status.getColorCode() + task.status.getDescription() + "\u001B[0m";
-        System.out.printf(template, id, stringCompleted, title, description);
+            System.out.printf(template, task.id, task.createdAt, stringCompleted, task.title, task.description);
+        }
     }
 
-    public void toggleCompleted() {
-        completed = !completed;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public boolean getCompleted() {
-        return completed;
-    }
 }

todo/src/main/java/ru/kamask/pet/TaskStatus.java

@@ -0,0 +1,41 @@
+package ru.kamask.pet;
+
+public enum TaskStatus {
+    NEW("новое") {
+        @Override
+        String getColorCode() {
+            return "\u001B[34m";
+        }
+    },
+    IN_PROGRESS("в работе") {
+        @Override
+        String getColorCode() {
+            return "\u001B[35m";
+        }
+    },
+    COMPLETED("сделано") {
+        @Override
+        String getColorCode() {
+            return "\u001B[32m";
+        }
+    },
+    CANCELLED("отменено") {
+        @Override
+        String getColorCode() {
+            return "\u001B[31m";
+        }
+    };
+
+    abstract String getColorCode();
+
+    private final String description;
+
+    TaskStatus(String description) {
+        this.description = description;
+    }
+
+    String getDescription() {
+        return description;
+    }
+
+}

todo/src/main/java/ru/kamask/pet/TodoApp.java

@@ -4,39 +4,23 @@ import java.util.Scanner;
 
 public class TodoApp {
 
+    private static TaskManager taskManager;
     private static Task[] tasks = new Task[10];
-    private static int nextTaskId = 1;
     private static int tasksCounter = 0;
     private static Scanner scanner = new Scanner(System.in);
 
     public static void main(String[] args) {
-        displayMainMenu();
+
+        TodoApp app = new TodoApp();
+        taskManager = app.new TaskManager();
+
+        app.run();
+
     }
 
-    public static int requestIntFromInput(String template, int[] allowedInts) {
+    private void run() {
-        do {
-            System.out.print(template);
-            int input;
-            do {
-                if (scanner.hasNextInt()) {
-                    input = scanner.nextInt();
-                    scanner.nextLine();
-                    break;
-                } else {
-                    scanner.next();
-                    System.out.print("Ошибка: используйте цифры.\nПовторите ввод:");
-                }
-            } while (true);
-
-            for (int i : allowedInts)
-                if (i == input)
-                    return input;
-            System.out.print("Ошибка: укажите номер выбранного пункта.\nПовторите ввод:");
-        } while (true);
-    }
-
-    public static void displayMainMenu() {
         while (true) {
+            Task.printTotalTasksCreated();
             String menu = """
 
                     ┌──────────────────────────┐
@@ -61,17 +45,16 @@ public class TodoApp {
 
     private static void displayCreateTask() {
 
-        if (tasksCounter >= 9) {
+        if (Task.taskCount >= 9) {
             System.out.println("\nОшибка: Достигнут лимит в 10 дел.\n");
             return;
         }
 
-        int id = nextTaskId++;
         String title;
         String description;
 
         do {
-            System.out.print("\nНпишите название дела (3–20 символов): ");
+            System.out.print("\nНапишите название дела (3–20 символов): ");
             title = scanner.nextLine().trim();
             if (title.length() >= 3 && title.length() <= 20)
                 break;
@@ -79,16 +62,44 @@ public class TodoApp {
             System.out.print("\nОшибка: Название должно содержать от 3 до 20 символов.\nПопробуйте снова: ");
         } while (true);
 
-        System.out.print("\nНпишите описание дела: ");
+        System.out.print("\nНaпишите описание дела: ");
         description = scanner.nextLine().trim();
 
-        var task = new Task(id, title, description);
+        taskManager.addTask(new Task(title, description));
-        tasks[tasksCounter++] = task;
+    }
+
+    private static void displayTask(Task 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() {
 
-        if (tasksCounter < 1) {
+        if (tasksCounter == 0) {
             int input = requestIntFromInput("""
 
                     Список дел пуст.
@@ -100,24 +111,25 @@ public class TodoApp {
 
             if (input == 1) {
                 displayCreateTask();
-                displayTasks();
             } else
                 System.exit(0);
         }
 
-        int[] tasksIDs = new int[tasksCounter + 1];
         System.out.println("""
                 Список дел:
 
                 """);
-        for (int i = 0; i < tasksCounter; i++) {
+
-            tasks[i].printInfo();
+        taskManager.printTasks();
-            tasksIDs[i] = tasks[i].getId();
+
-        }
+        int[] variantsInput = new int[tasksCounter + 1];
-        tasksIDs[tasksCounter] = 0;
+        for (int i = 0; i < tasksCounter; i++)
+            variantsInput[i] = tasks[i].getId();
+        variantsInput[tasksCounter] = 0;
+
         int input = requestIntFromInput("""
 
-                Введите номер дела или 0 для возврата в меню:""", tasksIDs);
+                Введите номер дела или 0 для возврата в меню:""", variantsInput);
 
         if (input == 0)
             return;
@@ -126,23 +138,113 @@ public class TodoApp {
 
     }
 
-    public static Task getTaskById(int id) {
+    private static Task getTaskById(int id) {
-        for (int i = 0; i < tasksCounter; i++) {
+        for (int i = 0; i < Task.taskCount; i++) {
             if (tasks[i].getId() == id)
                 return tasks[i];
         }
         return null;
     }
 
-    public static void displayTask(Task task) {
+    private static int requestIntFromInput(String template, int[] allowedInts) {
-        task.printInfo(true);
+        do {
-        String firstOption = task.getCompleted() ? "[1]Не выполнено" : "[1]Выполнено";
+            System.out.print(template);
-        int input = requestIntFromInput(firstOption + " [0]Главное меню\n\nВвод:",
+            int input;
-                new int[] { 0, 1 });
+            do {
-        if (input == 1) {
+                if (scanner.hasNextInt()) {
-            task.toggleCompleted();
+                    input = scanner.nextInt();
-            displayTask(task);
+                    scanner.nextLine();
+                    break;
+                } else {
+                    scanner.next();
+                    System.out.print("Ошибка: используйте цифры.\nПовторите ввод:");
+                }
+            } while (true);
+
+            for (int i : allowedInts)
+                if (i == input)
+                    return input;
+            System.out.print("Ошибка: укажите номер выбранного пункта.\nПовторите ввод:");
+        } while (true);
+    }
+
+    interface TaskAction {
+        default void execute(Task task) {
+        };
+
+        default void start(Task task) {
+        };
+
+        default void cancel(Task task) {
+        };
+    }
+
+    private class TaskManager {
+        void addTask(Task task) {
+            tasks[tasksCounter++] = task;
+        }
+
+        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) {
+                    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 printer = new ShortTaskPrinter();
+            for (int i = 0; i < Task.taskCount; i++)
+                printer.print(tasks[i]);
+        }
+
+    }
 }