KamaSK/todo.pet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases 4 Wiki Activity

Compare commits

base: KamaSK:8254f5292bc2a22d3cb35089aca6f8ea40c40855
Branches Tags
KamaSK:main
KamaSK:dev
KamaSK:v2.2.0
KamaSK:v2.1.0
KamaSK:2.0.0
KamaSK:1.0.0
..
compare: KamaSK:f0b79f0db0c6e089f64748412da60e20c122c306
Branches Tags
KamaSK:dev
KamaSK:main
KamaSK:v2.2.0
KamaSK:v2.1.0
KamaSK:2.0.0
KamaSK:1.0.0

No commits in common. "8254f5292bc2a22d3cb35089aca6f8ea40c40855" and "f0b79f0db0c6e089f64748412da60e20c122c306" have entirely different histories.
8254f5292b ... f0b79f0db0

15 changed files with 77 additions and 118 deletions
Show Stats Expand all files Collapse all files

5
todo/src/main/java/ru/kamask/pet/todo/TodoApp.java
View File

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

7
todo/src/main/java/ru/kamask/pet/todo/cli/CliEngine.java
View File

@ -7,15 +7,14 @@ import java.util.Arrays;
import java.util.HashMap;
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 CliEngine {
private HashMap<String, Command> registry = new HashMap<>();
private EntityService<? extends Identifiable> service;
private TaskService service;
private BufferedReader reader;
public CliEngine(EntityService<? extends Identifiable> service) {
public CliEngine(TaskService service) {
this.service = service;
reader = new BufferedReader(new InputStreamReader(System.in));
initializeCommands();

5
todo/src/main/java/ru/kamask/pet/todo/cli/Command.java
View File

@ -2,14 +2,13 @@ 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 interface Command {
String templateUsage = " %-30s // %s";
String errorMessage = "Не корректно введена команда. Введите help для спарвки.";
Optional<String> handle(String[] args, EntityService<? extends Identifiable> service);
Optional<String> handle(String[] args, TaskService service);
String name();

8
todo/src/main/java/ru/kamask/pet/todo/cli/CompleteCommand.java
View File

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

7
todo/src/main/java/ru/kamask/pet/todo/cli/CreateCommand.java
View File

@ -2,8 +2,6 @@ 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 {
@ -13,13 +11,12 @@ public class CreateCommand implements Command{
}
@Override
public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
public Optional<String> handle(String[] args, TaskService service) {
if (args.length > 0) {
var title = String.join(" ", args);
if (title.length() > 30)
return Optional.of("Ошибка: максимальная длинна названия задачи 30 символов.");
TaskService taskService = (TaskService) service;
taskService.create(title);
service.create(title);
return Optional.of(String.format("Задача \"%s\" успешно добавлена!", title));
}
return Optional.of(Command.errorMessage);

5
todo/src/main/java/ru/kamask/pet/todo/cli/DeleteCommand.java
View File

@ -2,8 +2,7 @@ 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 DeleteCommand implements Command {
@Override
@ -17,7 +16,7 @@ public class DeleteCommand implements Command{
}
@Override
public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
public Optional<String> handle(String[] args, TaskService service) {
if (args.length != 1)
return Optional.of(Command.errorMessage);

16
todo/src/main/java/ru/kamask/pet/todo/cli/ListCommand.java
View File

@ -3,9 +3,8 @@ package ru.kamask.pet.todo.cli;
import java.util.List;
import java.util.Optional;
import ru.kamask.pet.todo.model.Identifiable;
import ru.kamask.pet.todo.model.SimpleTask;
import ru.kamask.pet.todo.service.EntityService;
import ru.kamask.pet.todo.model.Task;
import ru.kamask.pet.todo.service.TaskService;
public class ListCommand implements Command {
@ -15,12 +14,11 @@ public class ListCommand implements Command {
}
@Override
public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
public Optional<String> handle(String[] args, TaskService service) {
if (args.length > 0)
return Optional.of(Command.errorMessage);
TaskService taskService = (TaskService) service;
List<SimpleTask> allTasks = taskService.getAll();
var res = formatWithTable(allTasks, "Список задач пуст.");
var res = formatWithTable(service.list(), "Список задач пуст.");
return Optional.of(res);
}
@ -30,7 +28,7 @@ public class ListCommand implements Command {
return String.format(templateUsage, name(), "Список всех задач.");
}
String formatWithTable(List<SimpleTask> tasks, String msgIfEmpty) {
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");
@ -38,8 +36,8 @@ public class ListCommand implements Command {
if (tasks.size() == 0)
return res.append("\n" + msgIfEmpty).toString();
for (SimpleTask task : tasks) {
SimpleTask.Data data = task.data();
for (Task task : tasks) {
SimpleTask.Data data = ((SimpleTask) task).data();
res.append(String.format(template, data.id(), data.title(), data.done() ? "выполнено" : "не выполнено"));
}

8
todo/src/main/java/ru/kamask/pet/todo/cli/SearchCommand.java
View File

@ -2,8 +2,6 @@ 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 SearchCommand implements Command {
@ -18,15 +16,13 @@ public class SearchCommand implements Command {
}
@Override
public Optional<String> handle(String[] args, EntityService<? extends Identifiable> service) {
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 символов.");
TaskService taskService = (TaskService) service;
var matchTask = taskService.search(args[0]);
var matchTask = service.search(args[0]);
var res = new ListCommand().formatWithTable(matchTask, "Не найдено задач, соответствующих запросу.");
return Optional.of(res);

5
todo/src/main/java/ru/kamask/pet/todo/model/Identifiable.java
View File

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

9
todo/src/main/java/ru/kamask/pet/todo/model/Task.java
View File

@ -1,6 +1,6 @@
package ru.kamask.pet.todo.model;
public abstract class Task implements Identifiable{
public abstract class Task {
private static int nextId = 1;
protected int id;
@ -11,13 +11,8 @@ public abstract class Task implements Identifiable{
this.title = title;
}
@Override
public int getId() {
return id;
}
public int id() {
return getId();
return id;
}
@Override

14
todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryRepository.java → todo/src/main/java/ru/kamask/pet/todo/repo/InMemoryTaskRepository.java
View File

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

14
todo/src/main/java/ru/kamask/pet/todo/repo/Repository.java
View File

@ -1,14 +0,0 @@
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);
}

18
todo/src/main/java/ru/kamask/pet/todo/repo/TaskRepository.java Normal file
View File

@ -0,0 +1,18 @@
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);
}

35
todo/src/main/java/ru/kamask/pet/todo/service/EntityService.java
View File

@ -1,35 +0,0 @@
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);
}
}

35
todo/src/main/java/ru/kamask/pet/todo/service/TaskService.java
View File

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