Merge pull request 'refactor(cli): Вынес логику форматирования таблиц в utility-класс (close #52)' (#60) from feature/generic-utilities into dev

Reviewed-on: #60

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

@@ -3,12 +3,13 @@ package ru.kamask.pet.todo;
 import java.io.IOException;
 
 import ru.kamask.pet.todo.cli.CliEngine;
-import ru.kamask.pet.todo.repo.InMemoryTaskRepository;
+import ru.kamask.pet.todo.model.SimpleTask;
+import ru.kamask.pet.todo.repo.InMemoryRepository;
 import ru.kamask.pet.todo.service.TaskService;
 
 public class TodoApp {
     public static void main(String[] args) throws IOException {
-        var service = new TaskService(new InMemoryTaskRepository());
+        var service = new TaskService(new InMemoryRepository<SimpleTask>());
         var cli = new CliEngine(service);
 
         cli.start();

todo/src/main/java/ru/kamask/pet/todo/cli/CliEngine.java

@@ -7,14 +7,15 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Optional;
 
-import ru.kamask.pet.todo.service.TaskService;
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.service.EntityService;
 
 public class CliEngine {
     private HashMap<String, Command> registry = new HashMap<>();
-    private TaskService service;
+    private EntityService<? extends Identifiable> service;
     private BufferedReader reader;
 
-    public CliEngine(TaskService service) {
+    public CliEngine(EntityService<? extends Identifiable> service) {
         this.service = service;
         reader = new BufferedReader(new InputStreamReader(System.in));
         initializeCommands();

todo/src/main/java/ru/kamask/pet/todo/cli/Command.java

@@ -2,13 +2,14 @@ package ru.kamask.pet.todo.cli;
 
 import java.util.Optional;
 
-import ru.kamask.pet.todo.service.TaskService;
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.service.EntityService;
 
 public interface Command {
     String templateUsage = "  %-30s // %s";
     String errorMessage = "Не корректно введена команда. Введите help для спарвки.";
 
-    Optional<String> handle(String[] args, TaskService service);
+    Optional<String> handle(String[] args, EntityService<? extends Identifiable> service);
 
     String name();
 

todo/src/main/java/ru/kamask/pet/todo/cli/CompleteCommand.java

@@ -2,6 +2,8 @@ package ru.kamask.pet.todo.cli;
 
 import java.util.Optional;
 
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.service.EntityService;
 import ru.kamask.pet.todo.service.TaskService;
 
 public class CompleteCommand implements Command {
@@ -16,14 +18,16 @@ public class CompleteCommand implements Command {
     }
 
     @Override
-    public Optional<String> handle(String[] args, TaskService service) {
+    public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
         if (args.length != 1)
             return Optional.of(Command.errorMessage);
 
+        TaskService taskService = (TaskService) service;
+
         try {
             int id = Integer.parseInt(args[0]);
 
-            return Optional.of(service.complete(id)
+            return Optional.of(taskService.complete(id)
                     ? "Задача ID-%d выполнена.".formatted(id)
                     : "Задача ID-%d не найдена.".formatted(id));
 

todo/src/main/java/ru/kamask/pet/todo/cli/CreateCommand.java

@@ -2,21 +2,24 @@ package ru.kamask.pet.todo.cli;
 
 import java.util.Optional;
 
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.service.EntityService;
 import ru.kamask.pet.todo.service.TaskService;
 
-public class CreateCommand implements Command {
+public class CreateCommand implements Command{
     @Override
     public String name() {
         return "create";
     }
 
     @Override
-    public Optional<String> handle(String[] args, TaskService service) {
+    public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
         if (args.length > 0) {
             var title = String.join(" ", args);
             if (title.length() > 30)
                 return Optional.of("Ошибка: максимальная длинна названия задачи 30 символов.");
-            service.create(title);
+            TaskService taskService = (TaskService) service;
+            taskService.create(title);
             return Optional.of(String.format("Задача \"%s\" успешно добавлена!", title));
         }
         return Optional.of(Command.errorMessage);

todo/src/main/java/ru/kamask/pet/todo/cli/DeleteCommand.java

@@ -2,9 +2,10 @@ package ru.kamask.pet.todo.cli;
 
 import java.util.Optional;
 
-import ru.kamask.pet.todo.service.TaskService;
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.service.EntityService;
 
-public class DeleteCommand implements Command {
+public class DeleteCommand implements Command{
     @Override
     public String name() {
         return "delete";
@@ -16,7 +17,7 @@ public class DeleteCommand implements Command {
     }
 
     @Override
-    public Optional<String> handle(String[] args, TaskService service) {
+    public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
         if (args.length != 1)
             return Optional.of(Command.errorMessage);
 

todo/src/main/java/ru/kamask/pet/todo/cli/ListCommand.java

@@ -1,11 +1,11 @@
 package ru.kamask.pet.todo.cli;
 
-import java.util.List;
 import java.util.Optional;
 
-import ru.kamask.pet.todo.model.SimpleTask;
-import ru.kamask.pet.todo.model.Task;
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.service.EntityService;
 import ru.kamask.pet.todo.service.TaskService;
+import ru.kamask.pet.todo.util.Formatter;
 
 public class ListCommand implements Command {
     @Override
@@ -14,33 +14,17 @@ public class ListCommand implements Command {
     }
 
     @Override
-    public Optional<String> handle(String[] args, TaskService service) {
+    public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
         if (args.length > 0)
             return Optional.of(Command.errorMessage);
 
-        var res = formatWithTable(service.list(), "Список задач пуст.");
+        TaskService taskService = (TaskService) service;
         
-        return Optional.of(res);
+        return Optional.of(Formatter.asTable(taskService.getAll()));
     }
 
     @Override
     public String usage() {
         return String.format(templateUsage, name(), "Список всех задач.");
     }
-
-    String formatWithTable(List<Task> tasks, String msgIfEmpty) {
-        String template = "%-2s | %-30s | %s\n";
-        var res = new StringBuilder(String.format(template, "ID", "Название задачи", "Статус"));
-        res.append("-".repeat(50) + "\n");
-
-        if (tasks.size() == 0)
-            return res.append("\n" + msgIfEmpty).toString();
-
-        for (Task task : tasks) {
-            SimpleTask.Data data = ((SimpleTask) task).data();
-            res.append(String.format(template, data.id(), data.title(), data.done() ? "выполнено" : "не выполнено"));
-        }
-
-        return res.toString();
-    }
 }

todo/src/main/java/ru/kamask/pet/todo/cli/SearchCommand.java

@@ -2,7 +2,10 @@ package ru.kamask.pet.todo.cli;
 
 import java.util.Optional;
 
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.service.EntityService;
 import ru.kamask.pet.todo.service.TaskService;
+import ru.kamask.pet.todo.util.Formatter;
 
 public class SearchCommand implements Command {
     @Override
@@ -16,15 +19,16 @@ public class SearchCommand implements Command {
     }
 
     @Override
-    public Optional<String> handle(String[] args, TaskService service) {
+    public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
         if (args.length != 1)
             return Optional.of(Command.errorMessage);
         if (args[0].length() < 3)
             return Optional.of("Длина запроса должна быть не менее 3 символов.");
 
-        var matchTask = service.search(args[0]);
-        var res = new ListCommand().formatWithTable(matchTask, "Не найдено задач, соответствующих запросу.");
+        TaskService taskService = (TaskService) service;
 
-        return Optional.of(res);
+        var matchTask = taskService.search(args[0]);
+
+        return Optional.of(Formatter.asTable(matchTask, "Не найдено задач, соответствующих запросу."));
     }
 }

todo/src/main/java/ru/kamask/pet/todo/model/Identifiable.java

@@ -0,0 +1,5 @@
+package ru.kamask.pet.todo.model;
+
+public interface Identifiable {
+    int getId();
+}

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

@@ -1,6 +1,6 @@
 package ru.kamask.pet.todo.model;
 
-public abstract class Task {
+public abstract class Task implements Identifiable{
     private static int nextId = 1;
 
     protected int id;
@@ -11,10 +11,15 @@ public abstract class Task {
         this.title = title;
     }
 
-    public int id() {
+    @Override
+    public int getId() {
         return id;
     }
 
+    public int id() {
+        return getId();
+    }
+
     @Override
     public String toString() {
         return String.format("Задача: id - %d, title: \"%s\"", id, title);

todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryRepository.java

@@ -6,23 +6,23 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import ru.kamask.pet.todo.model.Task;
+import ru.kamask.pet.todo.model.Identifiable;
 
-public class InMemoryTaskRepository implements TaskRepository {
-    private Map<Integer, Task> storage = new HashMap<>();
+public class InMemoryRepository<T extends Identifiable> implements Repository<T> {
+    private Map<Integer, T> storage = new HashMap<>();
 
     @Override
-    public void save(Task task) {
-        storage.put(task.id(), task);
+    public void save(T obj) {
+        storage.put(obj.getId(), obj);
     }
 
     @Override
-    public Optional<Task> findById(int id) {
+    public Optional<T> findById(int id) {
         return Optional.ofNullable(storage.get(id));
     }
 
     @Override
-    public List<Task> findAll() {
+    public List<T> findAll() {
         return new ArrayList<>(storage.values());
     }
 

todo/src/main/java/ru/kamask/pet/todo/repo/Repository.java

@@ -0,0 +1,14 @@
+package ru.kamask.pet.todo.repo;
+
+import java.util.List;
+import java.util.Optional;
+
+import ru.kamask.pet.todo.model.Identifiable;
+
+public interface Repository<T extends Identifiable> {
+    void save(T obj);
+    Optional<T> findById(int id);
+    List<T> findAll();
+    void delete(int id);
+    boolean has(int id);
+}

todo/src/main/java/ru/kamask/pet/todo/repo/TaskRepository.java

@@ -1,18 +0,0 @@
-package ru.kamask.pet.todo.repo;
-
-import java.util.List;
-import java.util.Optional;
-
-import ru.kamask.pet.todo.model.Task;
-
-public interface TaskRepository {
-    void save(Task task);
-
-    Optional<Task> findById(int id);
-
-    List<Task> findAll();
-
-    void delete(int id);
-
-    boolean has(int id);
-}

todo/src/main/java/ru/kamask/pet/todo/service/EntityService.java

@@ -0,0 +1,35 @@
+package ru.kamask.pet.todo.service;
+
+import java.util.List;
+import java.util.Optional;
+
+import ru.kamask.pet.todo.model.Identifiable;
+import ru.kamask.pet.todo.repo.Repository;
+
+public class EntityService<T extends Identifiable> {
+    private final Repository<T> repo;
+
+    protected EntityService(Repository<T> repo) {
+        this.repo = repo;
+    }
+
+    public void save(T obj) {
+        repo.save(obj);
+    }
+
+    public Optional<T> getById(int id) {
+        return repo.findById(id);
+    }
+
+    public List<T> getAll() {
+        return repo.findAll();
+    }
+
+    public void remove(int id) {
+        repo.delete(id);
+    }
+
+    public boolean has(int id) {
+        return repo.has(id);
+    }
+}

todo/src/main/java/ru/kamask/pet/todo/service/TaskService.java

@@ -1,29 +1,23 @@
 package ru.kamask.pet.todo.service;
 
 import java.util.List;
-import java.util.Optional;
 
-import ru.kamask.pet.todo.model.Task;
 import ru.kamask.pet.todo.model.SimpleTask;
-import ru.kamask.pet.todo.repo.TaskRepository;
+import ru.kamask.pet.todo.repo.Repository;
 
-public class TaskService {
-    private final TaskRepository repo;
+public class TaskService extends EntityService<SimpleTask> {
 
-    public TaskService(TaskRepository repo) {
-        this.repo = repo;
+    public TaskService(Repository<SimpleTask> repo) {
+        super(repo);
     }
 
     public void create(String title) {
-        repo.save(new SimpleTask(title));
+        super.save(new SimpleTask(title));
     }
 
-    public Optional<Task> getById(int id) {
-        return repo.findById(id);
-    }
 
     public boolean complete(int id) {
-        var taskOpt = repo.findById(id);
+        var taskOpt = super.getById(id);
         if (taskOpt.isPresent()) {
             taskOpt.get().markAsCompleted();
             return true;
@@ -31,21 +25,10 @@ public class TaskService {
         return false;
     }
 
-    public List<Task> list() {
-        return repo.findAll();
-    }
 
-    public void remove(int id) {
-        repo.delete(id);
-    }
-
-    public boolean has(int id) {
-        return repo.has(id);
-    }
-
-    public List<Task> search(String query) {
-        return repo.findAll().stream()
-                .filter(task -> ((SimpleTask) task).data().title().contains(query))
+    public List<SimpleTask> search(String query) {
+        return super.getAll().stream()
+                .filter(task -> task.data().title().contains(query))
                 .toList();
     }
 }

todo/src/main/java/ru/kamask/pet/todo/util/Formatter.java

@@ -0,0 +1,27 @@
+package ru.kamask.pet.todo.util;
+
+import java.util.List;
+
+import ru.kamask.pet.todo.model.SimpleTask;
+
+public class Formatter {
+    public static String asTable(List<SimpleTask> tasks){
+        return asTable(tasks, "Список задач пуст.");
+    }
+
+    public static String asTable(List<SimpleTask> tasks, String msgIfEmpty){
+        String template = "%-2s | %-30s | %s\n";
+        var res = new StringBuilder(String.format(template, "ID", "Название задачи", "Статус"));
+        res.append("-".repeat(50) + "\n");
+
+        if (tasks.size() == 0)
+            return res.append("\n" + msgIfEmpty).toString();
+
+        for (SimpleTask task : tasks) {
+            SimpleTask.Data data = task.data();
+            res.append(String.format(template, data.id(), data.title(), data.done() ? "выполнено" : "не выполнено"));
+        }
+
+        return res.toString();
+    }
+}