Compare commits

..

No commits in common. "1f609abcb7cb1fb424d9e8bc1373256bba9dc5da" and "28cdd22635c395298acd0f54341e793e38c7fa72" have entirely different histories.

5 changed files with 12 additions and 58 deletions

1
.gitignore vendored
View File

@ -1,3 +1,2 @@
todo/target/
.vscode/
.lingma/

View File

@ -46,7 +46,6 @@ public class CliEngine {
registerCommand(new CreateCommand());
registerCommand(new ListCommand());
registerCommand(new CompleteCommand());
registerCommand(new SearchCommand());
registerCommand(new DeleteCommand());
}

View File

@ -1,6 +1,5 @@
package ru.kamask.pet.todo.cli;
import java.util.List;
import java.util.Optional;
import ru.kamask.pet.todo.model.SimpleTask;
@ -18,8 +17,18 @@ public class ListCommand implements Command {
if (args.length > 0)
return Optional.of(Command.errorMessage);
var res = formatWithTable(service.list(), "Список задач пуст.");
String template = "%-2s | %-30s | %s\n";
String res = "";
res += String.format(template, "ID", "Название задачи", "Статус");
res += "-".repeat(50) + "\n";
if (service.list().size() == 0)
return Optional.of(res + "\nСписок задач пуст.");
for (Task task : service.list()) {
SimpleTask.Data data = ((SimpleTask) task).data();
res += String.format(template, data.id(), data.title(), data.done() ? "выполнено" : "не выполнено");
}
return Optional.of(res);
}
@ -27,21 +36,4 @@ public class ListCommand implements Command {
public String usage() {
return String.format(templateUsage, name(), "Список всех задач.");
}
String formatWithTable(List<Task> tasks, String msgIfEmpty){
String template = "%-2s | %-30s | %s\n";
String res = "";
res += String.format(template, "ID", "Название задачи", "Статус");
res += "-".repeat(50) + "\n";
if (tasks.size() == 0)
return res + "\n" + msgIfEmpty;
for (Task task : tasks) {
SimpleTask.Data data = ((SimpleTask) task).data();
res += String.format(template, data.id(), data.title(), data.done() ? "выполнено" : "не выполнено");
}
return res;
}
}

View File

@ -1,30 +0,0 @@
package ru.kamask.pet.todo.cli;
import java.util.Optional;
import ru.kamask.pet.todo.service.TaskService;
public class SearchCommand implements Command {
@Override
public String name() {
return "search";
}
@Override
public String usage() {
return String.format(templateUsage, name() + " <текст>", "Поиск задач по тексту (минимум 3 символа)");
}
@Override
public Optional<String> handle(String[] args, TaskService 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, "Не найдено задач, соответствующих запросу.");
return Optional.of(res);
}
}

View File

@ -42,10 +42,4 @@ public class TaskService {
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))
.toList();
}
}