From bf3403abb8ac77693f7c37b3475a2b8dc9509ac1 Mon Sep 17 00:00:00 2001
From: GitLobanov <lobanovgithub@gmail.com>
Date: Sat, 7 Jun 2025 11:12:42 +0300
Subject: [PATCH 1/7] feat (): base project structure, repo, liquibase, entity

---
 .gitignore                                    |   1 +
 README.md                                     |  71 ++++++++++-
 pom.xml                                       | 119 +++++++++++++++++-
 .../com/emobile/springtodo/api/TodoApi.java   |  39 ++++++
 .../springtodo/controller/TodoController.java |  48 +++++++
 .../springtodo/model/dto/TodoCreateDto.java   |   8 ++
 .../emobile/springtodo/model/dto/TodoDto.java |   8 ++
 .../model/dto/TodoListResponseDto.java        |  12 ++
 .../springtodo/model/dto/TodoUpdateDto.java   |   9 ++
 .../emobile/springtodo/model/entity/Todo.java |  37 ++++++
 .../springtodo/model/mapper/TodoMapper.java   |  18 +++
 .../springtodo/repository/TodoRepository.java |  16 +++
 .../repository/impl/TodoRepositoryJdbc.java   |  88 +++++++++++++
 .../repository/sql/TodoSqlBuilder.java        |  51 ++++++++
 src/main/resources/application.properties     |   1 -
 src/main/resources/application.yaml           |  22 ++++
 .../db/changelog/changelog-master.xml         |   8 ++
 .../db/changelog/changes/changelog.schema.xml |  25 ++++
 .../springtodo/TodoRepositoryJdbcTest.java    | 116 +++++++++++++++++
 19 files changed, 692 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/emobile/springtodo/api/TodoApi.java
 create mode 100644 src/main/java/com/emobile/springtodo/controller/TodoController.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/entity/Todo.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/TodoRepository.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java
 delete mode 100644 src/main/resources/application.properties
 create mode 100644 src/main/resources/application.yaml
 create mode 100644 src/main/resources/db/changelog/changelog-master.xml
 create mode 100644 src/main/resources/db/changelog/changes/changelog.schema.xml
 create mode 100644 src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java

diff --git a/.gitignore b/.gitignore
index 7ed0d6b6..ff5649be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ target/
 *.iws
 *.iml
 *.ipr
+amplicode.xml
 
 ### NetBeans ###
 /nbproject/private/
diff --git a/README.md b/README.md
index bf775361..f427c6f5 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 <h2>Требования к приложению</h2>
 
-<ul>
+<ul> 
   <li><strong>База данных:</strong> Использовать <code>PostgreSQL</code>.</li>
   <li><strong>Миграции:</strong> Настроить миграции с помощью <code>Liquibase</code> или <code>Flyway</code>. Миграции должны автоматически применяться при старте приложения и в тестах.</li>
   <li><strong>Работа с БД:</strong> Не использовать <code>Hibernate/JPA</code>, вместо этого использовать <code>JdbcTemplate</code>.</li>
@@ -113,3 +113,72 @@
   <li>Пакеты следует логически организовать: <code>controller</code>, <code>service</code>, <code>repository</code>, <code>dto</code>, <code>config</code>, <code>exception</code> и т.д.</li>
   <li>Бизнес-ошибки должны обрабатываться централизованно через единый ExceptionHandler.</li>
 </ul>
+
+## Модель данных Задачи (TODO item):
+
+*   `id` (Long, Primary Key, автоинкремент)
+*   `title` (String, не null, макс. длина, например, 255)
+*   `description` (String, опционально, text)
+*   `completed` (boolean, по умолчанию false)
+*   `createdAt` (Timestamp, не null, по умолчанию текущее время)
+*   `updatedAt` (Timestamp, не null, по умолчанию текущее время, обновляется при изменении)
+*   `dueDate` (Date/Timestamp, опционально, для инновационной функции)
+
+## Функции приложения:
+
+### Необходимые функции (базовый CRUD):
+
+1.  **Создание новой задачи:**
+    *   **Эндпоинт:** `POST /api/v1/todos`
+    *   **Вход:** DTO с `title` (обязательно), `description` (опционально).
+    *   **Выход:** DTO созданной задачи с присвоенным `id`, `createdAt`, `updatedAt` и `completed=false`.
+    *   **Действия:** Сохранение новой задачи в БД. Валидация входных данных.
+
+2.  **Получение списка всех задач (с пагинацией):**
+    *   **Эндпоинт:** `GET /api/v1/todos`
+    *   **Параметры запроса:** `limit` (int, по умолчанию, например, 10), `offset` (int, по умолчанию 0).
+    *   **Выход:** Список DTO задач, обернутый, возможно, в объект, содержащий также информацию о пагинации (`totalCount`, `limit`, `offset`).
+    *   **Действия:** Извлечение задач из БД с учетом пагинации.
+
+3.  **Получение задачи по ID:**
+    *   **Эндпоинт:** `GET /api/v1/todos/{id}`
+    *   **Вход (path variable):** `id` задачи.
+    *   **Выход:** DTO задачи или 404, если задача не найдена.
+    *   **Действия:** Поиск задачи в БД по ID.
+
+4.  **Обновление существующей задачи:**
+    *   **Эндпоинт:** `PUT /api/v1/todos/{id}`
+    *   **Вход (path variable):** `id` задачи.
+    *   **Вход (body):** DTO с полями для обновления (`title`, `description`, `completed`).
+    *   **Выход:** DTO обновленной задачи или 404.
+    *   **Действия:** Обновление полей задачи в БД. Валидация входных данных. Обновление `updatedAt`.
+
+5.  **Удаление задачи:**
+    *   **Эндпоинт:** `DELETE /api/v1/todos/{id}`
+    *   **Вход (path variable):** `id` задачи.
+    *   **Выход:** Статус 204 No Content или 404.
+    *   **Действия:** Удаление задачи из БД.
+
+### Инновационные функции (предложения для расширения):
+
+1.  **Установка дедлайнов для задач и фильтрация по ним:**
+    *   **Изменение модели:** Добавить поле `dueDate` (Date или Timestamp) в задачу.
+    *   **Обновление DTO:** Добавить `dueDate` в DTO для создания и обновления.
+    *   **Новый эндпоинт/фильтр:**
+        *   `GET /api/v1/todos?isOverdue=true` - для получения всех просроченных задач.
+        *   `GET /api/v1/todos?dueBefore=YYYY-MM-DD` - для задач, которые нужно выполнить до указанной даты.
+    *   **Логика:** При создании/обновлении задачи позволить указывать дедлайн. Реализовать логику фильтрации.
+    *   **Кастомная метрика Actuator:** "Количество просроченных задач".
+
+2.  **Тегирование задач и фильтрация по тегам:**
+    *   **Изменение модели:**
+        *   Создать отдельную таблицу `tags` (`id`, `name`).
+        *   Создать связующую таблицу `todo_tags` (`todo_id`, `tag_id`).
+    *   **Обновление DTO:**
+        *   В DTO задачи (`TaskDto`) добавить поле `List<String> tags` или `List<TagDto> tags`.
+        *   При создании/обновлении задачи принимать список тегов. Если тега нет, он создается.
+    *   **Новые эндпоинты/фильтры:**
+        *   `GET /api/v1/todos?tag=tagName1&tag=tagName2` - получить задачи, содержащие все указанные теги.
+        *   (Опционально) `GET /api/v1/tags` - получить список всех существующих тегов.
+    *   **Логика:** Реализовать CRUD для тегов (неявно при добавлении к задачам, или явно через отдельные эндпоинты). Реализовать логику фильтрации задач по тегам.
+    *   **Кеширование:** Список всех тегов (`/api/v1/tags`) может быть хорошим кандидатом для кеширования.
diff --git a/pom.xml b/pom.xml
index 03bc446d..74cabc9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <version>3.5.0</version>
+        <relativePath/>
     </parent>
     <groupId>com.emobile</groupId>
     <artifactId>SpringToDo</artifactId>
@@ -15,7 +15,7 @@
     <description>SpringToDo</description>
 
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
 
     <dependencies>
@@ -24,11 +24,92 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope> <!-- или compile, если вы явно работаете с классами драйвера -->
+        </dependency>
+
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.6.0</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>2.8.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+            <version>2.8.8</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-testcontainers</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -36,6 +117,38 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.30</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok-mapstruct-binding</artifactId>
+                            <version>0.2.0</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>1.6.0</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/src/main/java/com/emobile/springtodo/api/TodoApi.java b/src/main/java/com/emobile/springtodo/api/TodoApi.java
new file mode 100644
index 00000000..52f4dc77
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/api/TodoApi.java
@@ -0,0 +1,39 @@
+package com.emobile.springtodo.api;
+
+import com.emobile.springtodo.model.dto.*;
+import io.swagger.v3.oas.annotations.*;
+import jakarta.validation.*;
+import org.springframework.web.bind.annotation.*;
+
+
+@RequestMapping("/api/v1/todos")
+public interface TodoApi {
+
+    @RequestMapping("/")
+    String getTodos();
+
+
+    @PostMapping
+    @ResponseStatus(org.springframework.http.HttpStatus.CREATED)
+    TodoDto createTodo(@Valid @RequestBody TodoCreateDto createTodoDto);
+
+    @GetMapping
+    TodoListResponseDto getAllTodos(
+            @Parameter(description = "Page number, starts from 0", required = true)
+            @RequestParam(value = "page", defaultValue = "0") int page,
+            @Parameter(description = "Size of the page, defaults to 10", required = true)
+            @RequestParam(value = "size", defaultValue = "10") int size
+    );
+
+    @PutMapping("/{id}")
+    TodoDto updateTodo(@Parameter(description = "ID of the task to update") @PathVariable Long id,
+                           @Valid @RequestBody TodoUpdateDto requestDto);
+
+    @GetMapping("/{id}")
+    TodoDto getTodoById(@Parameter(description = "ID of the task to retrieve") @PathVariable Long id);
+
+    @DeleteMapping("/{id}")
+    @ResponseStatus(org.springframework.http.HttpStatus.NO_CONTENT)
+    void deleteTodoById(@Parameter(description = "ID of the TODO item to delete") @PathVariable Long id);
+
+}
diff --git a/src/main/java/com/emobile/springtodo/controller/TodoController.java b/src/main/java/com/emobile/springtodo/controller/TodoController.java
new file mode 100644
index 00000000..3f715567
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/controller/TodoController.java
@@ -0,0 +1,48 @@
+package com.emobile.springtodo.controller;
+
+import com.emobile.springtodo.api.*;
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.model.mapper.*;
+import com.emobile.springtodo.repository.*;
+import lombok.*;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+public class TodoController implements TodoApi {
+
+    private final TodoRepository todoRepository;
+    private final TodoMapper todoMapper;
+
+    @Override
+    public String getTodos() {
+        return "";
+    }
+
+    @Override
+    public TodoDto createTodo(TodoCreateDto createTodoDto) {
+        return todoRepository.save(todoMapper.toEntity(createTodoDto))
+                .map(todoMapper::toDto)
+                .orElseThrow(() -> new IllegalArgumentException("Error in saving"));
+    }
+
+    @Override
+    public TodoListResponseDto getAllTodos(int page, int size) {
+        return null;
+    }
+
+    @Override
+    public TodoDto updateTodo(Long id, TodoUpdateDto requestDto) {
+        return null;
+    }
+
+    @Override
+    public TodoDto getTodoById(Long id) {
+        return null;
+    }
+
+    @Override
+    public void deleteTodoById(Long id) {
+
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
new file mode 100644
index 00000000..37c3ab46
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
@@ -0,0 +1,8 @@
+package com.emobile.springtodo.model.dto;
+
+public record TodoCreateDto(
+
+        String title,
+        String description) {
+
+}
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
new file mode 100644
index 00000000..f3da8cdd
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
@@ -0,0 +1,8 @@
+package com.emobile.springtodo.model.dto;
+
+public record TodoDto(
+        Long id,
+        String title,
+        String description,
+        boolean completed) {
+}
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java
new file mode 100644
index 00000000..6d036fb5
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java
@@ -0,0 +1,12 @@
+package com.emobile.springtodo.model.dto;
+
+import java.util.*;
+
+public record TodoListResponseDto(
+        List<TodoDto> todos,
+        long total,
+        int limit,
+        int offset
+) {
+
+}
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java
new file mode 100644
index 00000000..3c039232
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java
@@ -0,0 +1,9 @@
+package com.emobile.springtodo.model.dto;
+
+public record TodoUpdateDto(
+        String title,
+        String description,
+        Boolean completed
+) {
+
+}
diff --git a/src/main/java/com/emobile/springtodo/model/entity/Todo.java b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
new file mode 100644
index 00000000..81de87ba
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
@@ -0,0 +1,37 @@
+package com.emobile.springtodo.model.entity;
+
+/**
+ * Create a class entity called Todo with the following fields:
+ * id (Long, Primary Key, автоинкремент)
+ * title (String, не null, макс. длина, например, 255)
+ * description (String, опционально, text)
+ * completed (boolean, по умолчанию false)
+ * createdAt (Timestamp, не null, по умолчанию текущее время)
+ * updatedAt (Timestamp, не null, по умолчанию текущее время, обновляется при изменении)
+ * dueDate (Date/Timestamp, опционально, для инновационной функции)
+ */
+
+import lombok.*;
+
+import java.time.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Todo {
+
+    private Long id;
+
+    private String title;
+
+    private String description;
+
+    private boolean completed;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
+
+    private LocalDateTime dueDate;
+}
diff --git a/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java b/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
new file mode 100644
index 00000000..9d18aa8e
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
@@ -0,0 +1,18 @@
+package com.emobile.springtodo.model.mapper;
+
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.model.entity.*;
+import org.mapstruct.*;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = MappingConstants.ComponentModel.SPRING)
+public interface TodoMapper {
+
+    TodoDto toDto(Todo todo);
+
+    @Mapping(target = "id", ignore = true)
+    @Mapping(target = "completed", ignore = true)
+    Todo toEntity(TodoCreateDto requestDto);
+
+    @Mapping(target = "id", ignore = true)
+    Todo toEntity(TodoUpdateDto requestDto);
+}
diff --git a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
new file mode 100644
index 00000000..1eb044ed
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
@@ -0,0 +1,16 @@
+package com.emobile.springtodo.repository;
+
+import com.emobile.springtodo.model.entity.*;
+
+import java.util.*;
+
+public interface TodoRepository {
+
+    Optional<Todo> save(Todo todo);
+    Optional<Todo> update(Todo todo);
+    void deleteByID(Long id);
+    Optional<String> findByID(Long id);
+    List<String> findAll(int limit, int offset);
+    long count();
+
+}
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
new file mode 100644
index 00000000..51608a43
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
@@ -0,0 +1,88 @@
+package com.emobile.springtodo.repository.impl;
+
+import com.emobile.springtodo.model.entity.*;
+import com.emobile.springtodo.repository.*;
+import com.emobile.springtodo.repository.sql.*;
+import lombok.*;
+import org.springframework.dao.*;
+import org.springframework.jdbc.core.*;
+import org.springframework.jdbc.support.*;
+import org.springframework.stereotype.*;
+
+import java.sql.*;
+import java.time.*;
+import java.util.*;
+
+@RequiredArgsConstructor
+@Repository
+public class TodoRepositoryJdbc implements TodoRepository {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    @Override
+    public Optional<Todo> save(Todo todo) {
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        LocalDateTime now = LocalDateTime.now();
+
+        jdbcTemplate.update(connection -> {
+            String insertSql = TodoSqlBuilder.insert();
+            PreparedStatement ps = connection.prepareStatement(insertSql, new String[]{"id"});
+            ps.setString(1, todo.getTitle());
+            ps.setString(2, todo.getDescription());
+            ps.setBoolean(3, todo.isCompleted());
+            ps.setTimestamp(4, Timestamp.valueOf(now));
+            ps.setTimestamp(5, Timestamp.valueOf(now));
+            if (todo.getDueDate() != null) {
+                ps.setTimestamp(6, Timestamp.valueOf(todo.getDueDate()));
+            } else {
+                ps.setNull(6, Types.TIMESTAMP);
+            }
+            return ps;
+        }, keyHolder);
+
+        Number generatedIdNum;
+        Map<String, Object> keys = keyHolder.getKeys();
+
+        if (keys != null && keys.containsKey("id")) {
+            generatedIdNum = (Number) keys.get("id");
+        } else if (keyHolder.getKey() != null) {
+            generatedIdNum = keyHolder.getKey();
+        }
+        else {
+            throw new DataRetrievalFailureException("Failed to retrieve generated ID for Todo.");
+        }
+
+        Long generatedId = Objects.requireNonNull(generatedIdNum, "Generated ID cannot be null").longValue();
+
+        todo.setId(generatedId);
+        todo.setCreatedAt(now);
+        todo.setUpdatedAt(now);
+
+        return Optional.of(todo);
+    }
+
+    @Override
+    public Optional<Todo> update(Todo todo) {
+        return Optional.empty();
+    }
+
+    @Override
+    public void deleteByID(Long id) {
+
+    }
+
+    @Override
+    public Optional<String> findByID(Long id) {
+        return Optional.empty();
+    }
+
+    @Override
+    public List<String> findAll(int limit, int offset) {
+        return List.of();
+    }
+
+    @Override
+    public long count() {
+        return 0;
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java
new file mode 100644
index 00000000..b109b6e9
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java
@@ -0,0 +1,51 @@
+package com.emobile.springtodo.repository.sql;
+
+import lombok.experimental.*;
+
+@UtilityClass
+public class TodoSqlBuilder {
+
+    private static final String BASE_SELECT = """
+            SELECT id, title, description, completed, created_at, updated_at, due_date 
+            FROM todos
+            """;
+
+    public static String selectAll() {
+        return BASE_SELECT + " ORDER BY created_at DESC LIMIT ? OFFSET ?";
+    }
+
+    public static String selectById() {
+        return BASE_SELECT + " WHERE id = ?";
+    }
+
+    public static String selectOverdue() {
+        return BASE_SELECT + " WHERE due_date < ? AND completed = false";
+    }
+
+    public static String insert() {
+        return """
+                INSERT INTO todos (title, description, completed, created_at, updated_at, due_date)
+                VALUES (?, ?, ?, ?, ?, ?)
+                """;
+    }
+
+    public static String update() {
+        return """
+                UPDATE todos 
+                SET title = ?, description = ?, completed = ?, updated_at = ?, due_date = ? 
+                WHERE id = ?
+                """;
+    }
+
+    public static String delete() {
+        return "DELETE FROM todos WHERE id = ?";
+    }
+
+    public static String count() {
+        return "SELECT COUNT(*) FROM todos";
+    }
+
+    public static String countOverdue() {
+        return "SELECT COUNT(*) FROM todos WHERE due_date < ? AND completed = false";
+    }
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 5c3e5461..00000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.application.name=SpringToDo
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
new file mode 100644
index 00000000..f77ff80e
--- /dev/null
+++ b/src/main/resources/application.yaml
@@ -0,0 +1,22 @@
+server:
+  port: 8888
+
+spring:
+  application:
+    name: SpringToDo
+  datasource:
+    url:
+      jdbc:postgresql://localhost:5433/todo_db
+    username: local
+    password: local
+    driver-class-name: org.postgresql.Driver
+  liquibase:
+    enabled: true
+    change-log: classpath:/db/changelog/changelog-master.xml
+    database-change-log-lock-table: LIQ_DATABASECHANGELOGLOCK
+    database-change-log-table: LIQ_DATABASECHANGELOG
+    driver-class-name: org.postgresql.Driver
+    liquibase-schema: public
+    user: ${spring.datasource.username}
+    password: ${spring.datasource.password}
+    url: ${spring.datasource.url}
diff --git a/src/main/resources/db/changelog/changelog-master.xml b/src/main/resources/db/changelog/changelog-master.xml
new file mode 100644
index 00000000..524bbfd7
--- /dev/null
+++ b/src/main/resources/db/changelog/changelog-master.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
+    <include file="changes/changelog.schema.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/db/changelog/changes/changelog.schema.xml b/src/main/resources/db/changelog/changes/changelog.schema.xml
new file mode 100644
index 00000000..c031a77c
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/changelog.schema.xml
@@ -0,0 +1,25 @@
+<databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.liquibase.org/xml/ns/dbchangelog" logicalFilePath="path-independent" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet id="init-schema" author="lovanov anton">
+        <createTable tableName="todos">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="pk_todos"/>
+            </column>
+            <column name="title" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="description" type="TEXT"/>
+            <column defaultValueBoolean="false" name="completed" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_at" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" name="updated_at"
+                    type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column name="due_date" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java b/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
new file mode 100644
index 00000000..db151e73
--- /dev/null
+++ b/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
@@ -0,0 +1,116 @@
+package com.emobile.springtodo;
+
+import com.emobile.springtodo.model.entity.*;
+import com.emobile.springtodo.repository.*;
+import com.emobile.springtodo.repository.sql.*;
+import org.junit.jupiter.api.*;
+import org.springframework.beans.factory.annotation.*;
+import org.springframework.boot.test.context.*;
+import org.springframework.jdbc.core.*;
+import org.springframework.test.context.*;
+import org.testcontainers.containers.*;
+import org.testcontainers.junit.jupiter.*;
+import org.testcontainers.junit.jupiter.Container;
+
+import java.sql.*;
+import java.time.*;
+import java.time.temporal.*;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@Testcontainers
+@SpringBootTest
+@ActiveProfiles("test")
+@DisplayName("TodoRepositoryJdbc Integration Tests")
+class TodoRepositoryJdbcTest {
+
+    @Container
+    static PostgreSQLContainer<?> postgresContainer = new PostgreSQLContainer<>("postgres:15-alpine")
+            .withDatabaseName("test_todo_db")
+            .withUsername("testuser")
+            .withPassword("testpass");
+
+    @DynamicPropertySource
+    static void postgresqlProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.datasource.url", postgresContainer::getJdbcUrl);
+        registry.add("spring.datasource.username", postgresContainer::getUsername);
+        registry.add("spring.datasource.password", postgresContainer::getPassword);
+        registry.add("spring.datasource.driver-class-name", () -> "org.postgresql.Driver");
+        registry.add("spring.liquibase.enabled", () -> "true");
+        registry.add("spring.liquibase.change-log", () -> "classpath:/db/changelog/db.changelog-master.xml"); // Явно указываем путь
+    }
+
+    @Autowired
+    private TodoRepository todoRepository;
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @BeforeEach
+    void cleanup() {
+        jdbcTemplate.execute("DELETE FROM todos");
+    }
+
+    @Test
+    @DisplayName("save() should insert a new todo and return it with generated ID and timestamps")
+    void save_shouldInsertNewTodo_andReturnWithIdAndTimestamps() {
+        // Arrange
+        Todo newTodo = new Todo();
+        newTodo.setTitle("Learn Testcontainers");
+        newTodo.setDescription("Practice writing integration tests with Testcontainers.");
+        newTodo.setCompleted(false);
+        LocalDateTime dueDate = LocalDateTime.now().plusDays(7).truncatedTo(ChronoUnit.SECONDS); // Убираем наносекунды для сравнения
+        newTodo.setDueDate(dueDate);
+
+        // Act
+        Todo savedTodo = todoRepository.save(newTodo);
+
+        // Assert - проверяем возвращенный объект
+        assertNotNull(savedTodo.getId(), "Saved todo ID should not be null");
+        assertTrue(savedTodo.getId() > 0, "Saved todo ID should be positive");
+        assertEquals("Learn Testcontainers", savedTodo.getTitle());
+        assertEquals("Practice writing integration tests with Testcontainers.", savedTodo.getDescription());
+        assertFalse(savedTodo.isCompleted());
+        assertNotNull(savedTodo.getCreatedAt(), "CreatedAt should be set");
+        assertNotNull(savedTodo.getUpdatedAt(), "UpdatedAt should be set");
+        assertEquals(savedTodo.getCreatedAt(), savedTodo.getUpdatedAt(), "CreatedAt and UpdatedAt should be equal on creation");
+        assertEquals(dueDate, savedTodo.getDueDate().truncatedTo(ChronoUnit.SECONDS), "DueDate should match");
+
+        Todo fetchedTodo = jdbcTemplate.queryForObject(
+                TodoSqlBuilder.selectById(),
+                (rs, rowNum) -> {
+                    Todo t = new Todo();
+                    t.setId(rs.getLong("id"));
+                    t.setTitle(rs.getString("title"));
+                    t.setDescription(rs.getString("description"));
+                    t.setCompleted(rs.getBoolean("completed"));
+                    t.setCreatedAt(rs.getTimestamp("created_at").toLocalDateTime());
+                    t.setUpdatedAt(rs.getTimestamp("updated_at").toLocalDateTime());
+                    Timestamp dueTs = rs.getTimestamp("due_date");
+                    if (dueTs != null) {
+                        t.setDueDate(dueTs.toLocalDateTime());
+                    }
+                    return t;
+                },
+                savedTodo.getId()
+        );
+
+        assertNotNull(fetchedTodo, "Fetched todo should not be null");
+        assertEquals(savedTodo.getId(), fetchedTodo.getId());
+        assertEquals(savedTodo.getTitle(), fetchedTodo.getTitle());
+        assertEquals(savedTodo.getDescription(), fetchedTodo.getDescription());
+        assertEquals(savedTodo.isCompleted(), fetchedTodo.isCompleted());
+        assertEquals(savedTodo.getCreatedAt().truncatedTo(ChronoUnit.SECONDS), fetchedTodo.getCreatedAt().truncatedTo(ChronoUnit.SECONDS));
+        assertEquals(savedTodo.getUpdatedAt().truncatedTo(ChronoUnit.SECONDS), fetchedTodo.getUpdatedAt().truncatedTo(ChronoUnit.SECONDS));
+        if (savedTodo.getDueDate() != null && fetchedTodo.getDueDate() != null) {
+            assertEquals(savedTodo.getDueDate().truncatedTo(ChronoUnit.SECONDS), fetchedTodo.getDueDate().truncatedTo(ChronoUnit.SECONDS));
+        } else {
+            assertNull(savedTodo.getDueDate());
+            assertNull(fetchedTodo.getDueDate());
+        }
+    }
+}

From 16cb79f7ba20d8f1e51175e8459ee9e9d9eff947 Mon Sep 17 00:00:00 2001
From: GitLobanov <lobanovgithub@gmail.com>
Date: Tue, 17 Jun 2025 15:54:42 +0300
Subject: [PATCH 2/7] feat(api): Add user ID to Todo and new endpoints
 feat(service): Implement TodoService and related methods feat(entity): Add
 User entity and update Todo entity feat(exception): Add
 TodoRepositoryException and handler feat(config): Add WebConfig for CORS
 configuration

---
 .../com/emobile/springtodo/api/TodoApi.java   |  23 +++-
 .../emobile/springtodo/config/WebConfig.java  |  16 +++
 .../springtodo/controller/TodoController.java |  34 +++--
 .../exception/TodoRepositoryException.java    |   8 ++
 .../springtodo/filter/BasicFilter.java        |   4 +
 .../handler/GlobalExceptionHandler.java       |  16 +++
 .../springtodo/model/dto/TodoCreateDto.java   |   1 +
 .../emobile/springtodo/model/entity/Todo.java |   2 +
 .../emobile/springtodo/model/entity/User.java |  20 +++
 .../springtodo/model/mapper/TodoMapper.java   |   6 +-
 .../springtodo/repository/TodoRepository.java |   7 +-
 .../repository/impl/TodoRepositoryJdbc.java   | 120 ++++++++++++++++--
 .../repository/sql/TodoSqlBuilder.java        |  51 --------
 .../repository/sql/TodoSqlUtil.java           |  36 ++++++
 .../springtodo/service/TodoService.java       |  20 +++
 .../service/impl/TodoServiceImpl.java         |  69 ++++++++++
 src/main/resources/application.yaml           |   2 +-
 .../changes/changelog.init.schema.xml         |  56 ++++++++
 .../db/changelog/changes/changelog.schema.xml |  25 ----
 ...log-master.xml => db.changelog-master.xml} |   2 +-
 .../springtodo/TodoRepositoryJdbcTest.java    |  56 +-------
 21 files changed, 403 insertions(+), 171 deletions(-)
 create mode 100644 src/main/java/com/emobile/springtodo/config/WebConfig.java
 create mode 100644 src/main/java/com/emobile/springtodo/exception/TodoRepositoryException.java
 create mode 100644 src/main/java/com/emobile/springtodo/filter/BasicFilter.java
 create mode 100644 src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/entity/User.java
 delete mode 100644 src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
 create mode 100644 src/main/java/com/emobile/springtodo/service/TodoService.java
 create mode 100644 src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
 create mode 100644 src/main/resources/db/changelog/changes/changelog.init.schema.xml
 delete mode 100644 src/main/resources/db/changelog/changes/changelog.schema.xml
 rename src/main/resources/db/changelog/{changelog-master.xml => db.changelog-master.xml} (79%)

diff --git a/src/main/java/com/emobile/springtodo/api/TodoApi.java b/src/main/java/com/emobile/springtodo/api/TodoApi.java
index 52f4dc77..4dd94ed5 100644
--- a/src/main/java/com/emobile/springtodo/api/TodoApi.java
+++ b/src/main/java/com/emobile/springtodo/api/TodoApi.java
@@ -5,35 +5,44 @@
 import jakarta.validation.*;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.*;
+
+import static org.springframework.http.HttpStatus.CREATED;
+
 
 @RequestMapping("/api/v1/todos")
 public interface TodoApi {
 
     @RequestMapping("/")
-    String getTodos();
-
+    List<TodoDto> getTodos();
 
     @PostMapping
-    @ResponseStatus(org.springframework.http.HttpStatus.CREATED)
+    @ResponseStatus(CREATED)
     TodoDto createTodo(@Valid @RequestBody TodoCreateDto createTodoDto);
 
-    @GetMapping
-    TodoListResponseDto getAllTodos(
+    @GetMapping("/user/{userId}")
+    TodoListResponseDto getAllTodosByUserId(
             @Parameter(description = "Page number, starts from 0", required = true)
             @RequestParam(value = "page", defaultValue = "0") int page,
             @Parameter(description = "Size of the page, defaults to 10", required = true)
-            @RequestParam(value = "size", defaultValue = "10") int size
+            @RequestParam(value = "size", defaultValue = "10") int size,
+            @PathVariable @Parameter(description = "ID of the user to retrieve tasks for") long userId
     );
 
     @PutMapping("/{id}")
     TodoDto updateTodo(@Parameter(description = "ID of the task to update") @PathVariable Long id,
                            @Valid @RequestBody TodoUpdateDto requestDto);
 
+    @PutMapping("/{id}/complete")
+    void completeTodo(@Parameter(description = "ID of the task to complete") @PathVariable Long id);
+
+    @PutMapping("/{id}/incomplete")
+    void incompleteTodo(@Parameter(description = "ID of the task to mark incomplete") @PathVariable Long id);
+
     @GetMapping("/{id}")
     TodoDto getTodoById(@Parameter(description = "ID of the task to retrieve") @PathVariable Long id);
 
     @DeleteMapping("/{id}")
     @ResponseStatus(org.springframework.http.HttpStatus.NO_CONTENT)
     void deleteTodoById(@Parameter(description = "ID of the TODO item to delete") @PathVariable Long id);
-
 }
diff --git a/src/main/java/com/emobile/springtodo/config/WebConfig.java b/src/main/java/com/emobile/springtodo/config/WebConfig.java
new file mode 100644
index 00000000..59fa24de
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/config/WebConfig.java
@@ -0,0 +1,16 @@
+package com.emobile.springtodo.config;
+
+import org.springframework.context.annotation.*;
+import org.springframework.web.servlet.config.annotation.*;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/api/**")
+                .allowedOrigins("http://localhost:3000")
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .allowedHeaders("*")
+                .allowCredentials(true);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/controller/TodoController.java b/src/main/java/com/emobile/springtodo/controller/TodoController.java
index 3f715567..47a00131 100644
--- a/src/main/java/com/emobile/springtodo/controller/TodoController.java
+++ b/src/main/java/com/emobile/springtodo/controller/TodoController.java
@@ -2,38 +2,46 @@
 
 import com.emobile.springtodo.api.*;
 import com.emobile.springtodo.model.dto.*;
-import com.emobile.springtodo.model.mapper.*;
-import com.emobile.springtodo.repository.*;
+import com.emobile.springtodo.service.*;
 import lombok.*;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.*;
+
 @RestController
 @RequiredArgsConstructor
 public class TodoController implements TodoApi {
 
-    private final TodoRepository todoRepository;
-    private final TodoMapper todoMapper;
+    private final TodoService todoService;
 
     @Override
-    public String getTodos() {
-        return "";
+    public List<TodoDto> getTodos() {
+        return List.of();
     }
 
     @Override
     public TodoDto createTodo(TodoCreateDto createTodoDto) {
-        return todoRepository.save(todoMapper.toEntity(createTodoDto))
-                .map(todoMapper::toDto)
-                .orElseThrow(() -> new IllegalArgumentException("Error in saving"));
+        return todoService.createTodo(createTodoDto);
     }
 
     @Override
-    public TodoListResponseDto getAllTodos(int page, int size) {
-        return null;
+    public TodoListResponseDto getAllTodosByUserId(int page, int size, long userId) {
+        return todoService.getAllTodosByUserId(page, size, userId);
     }
 
     @Override
     public TodoDto updateTodo(Long id, TodoUpdateDto requestDto) {
-        return null;
+        return todoService.updateTodo(id, requestDto);
+    }
+
+    @Override
+    public void completeTodo(Long id) {
+        todoService.completeTodo(id);
+    }
+
+    @Override
+    public void incompleteTodo(Long id) {
+        todoService.incompleteTodo(id);
     }
 
     @Override
@@ -43,6 +51,6 @@ public TodoDto getTodoById(Long id) {
 
     @Override
     public void deleteTodoById(Long id) {
-
+        todoService.deleteTodo(id);
     }
 }
diff --git a/src/main/java/com/emobile/springtodo/exception/TodoRepositoryException.java b/src/main/java/com/emobile/springtodo/exception/TodoRepositoryException.java
new file mode 100644
index 00000000..d84d45aa
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/exception/TodoRepositoryException.java
@@ -0,0 +1,8 @@
+package com.emobile.springtodo.exception;
+
+public class TodoRepositoryException extends RuntimeException {
+
+    public TodoRepositoryException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/filter/BasicFilter.java b/src/main/java/com/emobile/springtodo/filter/BasicFilter.java
new file mode 100644
index 00000000..8431319e
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/filter/BasicFilter.java
@@ -0,0 +1,4 @@
+package com.emobile.springtodo.filter;
+
+public class BasicFilter {
+}
diff --git a/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java b/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
new file mode 100644
index 00000000..ed263c4e
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
@@ -0,0 +1,16 @@
+package com.emobile.springtodo.handler;
+
+import com.emobile.springtodo.exception.*;
+import org.springframework.http.*;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.*;
+
+@ControllerAdvice
+public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
+
+    @ExceptionHandler(TodoRepositoryException.class)
+    public ResponseEntity<String> handleTodoRepositoryException(TodoRepositoryException ex) {
+        //TODO("Implement specific handler logic")
+        return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
index 37c3ab46..c9d6ac64 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
@@ -2,6 +2,7 @@
 
 public record TodoCreateDto(
 
+        Long userId,
         String title,
         String description) {
 
diff --git a/src/main/java/com/emobile/springtodo/model/entity/Todo.java b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
index 81de87ba..209a7f50 100644
--- a/src/main/java/com/emobile/springtodo/model/entity/Todo.java
+++ b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
@@ -23,6 +23,8 @@ public class Todo {
 
     private Long id;
 
+    private Long userId;
+
     private String title;
 
     private String description;
diff --git a/src/main/java/com/emobile/springtodo/model/entity/User.java b/src/main/java/com/emobile/springtodo/model/entity/User.java
new file mode 100644
index 00000000..07e42a21
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/entity/User.java
@@ -0,0 +1,20 @@
+package com.emobile.springtodo.model.entity;
+
+import lombok.*;
+
+import java.time.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class User {
+
+    private Long id;
+    private String username;
+    private String password;
+    private String email;
+    private boolean enabled;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}
diff --git a/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java b/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
index 9d18aa8e..6b87dc8e 100644
--- a/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
+++ b/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
@@ -4,15 +4,17 @@
 import com.emobile.springtodo.model.entity.*;
 import org.mapstruct.*;
 
+import java.util.*;
+
 @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = MappingConstants.ComponentModel.SPRING)
 public interface TodoMapper {
 
     TodoDto toDto(Todo todo);
+    TodoListResponseDto toListResponseDto(List<Todo> todos, long total, int limit, int offset);
 
     @Mapping(target = "id", ignore = true)
     @Mapping(target = "completed", ignore = true)
     Todo toEntity(TodoCreateDto requestDto);
 
-    @Mapping(target = "id", ignore = true)
-    Todo toEntity(TodoUpdateDto requestDto);
+    Todo toEntity(TodoUpdateDto requestDto, Long id);
 }
diff --git a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
index 1eb044ed..cfe26a0a 100644
--- a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
+++ b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
@@ -9,8 +9,11 @@ public interface TodoRepository {
     Optional<Todo> save(Todo todo);
     Optional<Todo> update(Todo todo);
     void deleteByID(Long id);
-    Optional<String> findByID(Long id);
-    List<String> findAll(int limit, int offset);
+    void completeById(Long id);
+    void incompleteById(Long id);
+    Optional<Todo> findByID(Long id);
+    List<Todo> findAll(int limit, int offset);
+    List<Todo> findAllByUserId(int limit, int offset, long userId);
     long count();
 
 }
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
index 51608a43..7b52821c 100644
--- a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
+++ b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
@@ -1,8 +1,8 @@
 package com.emobile.springtodo.repository.impl;
 
+import com.emobile.springtodo.exception.*;
 import com.emobile.springtodo.model.entity.*;
 import com.emobile.springtodo.repository.*;
-import com.emobile.springtodo.repository.sql.*;
 import lombok.*;
 import org.springframework.dao.*;
 import org.springframework.jdbc.core.*;
@@ -13,6 +13,12 @@
 import java.time.*;
 import java.util.*;
 
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_DELETE_BY_ID;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_INSERT_ALL;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_ID;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_USER_ID;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_UPDATE_ALL;
+
 @RequiredArgsConstructor
 @Repository
 public class TodoRepositoryJdbc implements TodoRepository {
@@ -25,17 +31,18 @@ public Optional<Todo> save(Todo todo) {
         LocalDateTime now = LocalDateTime.now();
 
         jdbcTemplate.update(connection -> {
-            String insertSql = TodoSqlBuilder.insert();
-            PreparedStatement ps = connection.prepareStatement(insertSql, new String[]{"id"});
-            ps.setString(1, todo.getTitle());
-            ps.setString(2, todo.getDescription());
-            ps.setBoolean(3, todo.isCompleted());
-            ps.setTimestamp(4, Timestamp.valueOf(now));
+            PreparedStatement ps = connection.prepareStatement(TODO_INSERT_ALL, new String[]{"id"});
+            ps.setLong(1, todo.getUserId());
+            ps.setLong(1, todo.getUserId());
+            ps.setString(2, todo.getTitle());
+            ps.setString(3, todo.getDescription());
+            ps.setBoolean(4, todo.isCompleted());
             ps.setTimestamp(5, Timestamp.valueOf(now));
+            ps.setTimestamp(6, Timestamp.valueOf(now));
             if (todo.getDueDate() != null) {
-                ps.setTimestamp(6, Timestamp.valueOf(todo.getDueDate()));
+                ps.setTimestamp(7, Timestamp.valueOf(todo.getDueDate()));
             } else {
-                ps.setNull(6, Types.TIMESTAMP);
+                ps.setNull(7, Types.TIMESTAMP);
             }
             return ps;
         }, keyHolder);
@@ -49,7 +56,7 @@ public Optional<Todo> save(Todo todo) {
             generatedIdNum = keyHolder.getKey();
         }
         else {
-            throw new DataRetrievalFailureException("Failed to retrieve generated ID for Todo.");
+            throw new TodoRepositoryException("Failed to retrieve generated ID for Todo.");
         }
 
         Long generatedId = Objects.requireNonNull(generatedIdNum, "Generated ID cannot be null").longValue();
@@ -63,26 +70,111 @@ public Optional<Todo> save(Todo todo) {
 
     @Override
     public Optional<Todo> update(Todo todo) {
-        return Optional.empty();
+        LocalDateTime now = LocalDateTime.now();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(TODO_UPDATE_ALL);
+            ps.setString(1, todo.getTitle());
+            ps.setString(2, todo.getDescription());
+            ps.setBoolean(3, todo.isCompleted());
+            ps.setTimestamp(4, Timestamp.valueOf(now));
+            if (todo.getDueDate() != null) {
+                ps.setTimestamp(5, Timestamp.valueOf(todo.getDueDate()));
+            } else {
+                ps.setNull(5, java.sql.Types.TIMESTAMP);
+            }
+            ps.setLong(6, todo.getId());
+            return ps;
+        });
+
+        todo.setUpdatedAt(now);
+
+        return Optional.of(todo);
     }
 
     @Override
     public void deleteByID(Long id) {
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(TODO_DELETE_BY_ID);
+            ps.setLong(6, id);
+            return ps;
+        });
+    }
+
+    @Override
+    public void completeById(Long id) {
+        Todo todo = findByID(id).orElseThrow(() -> new TodoRepositoryException("Todo not found with ID: " + id));
+        todo.setCompleted(true);
+        update(todo);
+    }
 
+    @Override
+    public void incompleteById(Long id) {
+        Todo todo = findByID(id).orElseThrow(() -> new TodoRepositoryException("Todo not found with ID: " + id));
+        todo.setCompleted(false);
+        update(todo);
     }
 
     @Override
-    public Optional<String> findByID(Long id) {
-        return Optional.empty();
+    public Optional<Todo> findByID(Long id) {
+        try {
+            Todo todo = jdbcTemplate.queryForObject(TODO_SELECT_BY_ID, new TodoRowMapper(), id);
+            return Optional.ofNullable(todo);
+        } catch (EmptyResultDataAccessException e) {
+            return Optional.empty();
+        }
     }
 
     @Override
-    public List<String> findAll(int limit, int offset) {
+    public List<Todo> findAll(int limit, int offset) {
         return List.of();
     }
 
+    @Override
+    public List<Todo> findAllByUserId(int limit, int offset, long userId) {
+        return jdbcTemplate.query(
+                TODO_SELECT_BY_USER_ID,
+                new TodoRowMapper(),
+                userId,
+                limit,
+                offset
+        );
+    }
+
     @Override
     public long count() {
         return 0;
     }
+
+    /**
+     * A reusable RowMapper to map a database row to a Todo object.
+     */
+    private static class TodoRowMapper implements RowMapper<Todo> {
+        @Override
+        public Todo mapRow(ResultSet rs, int rowNum) throws SQLException {
+            Todo todo = new Todo();
+            todo.setId(rs.getLong("id"));
+            todo.setUserId(rs.getLong("user_id"));
+            todo.setTitle(rs.getString("title"));
+            todo.setDescription(rs.getString("description"));
+            todo.setCompleted(rs.getBoolean("completed"));
+
+            Timestamp createdAtTs = rs.getTimestamp("created_at");
+            if (createdAtTs != null) {
+                todo.setCreatedAt(createdAtTs.toLocalDateTime());
+            }
+
+            Timestamp updatedAtTs = rs.getTimestamp("updated_at");
+            if (updatedAtTs != null) {
+                todo.setUpdatedAt(updatedAtTs.toLocalDateTime());
+            }
+
+            Timestamp dueDateTs = rs.getTimestamp("due_date");
+            if (dueDateTs != null) {
+                todo.setDueDate(dueDateTs.toLocalDateTime());
+            }
+
+            return todo;
+        }
+    }
 }
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java
deleted file mode 100644
index b109b6e9..00000000
--- a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlBuilder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.emobile.springtodo.repository.sql;
-
-import lombok.experimental.*;
-
-@UtilityClass
-public class TodoSqlBuilder {
-
-    private static final String BASE_SELECT = """
-            SELECT id, title, description, completed, created_at, updated_at, due_date 
-            FROM todos
-            """;
-
-    public static String selectAll() {
-        return BASE_SELECT + " ORDER BY created_at DESC LIMIT ? OFFSET ?";
-    }
-
-    public static String selectById() {
-        return BASE_SELECT + " WHERE id = ?";
-    }
-
-    public static String selectOverdue() {
-        return BASE_SELECT + " WHERE due_date < ? AND completed = false";
-    }
-
-    public static String insert() {
-        return """
-                INSERT INTO todos (title, description, completed, created_at, updated_at, due_date)
-                VALUES (?, ?, ?, ?, ?, ?)
-                """;
-    }
-
-    public static String update() {
-        return """
-                UPDATE todos 
-                SET title = ?, description = ?, completed = ?, updated_at = ?, due_date = ? 
-                WHERE id = ?
-                """;
-    }
-
-    public static String delete() {
-        return "DELETE FROM todos WHERE id = ?";
-    }
-
-    public static String count() {
-        return "SELECT COUNT(*) FROM todos";
-    }
-
-    public static String countOverdue() {
-        return "SELECT COUNT(*) FROM todos WHERE due_date < ? AND completed = false";
-    }
-}
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
new file mode 100644
index 00000000..f79df398
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
@@ -0,0 +1,36 @@
+package com.emobile.springtodo.repository.sql;
+
+import lombok.experimental.*;
+
+@UtilityClass
+public class TodoSqlUtil {
+
+    private static final String BASE_SELECT = """
+            SELECT id, user_id, title, description, completed, created_at, updated_at, due_date 
+            FROM todos
+            """;
+
+    public static final String TODO_SELECT_ALL = BASE_SELECT + " ORDER BY created_at DESC LIMIT ? OFFSET ?";
+    public static final String TODO_SELECT_BY_ID = BASE_SELECT + " WHERE id = ?";
+    public static final String TODO_SELECT_BY_USER_ID = BASE_SELECT + " WHERE user_id = ? ORDER BY created_at DESC LIMIT ? OFFSET ?";
+    public static final String TODO_SELECT_OVERDUE = BASE_SELECT + " WHERE due_date < ? AND completed = false";
+    public static final String TODO_SELECT_COMPLETED = BASE_SELECT + " WHERE completed = true";
+
+    public static final String TODO_INSERT_ALL = """
+                INSERT INTO todos (user_id, title, description, completed, created_at, updated_at, due_date)
+                VALUES (?, ?, ?, ?, ?, ?, ?)
+                """;
+
+    public static final String TODO_UPDATE_ALL = """
+                UPDATE todos 
+                SET title = ?, description = ?, completed = ?, updated_at = ?, due_date = ? 
+                WHERE id = ?
+                """;
+
+    public static final String TODO_DELETE_BY_ID = "DELETE FROM todos WHERE id = ?";
+
+    public static final String TODO_COUNT_BY_USER_ID = "SELECT COUNT(*) FROM todos WHERE user_id = ?";
+    public static final String TODO_COUNT_ALL = "SELECT COUNT(*) FROM todos";
+    public static String TODO_COUNT_OVERDUE_BY_USER_ID = "SELECT COUNT(*) FROM todos WHERE user_id = ? " +
+            "AND due_date < ? AND completed = false";
+}
diff --git a/src/main/java/com/emobile/springtodo/service/TodoService.java b/src/main/java/com/emobile/springtodo/service/TodoService.java
new file mode 100644
index 00000000..11516494
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/service/TodoService.java
@@ -0,0 +1,20 @@
+package com.emobile.springtodo.service;
+
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.model.entity.*;
+import org.springframework.stereotype.*;
+
+import java.util.*;
+
+@Service
+public interface TodoService {
+
+    List<TodoDto> getTodos ();
+    TodoDto createTodo (TodoCreateDto createTodoDto);
+    TodoDto updateTodo (Long id, TodoUpdateDto requestDto);
+    void deleteTodo (Long id);
+    void completeTodo (Long id);
+    void incompleteTodo (Long id);
+    Todo getTodoById (Long id);
+    TodoListResponseDto getAllTodosByUserId (int page, int size, long userId);
+}
diff --git a/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
new file mode 100644
index 00000000..f7281ccd
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
@@ -0,0 +1,69 @@
+package com.emobile.springtodo.service.impl;
+
+import com.emobile.springtodo.exception.*;
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.model.entity.*;
+import com.emobile.springtodo.model.mapper.*;
+import com.emobile.springtodo.repository.*;
+import com.emobile.springtodo.service.*;
+import lombok.*;
+import org.springframework.stereotype.*;
+
+import java.util.*;
+
+@Service
+@AllArgsConstructor
+public class TodoServiceImpl implements TodoService {
+
+    private final TodoRepository todoRepository;
+    private final TodoMapper todoMapper;
+    // TODO fix in next versions
+    private final Long USE_FAKE_USER_ID = 1L;
+
+    @Override
+    public List<TodoDto> getTodos() {
+        return List.of();
+    }
+
+    @Override
+    public TodoDto createTodo(TodoCreateDto createTodoDto) {
+        Todo entity = todoMapper.toEntity(createTodoDto);
+        entity.setUserId(USE_FAKE_USER_ID);
+        return todoRepository.save(entity)
+                .map(todoMapper::toDto)
+                .orElseThrow(() -> new IllegalArgumentException("Error in saving"));
+    }
+
+    @Override
+    public TodoDto updateTodo(Long id, TodoUpdateDto requestDto) {
+        return todoRepository.update(todoMapper.toEntity(requestDto, id))
+                .map(todoMapper::toDto)
+                .orElseThrow(() -> new TodoRepositoryException("Error in updating"));
+    }
+
+    @Override
+    public void deleteTodo(Long id) {
+        todoRepository.deleteByID(id);
+    }
+
+    @Override
+    public void completeTodo(Long id) {
+        todoRepository.completeById(id);
+    }
+
+    @Override
+    public void incompleteTodo(Long id) {
+        todoRepository.incompleteById(id);
+    }
+
+    @Override
+    public Todo getTodoById(Long id) {
+        return null;
+    }
+
+    @Override
+    public TodoListResponseDto getAllTodosByUserId(int page, int size, long userId) {
+        List<Todo> allByUserId = todoRepository.findAllByUserId(size, page * size, USE_FAKE_USER_ID);
+        return todoMapper.toListResponseDto(allByUserId, todoRepository.count(), page, size);
+    }
+}
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index f77ff80e..ee216b06 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -12,7 +12,7 @@ spring:
     driver-class-name: org.postgresql.Driver
   liquibase:
     enabled: true
-    change-log: classpath:/db/changelog/changelog-master.xml
+    change-log: classpath:/db/changelog/db.changelog-master.xml
     database-change-log-lock-table: LIQ_DATABASECHANGELOGLOCK
     database-change-log-table: LIQ_DATABASECHANGELOG
     driver-class-name: org.postgresql.Driver
diff --git a/src/main/resources/db/changelog/changes/changelog.init.schema.xml b/src/main/resources/db/changelog/changes/changelog.init.schema.xml
new file mode 100644
index 00000000..a143ab77
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/changelog.init.schema.xml
@@ -0,0 +1,56 @@
+<databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog" logicalFilePath="path-independent"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
+
+    <changeSet id="init-table-users" author="lovanov anton">
+        <createTable tableName="users">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="pk_users"/>
+            </column>
+            <column name="username" type="VARCHAR(255)">
+                <constraints nullable="false" unique="true" uniqueConstraintName="uq_users_username"/>
+            </column>
+            <column name="password" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="email" type="VARCHAR(255)">
+                <constraints nullable="false" unique="true" uniqueConstraintName="uq_users_email"/>
+            </column>
+            <column name="created_at" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column name="updated_at" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column name="enabled" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+
+    <changeSet id="init-table-todos" author="lovanov anton">
+        <createTable tableName="todos">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="pk_todos"/>
+            </column>
+            <column autoIncrement="true" name="user_id" type="BIGINT">
+                <constraints foreignKeyName="fk_todos_users" referencedTableName="users" referencedColumnNames="id"/>
+            </column>
+            <column name="title" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="description" type="TEXT"/>
+            <column defaultValueBoolean="false" name="completed" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_at" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" name="updated_at"
+                    type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column name="due_date" type="DATETIME"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/db/changelog/changes/changelog.schema.xml b/src/main/resources/db/changelog/changes/changelog.schema.xml
deleted file mode 100644
index c031a77c..00000000
--- a/src/main/resources/db/changelog/changes/changelog.schema.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.liquibase.org/xml/ns/dbchangelog" logicalFilePath="path-independent" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
-
-    <changeSet id="init-schema" author="lovanov anton">
-        <createTable tableName="todos">
-            <column autoIncrement="true" name="id" type="BIGINT">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="pk_todos"/>
-            </column>
-            <column name="title" type="VARCHAR(255)">
-                <constraints nullable="false"/>
-            </column>
-            <column name="description" type="TEXT"/>
-            <column defaultValueBoolean="false" name="completed" type="BOOLEAN">
-                <constraints nullable="false"/>
-            </column>
-            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_at" type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column defaultValueComputed="CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" name="updated_at"
-                    type="TIMESTAMP">
-                <constraints nullable="false"/>
-            </column>
-            <column name="due_date" type="DATETIME"/>
-        </createTable>
-    </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/src/main/resources/db/changelog/changelog-master.xml b/src/main/resources/db/changelog/db.changelog-master.xml
similarity index 79%
rename from src/main/resources/db/changelog/changelog-master.xml
rename to src/main/resources/db/changelog/db.changelog-master.xml
index 524bbfd7..e8c104f8 100644
--- a/src/main/resources/db/changelog/changelog-master.xml
+++ b/src/main/resources/db/changelog/db.changelog-master.xml
@@ -4,5 +4,5 @@
         xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.3.xsd">
-    <include file="changes/changelog.schema.xml" relativeToChangelogFile="true"/>
+    <include file="changes/changelog.init.schema.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java b/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
index db151e73..90ac6f28 100644
--- a/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
+++ b/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
@@ -41,7 +41,7 @@ static void postgresqlProperties(DynamicPropertyRegistry registry) {
         registry.add("spring.datasource.password", postgresContainer::getPassword);
         registry.add("spring.datasource.driver-class-name", () -> "org.postgresql.Driver");
         registry.add("spring.liquibase.enabled", () -> "true");
-        registry.add("spring.liquibase.change-log", () -> "classpath:/db/changelog/db.changelog-master.xml"); // Явно указываем путь
+        registry.add("spring.liquibase.change-log", () -> "classpath:/db/changelog/db.db.changelog-master.xml"); // Явно указываем путь
     }
 
     @Autowired
@@ -58,59 +58,5 @@ void cleanup() {
     @Test
     @DisplayName("save() should insert a new todo and return it with generated ID and timestamps")
     void save_shouldInsertNewTodo_andReturnWithIdAndTimestamps() {
-        // Arrange
-        Todo newTodo = new Todo();
-        newTodo.setTitle("Learn Testcontainers");
-        newTodo.setDescription("Practice writing integration tests with Testcontainers.");
-        newTodo.setCompleted(false);
-        LocalDateTime dueDate = LocalDateTime.now().plusDays(7).truncatedTo(ChronoUnit.SECONDS); // Убираем наносекунды для сравнения
-        newTodo.setDueDate(dueDate);
-
-        // Act
-        Todo savedTodo = todoRepository.save(newTodo);
-
-        // Assert - проверяем возвращенный объект
-        assertNotNull(savedTodo.getId(), "Saved todo ID should not be null");
-        assertTrue(savedTodo.getId() > 0, "Saved todo ID should be positive");
-        assertEquals("Learn Testcontainers", savedTodo.getTitle());
-        assertEquals("Practice writing integration tests with Testcontainers.", savedTodo.getDescription());
-        assertFalse(savedTodo.isCompleted());
-        assertNotNull(savedTodo.getCreatedAt(), "CreatedAt should be set");
-        assertNotNull(savedTodo.getUpdatedAt(), "UpdatedAt should be set");
-        assertEquals(savedTodo.getCreatedAt(), savedTodo.getUpdatedAt(), "CreatedAt and UpdatedAt should be equal on creation");
-        assertEquals(dueDate, savedTodo.getDueDate().truncatedTo(ChronoUnit.SECONDS), "DueDate should match");
-
-        Todo fetchedTodo = jdbcTemplate.queryForObject(
-                TodoSqlBuilder.selectById(),
-                (rs, rowNum) -> {
-                    Todo t = new Todo();
-                    t.setId(rs.getLong("id"));
-                    t.setTitle(rs.getString("title"));
-                    t.setDescription(rs.getString("description"));
-                    t.setCompleted(rs.getBoolean("completed"));
-                    t.setCreatedAt(rs.getTimestamp("created_at").toLocalDateTime());
-                    t.setUpdatedAt(rs.getTimestamp("updated_at").toLocalDateTime());
-                    Timestamp dueTs = rs.getTimestamp("due_date");
-                    if (dueTs != null) {
-                        t.setDueDate(dueTs.toLocalDateTime());
-                    }
-                    return t;
-                },
-                savedTodo.getId()
-        );
-
-        assertNotNull(fetchedTodo, "Fetched todo should not be null");
-        assertEquals(savedTodo.getId(), fetchedTodo.getId());
-        assertEquals(savedTodo.getTitle(), fetchedTodo.getTitle());
-        assertEquals(savedTodo.getDescription(), fetchedTodo.getDescription());
-        assertEquals(savedTodo.isCompleted(), fetchedTodo.isCompleted());
-        assertEquals(savedTodo.getCreatedAt().truncatedTo(ChronoUnit.SECONDS), fetchedTodo.getCreatedAt().truncatedTo(ChronoUnit.SECONDS));
-        assertEquals(savedTodo.getUpdatedAt().truncatedTo(ChronoUnit.SECONDS), fetchedTodo.getUpdatedAt().truncatedTo(ChronoUnit.SECONDS));
-        if (savedTodo.getDueDate() != null && fetchedTodo.getDueDate() != null) {
-            assertEquals(savedTodo.getDueDate().truncatedTo(ChronoUnit.SECONDS), fetchedTodo.getDueDate().truncatedTo(ChronoUnit.SECONDS));
-        } else {
-            assertNull(savedTodo.getDueDate());
-            assertNull(fetchedTodo.getDueDate());
-        }
     }
 }

From 96d197e24e8631ca35662f96dfc09f94ca1db2e1 Mon Sep 17 00:00:00 2001
From: GitLobanov <lobanovgithub@gmail.com>
Date: Wed, 18 Jun 2025 14:45:31 +0300
Subject: [PATCH 3/7] feat(): Add tags and todo_tags tables and related
 services, reorder and correct API methods in TodoApi Implement Tag-related
 CRUD operations and services

---
 .../com/emobile/springtodo/api/TagApi.java    |  38 ++++++
 .../com/emobile/springtodo/api/TodoApi.java   |  27 ++--
 .../springtodo/controller/TagController.java  |  45 +++++++
 .../springtodo/controller/TodoController.java |   5 -
 .../exception/TagRepositoryException.java     |   8 ++
 .../handler/GlobalExceptionHandler.java       |   8 +-
 .../springtodo/model/dto/TagCreateDto.java    |   7 +
 .../emobile/springtodo/model/dto/TagDto.java  |  11 ++
 .../springtodo/model/dto/TagUpdateDto.java    |   7 +
 .../springtodo/model/dto/TodoCreateDto.java   |   2 -
 .../emobile/springtodo/model/dto/TodoDto.java |   3 +
 .../emobile/springtodo/model/entity/Tag.java  |  18 +++
 .../emobile/springtodo/model/entity/Todo.java |  18 ---
 .../springtodo/model/entity/TodoTags.java     |  14 ++
 .../springtodo/model/mapper/TagMapper.java    |  14 ++
 .../springtodo/repository/TagRepository.java  |  15 +++
 .../springtodo/repository/TodoRepository.java |   1 +
 .../repository/impl/TagRepositoryJdbc.java    | 121 ++++++++++++++++++
 .../repository/impl/TodoRepositoryJdbc.java   |  12 +-
 .../springtodo/repository/sql/TagSqlUtil.java |  33 +++++
 .../repository/sql/TodoSqlUtil.java           |   6 +-
 .../springtodo/service/TagService.java        |  13 ++
 .../springtodo/service/TodoService.java       |   3 +
 .../service/impl/TagServiceImpl.java          |  52 ++++++++
 .../service/impl/TodoServiceImpl.java         |  16 +++
 .../changes/changelog.init.schema.xml         |  55 +++++++-
 26 files changed, 508 insertions(+), 44 deletions(-)
 create mode 100644 src/main/java/com/emobile/springtodo/api/TagApi.java
 create mode 100644 src/main/java/com/emobile/springtodo/controller/TagController.java
 create mode 100644 src/main/java/com/emobile/springtodo/exception/TagRepositoryException.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TagCreateDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TagDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TagUpdateDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/entity/Tag.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/entity/TodoTags.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/TagRepository.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java
 create mode 100644 src/main/java/com/emobile/springtodo/service/TagService.java
 create mode 100644 src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java

diff --git a/src/main/java/com/emobile/springtodo/api/TagApi.java b/src/main/java/com/emobile/springtodo/api/TagApi.java
new file mode 100644
index 00000000..ef3ae0a1
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/api/TagApi.java
@@ -0,0 +1,38 @@
+package com.emobile.springtodo.api;
+
+import com.emobile.springtodo.model.dto.*;
+import io.swagger.v3.oas.annotations.*;
+import jakarta.validation.*;
+import org.springframework.web.bind.annotation.*;
+
+import static org.springframework.http.HttpStatus.*;
+
+
+@RequestMapping("/api/v1/tags")
+public interface TagApi {
+
+    @PostMapping
+    @ResponseStatus(CREATED)
+    TagDto createTag(@Valid @RequestBody TagCreateDto createTodoDto);
+
+    @PutMapping("/{id}")
+    TagDto updateTag(@Parameter(description = "ID of the tag to update") @PathVariable Long id,
+                      @Valid @RequestBody TagUpdateDto requestDto);
+
+    @DeleteMapping("/{id}")
+    @ResponseStatus(NO_CONTENT)
+    void deleteTagById(@Parameter(description = "ID of the tag item to delete") @PathVariable Long id);
+
+    @GetMapping("/{id}")
+    TagDto getTagById(@Parameter(description = "ID of the tag to retrieve") @PathVariable Long id);
+
+    @PutMapping("/{id}/tag/{tagId}")
+    void appendTagForTodo(
+            @PathVariable @Parameter(description = "ID of the task to append") Long id,
+            @PathVariable @Parameter(description = "ID of the tag to append to the task") Long tagId);
+
+    @DeleteMapping("/{id}/tag/{tagId}")
+    void removeTagForTodo(
+            @PathVariable @Parameter(description = "ID of the task to append") Long id,
+            @PathVariable @Parameter(description = "ID of the tag to append to the task") Long tagId);
+}
diff --git a/src/main/java/com/emobile/springtodo/api/TodoApi.java b/src/main/java/com/emobile/springtodo/api/TodoApi.java
index 4dd94ed5..9b10f874 100644
--- a/src/main/java/com/emobile/springtodo/api/TodoApi.java
+++ b/src/main/java/com/emobile/springtodo/api/TodoApi.java
@@ -5,21 +5,28 @@
 import jakarta.validation.*;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
-
 import static org.springframework.http.HttpStatus.CREATED;
 
 
 @RequestMapping("/api/v1/todos")
 public interface TodoApi {
 
-    @RequestMapping("/")
-    List<TodoDto> getTodos();
-
     @PostMapping
     @ResponseStatus(CREATED)
     TodoDto createTodo(@Valid @RequestBody TodoCreateDto createTodoDto);
 
+    @PutMapping("/{id}")
+    TodoDto updateTodo(@Parameter(description = "ID of the task to update") @PathVariable Long id,
+                           @Valid @RequestBody TodoUpdateDto requestDto);
+
+    @GetMapping("/{id}")
+    TodoDto getTodoById(@Parameter(description = "ID of the task to retrieve") @PathVariable Long id);
+
+
+    @DeleteMapping("/{id}")
+    @ResponseStatus(org.springframework.http.HttpStatus.NO_CONTENT)
+    void deleteTodoById(@Parameter(description = "ID of the TODO item to delete") @PathVariable Long id);
+
     @GetMapping("/user/{userId}")
     TodoListResponseDto getAllTodosByUserId(
             @Parameter(description = "Page number, starts from 0", required = true)
@@ -29,20 +36,10 @@ TodoListResponseDto getAllTodosByUserId(
             @PathVariable @Parameter(description = "ID of the user to retrieve tasks for") long userId
     );
 
-    @PutMapping("/{id}")
-    TodoDto updateTodo(@Parameter(description = "ID of the task to update") @PathVariable Long id,
-                           @Valid @RequestBody TodoUpdateDto requestDto);
-
     @PutMapping("/{id}/complete")
     void completeTodo(@Parameter(description = "ID of the task to complete") @PathVariable Long id);
 
     @PutMapping("/{id}/incomplete")
     void incompleteTodo(@Parameter(description = "ID of the task to mark incomplete") @PathVariable Long id);
 
-    @GetMapping("/{id}")
-    TodoDto getTodoById(@Parameter(description = "ID of the task to retrieve") @PathVariable Long id);
-
-    @DeleteMapping("/{id}")
-    @ResponseStatus(org.springframework.http.HttpStatus.NO_CONTENT)
-    void deleteTodoById(@Parameter(description = "ID of the TODO item to delete") @PathVariable Long id);
 }
diff --git a/src/main/java/com/emobile/springtodo/controller/TagController.java b/src/main/java/com/emobile/springtodo/controller/TagController.java
new file mode 100644
index 00000000..87f902f4
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/controller/TagController.java
@@ -0,0 +1,45 @@
+package com.emobile.springtodo.controller;
+
+import com.emobile.springtodo.api.*;
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.service.*;
+import jakarta.validation.*;
+import lombok.*;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@AllArgsConstructor
+public class TagController implements TagApi {
+
+    private final TagService tagService;
+
+    @Override
+    public TagDto createTag(TagCreateDto createTodoDto) {
+        return tagService.createTodo(createTodoDto);
+    }
+
+    @Override
+    public TagDto updateTag(Long id, @Valid TagUpdateDto requestDto) {
+        return tagService.updateTodo(id, requestDto);
+    }
+
+    @Override
+    public void deleteTagById(Long id) {
+        tagService.removeTodo(id);
+    }
+
+    @Override
+    public TagDto getTagById(Long id) {
+        return tagService.getById(id);
+    }
+
+    @Override
+    public void appendTagForTodo(Long id, Long tagId) {
+        tagService.appendTagTodo(id, tagId);
+    }
+
+    @Override
+    public void removeTagForTodo(Long id, Long tagId) {
+        tagService.removeTagTodo(id, tagId);
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/controller/TodoController.java b/src/main/java/com/emobile/springtodo/controller/TodoController.java
index 47a00131..fe866723 100644
--- a/src/main/java/com/emobile/springtodo/controller/TodoController.java
+++ b/src/main/java/com/emobile/springtodo/controller/TodoController.java
@@ -14,11 +14,6 @@ public class TodoController implements TodoApi {
 
     private final TodoService todoService;
 
-    @Override
-    public List<TodoDto> getTodos() {
-        return List.of();
-    }
-
     @Override
     public TodoDto createTodo(TodoCreateDto createTodoDto) {
         return todoService.createTodo(createTodoDto);
diff --git a/src/main/java/com/emobile/springtodo/exception/TagRepositoryException.java b/src/main/java/com/emobile/springtodo/exception/TagRepositoryException.java
new file mode 100644
index 00000000..234e6059
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/exception/TagRepositoryException.java
@@ -0,0 +1,8 @@
+package com.emobile.springtodo.exception;
+
+public class TagRepositoryException extends RuntimeException {
+
+    public TagRepositoryException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java b/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
index ed263c4e..a938adbe 100644
--- a/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
+++ b/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
@@ -1,16 +1,22 @@
 package com.emobile.springtodo.handler;
 
 import com.emobile.springtodo.exception.*;
+import lombok.extern.slf4j.*;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.*;
 
 @ControllerAdvice
+@Slf4j
 public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
     @ExceptionHandler(TodoRepositoryException.class)
     public ResponseEntity<String> handleTodoRepositoryException(TodoRepositoryException ex) {
-        //TODO("Implement specific handler logic")
+        return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
+    }
+
+    @ExceptionHandler(TagRepositoryException.class)
+    public ResponseEntity<String> handleTagRepositoryException(TagRepositoryException ex) {
         return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TagCreateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TagCreateDto.java
new file mode 100644
index 00000000..1f284085
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TagCreateDto.java
@@ -0,0 +1,7 @@
+package com.emobile.springtodo.model.dto;
+
+public record TagCreateDto (
+        String title,
+        String description
+) {
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TagDto.java b/src/main/java/com/emobile/springtodo/model/dto/TagDto.java
new file mode 100644
index 00000000..c660214d
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TagDto.java
@@ -0,0 +1,11 @@
+package com.emobile.springtodo.model.dto;
+
+import java.time.*;
+
+public record TagDto (
+        Long id,
+        String title,
+        String description,
+        LocalDateTime createdAt
+) {
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TagUpdateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TagUpdateDto.java
new file mode 100644
index 00000000..559c8f9f
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TagUpdateDto.java
@@ -0,0 +1,7 @@
+package com.emobile.springtodo.model.dto;
+
+public record TagUpdateDto(
+        String title,
+        String description
+) {
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
index c9d6ac64..7ea409a6 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
@@ -1,9 +1,7 @@
 package com.emobile.springtodo.model.dto;
 
 public record TodoCreateDto(
-
         Long userId,
         String title,
         String description) {
-
 }
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
index f3da8cdd..627c244f 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
@@ -1,7 +1,10 @@
 package com.emobile.springtodo.model.dto;
 
+import java.util.*;
+
 public record TodoDto(
         Long id,
+        List<TagDto> tags,
         String title,
         String description,
         boolean completed) {
diff --git a/src/main/java/com/emobile/springtodo/model/entity/Tag.java b/src/main/java/com/emobile/springtodo/model/entity/Tag.java
new file mode 100644
index 00000000..353b713f
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/entity/Tag.java
@@ -0,0 +1,18 @@
+package com.emobile.springtodo.model.entity;
+
+
+import lombok.*;
+
+import java.time.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Tag {
+
+    private Long id;
+    private String title;
+    private String description;
+    private LocalDateTime createdAt;
+}
diff --git a/src/main/java/com/emobile/springtodo/model/entity/Todo.java b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
index 209a7f50..e97c0f94 100644
--- a/src/main/java/com/emobile/springtodo/model/entity/Todo.java
+++ b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
@@ -1,16 +1,5 @@
 package com.emobile.springtodo.model.entity;
 
-/**
- * Create a class entity called Todo with the following fields:
- * id (Long, Primary Key, автоинкремент)
- * title (String, не null, макс. длина, например, 255)
- * description (String, опционально, text)
- * completed (boolean, по умолчанию false)
- * createdAt (Timestamp, не null, по умолчанию текущее время)
- * updatedAt (Timestamp, не null, по умолчанию текущее время, обновляется при изменении)
- * dueDate (Date/Timestamp, опционально, для инновационной функции)
- */
-
 import lombok.*;
 
 import java.time.*;
@@ -22,18 +11,11 @@
 public class Todo {
 
     private Long id;
-
     private Long userId;
-
     private String title;
-
     private String description;
-
     private boolean completed;
-
     private LocalDateTime createdAt;
-
     private LocalDateTime updatedAt;
-
     private LocalDateTime dueDate;
 }
diff --git a/src/main/java/com/emobile/springtodo/model/entity/TodoTags.java b/src/main/java/com/emobile/springtodo/model/entity/TodoTags.java
new file mode 100644
index 00000000..4cd2af2e
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/entity/TodoTags.java
@@ -0,0 +1,14 @@
+package com.emobile.springtodo.model.entity;
+
+import lombok.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class TodoTags {
+
+    private Long id;
+    private Long todoId;
+    private Long tagId;
+}
diff --git a/src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java b/src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java
new file mode 100644
index 00000000..40d923f3
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java
@@ -0,0 +1,14 @@
+package com.emobile.springtodo.model.mapper;
+
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.model.entity.*;
+import org.mapstruct.*;
+
+@Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = MappingConstants.ComponentModel.SPRING)
+public interface TagMapper {
+
+    Tag toEntity(TagDto tagDto);
+    Tag toEntity(TagCreateDto tagDto);
+    Tag toEntity(TagUpdateDto tagDto);
+    TagDto toTagDto(Tag tag);
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/repository/TagRepository.java b/src/main/java/com/emobile/springtodo/repository/TagRepository.java
new file mode 100644
index 00000000..2eccc6d3
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/TagRepository.java
@@ -0,0 +1,15 @@
+package com.emobile.springtodo.repository;
+
+import com.emobile.springtodo.model.entity.*;
+
+import java.util.*;
+
+public interface TagRepository {
+
+    Optional<Tag> save(Tag todo);
+    Optional<Tag> update(Tag todo);
+    void appendTagToTodo(Long todoId, Long tagId);
+    void removeTagForTodo(Long todoId, Long tagId);
+    void deleteByID(Long id);
+    Optional<Tag> findByID(Long id);
+}
diff --git a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
index cfe26a0a..b2a6936b 100644
--- a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
+++ b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
@@ -14,6 +14,7 @@ public interface TodoRepository {
     Optional<Todo> findByID(Long id);
     List<Todo> findAll(int limit, int offset);
     List<Todo> findAllByUserId(int limit, int offset, long userId);
+    List<Todo> findAllByTagId(int limit, int offset, long tagId);
     long count();
 
 }
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java
new file mode 100644
index 00000000..820cd952
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java
@@ -0,0 +1,121 @@
+package com.emobile.springtodo.repository.impl;
+
+import com.emobile.springtodo.exception.*;
+import com.emobile.springtodo.model.entity.*;
+import com.emobile.springtodo.repository.*;
+import lombok.*;
+import org.springframework.dao.*;
+import org.springframework.jdbc.core.*;
+import org.springframework.jdbc.support.*;
+import org.springframework.stereotype.*;
+
+import java.sql.*;
+import java.time.*;
+import java.util.*;
+
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_DELETE_BY_ID;
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_DELETE_FROM_TODO;
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_INSERT_ALL;
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_INSERT_GROUP_TAGS;
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_SELECT_BY_ID;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_ID;
+
+@Repository
+@RequiredArgsConstructor
+public class TagRepositoryJdbc implements TagRepository {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    @Override
+    public Optional<Tag> save(Tag todo) {
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        LocalDateTime now = LocalDateTime.now();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(TAG_INSERT_ALL, new String[]{"id"});
+            ps.setString(1, todo.getTitle());
+            ps.setString(2, todo.getDescription());
+            ps.setTimestamp(3, Timestamp.valueOf(now));
+            return ps;
+        }, keyHolder);
+
+        Number generatedIdNum;
+        Map<String, Object> keys = keyHolder.getKeys();
+
+        if (keys != null && keys.containsKey("id")) {
+            generatedIdNum = (Number) keys.get("id");
+        } else if (keyHolder.getKey() != null) {
+            generatedIdNum = keyHolder.getKey();
+        }
+        else {
+            throw new TodoRepositoryException("Failed to retrieve generated ID for Todo.");
+        }
+
+        Long generatedId = Objects.requireNonNull(generatedIdNum, "Generated ID cannot be null").longValue();
+
+        todo.setId(generatedId);
+        todo.setCreatedAt(now);
+
+        return Optional.of(todo);
+    }
+
+    @Override
+    public Optional<Tag> update(Tag todo) {
+        LocalDateTime now = LocalDateTime.now();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(TAG_INSERT_ALL, new String[]{"id"});
+            ps.setString(1, todo.getTitle());
+            ps.setString(2, todo.getDescription());
+            ps.setTimestamp(3, Timestamp.valueOf(now));
+            return ps;
+        });
+
+        return Optional.of(todo);
+    }
+
+    @Override
+    public void appendTagToTodo(Long todoId, Long tagId) {
+        jdbcTemplate.update(TAG_INSERT_GROUP_TAGS, todoId, tagId);
+    }
+
+    @Override
+    public void removeTagForTodo(Long todoId, Long tagId) {
+        jdbcTemplate.update(TAG_DELETE_FROM_TODO, todoId, tagId);
+    }
+
+    @Override
+    public void deleteByID(Long id) {
+        jdbcTemplate.update(TAG_DELETE_BY_ID, id);
+    }
+
+    @Override
+    public Optional<Tag> findByID(Long id) {
+        try {
+            Tag tag = jdbcTemplate.queryForObject(TAG_SELECT_BY_ID, new TagRowMapper(), id);
+            return Optional.ofNullable(tag);
+        } catch (EmptyResultDataAccessException e) {
+            return Optional.empty();
+        }
+    }
+
+    /**
+     * A reusable RowMapper to map a database row to a Tag object.
+     */
+    private static class TagRowMapper implements RowMapper<Tag> {
+        @Override
+        public Tag mapRow(ResultSet rs, int rowNum) throws SQLException {
+            Tag tag = new Tag();
+            tag.setId(rs.getLong("id"));
+            tag.setTitle(rs.getString("title"));
+            tag.setDescription(rs.getString("description"));
+            tag.setCreatedAt(rs.getTimestamp("created_at").toLocalDateTime());
+
+            Timestamp createdAtTs = rs.getTimestamp("created_at");
+            if (createdAtTs != null) {
+                tag.setCreatedAt(createdAtTs.toLocalDateTime());
+            }
+            return tag;
+        }
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
index 7b52821c..37d3da71 100644
--- a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
+++ b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
@@ -33,7 +33,6 @@ public Optional<Todo> save(Todo todo) {
         jdbcTemplate.update(connection -> {
             PreparedStatement ps = connection.prepareStatement(TODO_INSERT_ALL, new String[]{"id"});
             ps.setLong(1, todo.getUserId());
-            ps.setLong(1, todo.getUserId());
             ps.setString(2, todo.getTitle());
             ps.setString(3, todo.getDescription());
             ps.setBoolean(4, todo.isCompleted());
@@ -141,6 +140,17 @@ public List<Todo> findAllByUserId(int limit, int offset, long userId) {
         );
     }
 
+    @Override
+    public List<Todo> findAllByTagId(int limit, int offset, long tagId) {
+        return jdbcTemplate.query(
+                TODO_SELECT_BY_USER_ID,
+                new TodoRowMapper(),
+                tagId,
+                limit,
+                offset
+        );
+    }
+
     @Override
     public long count() {
         return 0;
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java b/src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java
new file mode 100644
index 00000000..87ebbd8b
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java
@@ -0,0 +1,33 @@
+package com.emobile.springtodo.repository.sql;
+
+import lombok.experimental.*;
+
+@UtilityClass
+public class TagSqlUtil {
+
+    private static final String BASE_SELECT = """
+            SELECT id, title, description, created_at
+            FROM tags
+            """;
+
+    public static final String TAG_SELECT_ALL = BASE_SELECT + " ORDER BY created_at DESC";
+    public static final String TAG_SELECT_BY_ID = BASE_SELECT + " WHERE id = ?";
+
+    public static final String TAG_INSERT_ALL = """
+                INSERT INTO tags (title, description, created_at)
+                VALUES (?, ?, ?, ?, ?)
+                """;
+
+    public static final String TAG_INSERT_GROUP_TAGS = """
+            INSERT INTO todo_tags (todo_id, tag_id)
+            """;
+
+    public static final String TAG_UPDATE_ALL = """
+                UPDATE tags
+                SET title = ?, description = ?
+                WHERE id = ?
+                """;
+
+    public static final String TAG_DELETE_BY_ID = "DELETE FROM tags WHERE id = ?";
+    public static final String TAG_DELETE_FROM_TODO = "DELETE FROM todo_tags WHERE tag_id = ? AND todo_id = ?";
+}
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
index f79df398..98e69870 100644
--- a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
+++ b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
@@ -6,13 +6,17 @@
 public class TodoSqlUtil {
 
     private static final String BASE_SELECT = """
-            SELECT id, user_id, title, description, completed, created_at, updated_at, due_date 
+            SELECT id, user_id, title, description, completed, created_at, updated_at, due_date
             FROM todos
+            JOIN todo_tags ON todos.id = todo_tags.todo_id
+            JOIN tags ON todo_tags.tag_id = tags.id
             """;
 
     public static final String TODO_SELECT_ALL = BASE_SELECT + " ORDER BY created_at DESC LIMIT ? OFFSET ?";
     public static final String TODO_SELECT_BY_ID = BASE_SELECT + " WHERE id = ?";
     public static final String TODO_SELECT_BY_USER_ID = BASE_SELECT + " WHERE user_id = ? ORDER BY created_at DESC LIMIT ? OFFSET ?";
+    public static final String TODO_SELECT_BY_TAG_ID = BASE_SELECT +
+            "JOIN  WHERE user_id = ? ORDER BY created_at DESC LIMIT ? OFFSET ?";
     public static final String TODO_SELECT_OVERDUE = BASE_SELECT + " WHERE due_date < ? AND completed = false";
     public static final String TODO_SELECT_COMPLETED = BASE_SELECT + " WHERE completed = true";
 
diff --git a/src/main/java/com/emobile/springtodo/service/TagService.java b/src/main/java/com/emobile/springtodo/service/TagService.java
new file mode 100644
index 00000000..6a2357d1
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/service/TagService.java
@@ -0,0 +1,13 @@
+package com.emobile.springtodo.service;
+
+import com.emobile.springtodo.model.dto.*;
+
+public interface TagService {
+
+    TagDto createTodo (TagCreateDto createTodoDto);
+    TagDto updateTodo (Long id, TagUpdateDto requestDto);
+    void removeTodo (Long id);
+    TagDto getById (Long id);
+    void appendTagTodo (Long todoId, Long tagId);
+    void removeTagTodo (Long todoId, Long tagId);
+}
diff --git a/src/main/java/com/emobile/springtodo/service/TodoService.java b/src/main/java/com/emobile/springtodo/service/TodoService.java
index 11516494..7e85a0d6 100644
--- a/src/main/java/com/emobile/springtodo/service/TodoService.java
+++ b/src/main/java/com/emobile/springtodo/service/TodoService.java
@@ -15,6 +15,9 @@ public interface TodoService {
     void deleteTodo (Long id);
     void completeTodo (Long id);
     void incompleteTodo (Long id);
+    void appendTagTodo (Long todoId, Long tagId);
+    void removeTagTodo (Long todoId, Long tagId);
     Todo getTodoById (Long id);
     TodoListResponseDto getAllTodosByUserId (int page, int size, long userId);
+    TodoListResponseDto getAllTodosByTagId (int page, int size, long tagId);
 }
diff --git a/src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java b/src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java
new file mode 100644
index 00000000..2f2d6c10
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java
@@ -0,0 +1,52 @@
+package com.emobile.springtodo.service.impl;
+
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.model.mapper.*;
+import com.emobile.springtodo.repository.*;
+import com.emobile.springtodo.service.*;
+import lombok.*;
+import org.springframework.stereotype.*;
+
+@Service
+@AllArgsConstructor
+public class TagServiceImpl implements TagService {
+
+    private final TagRepository tagRepository;
+    private final TagMapper tagMapper;
+
+    @Override
+    public TagDto createTodo(TagCreateDto createTodoDto) {
+        return tagRepository.save(tagMapper.toEntity(createTodoDto))
+                .map(tagMapper::toTagDto)
+                .orElseThrow(() -> new RuntimeException("Failed to create tag"));
+    }
+
+    @Override
+    public TagDto updateTodo(Long id, TagUpdateDto requestDto) {
+        return tagRepository.save(tagMapper.toEntity(requestDto))
+                .map(tagMapper::toTagDto)
+                .orElseThrow(() -> new RuntimeException("Failed to create tag"));
+    }
+
+    @Override
+    public void removeTodo(Long id) {
+        tagRepository.deleteByID(id);
+    }
+
+    @Override
+    public TagDto getById(Long id) {
+        return tagRepository.findByID(id)
+                   .map(tagMapper::toTagDto)
+                   .orElseThrow(() -> new RuntimeException("Failed to find tag by id"));
+    }
+
+    @Override
+    public void appendTagTodo(Long todoId, Long tagId) {
+        tagRepository.appendTagToTodo(todoId, tagId);
+    }
+
+    @Override
+    public void removeTagTodo(Long todoId, Long tagId) {
+        tagRepository.removeTagForTodo(todoId, tagId);
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
index f7281ccd..163aa977 100644
--- a/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
+++ b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
@@ -16,6 +16,7 @@
 public class TodoServiceImpl implements TodoService {
 
     private final TodoRepository todoRepository;
+    private final TagRepository tagRepository;
     private final TodoMapper todoMapper;
     // TODO fix in next versions
     private final Long USE_FAKE_USER_ID = 1L;
@@ -56,6 +57,16 @@ public void incompleteTodo(Long id) {
         todoRepository.incompleteById(id);
     }
 
+    @Override
+    public void appendTagTodo(Long todoId, Long tagId) {
+        tagRepository.appendTagToTodo(todoId, tagId);
+    }
+
+    @Override
+    public void removeTagTodo(Long todoId, Long tagId) {
+        tagRepository.removeTagForTodo(todoId, tagId);
+    }
+
     @Override
     public Todo getTodoById(Long id) {
         return null;
@@ -66,4 +77,9 @@ public TodoListResponseDto getAllTodosByUserId(int page, int size, long userId)
         List<Todo> allByUserId = todoRepository.findAllByUserId(size, page * size, USE_FAKE_USER_ID);
         return todoMapper.toListResponseDto(allByUserId, todoRepository.count(), page, size);
     }
+
+    @Override
+    public TodoListResponseDto getAllTodosByTagId(int page, int size, long tagId) {
+        return null;
+    }
 }
diff --git a/src/main/resources/db/changelog/changes/changelog.init.schema.xml b/src/main/resources/db/changelog/changes/changelog.init.schema.xml
index a143ab77..b6958ab7 100644
--- a/src/main/resources/db/changelog/changes/changelog.init.schema.xml
+++ b/src/main/resources/db/changelog/changes/changelog.init.schema.xml
@@ -1,8 +1,13 @@
 <databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog" logicalFilePath="path-independent"
+                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog" logicalFilePath="db/changelog/changes/changelog.init.schema.xml"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
 
     <changeSet id="init-table-users" author="lovanov anton">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="users"/>
+            </not>
+        </preConditions>
         <createTable tableName="users">
             <column autoIncrement="true" name="id" type="BIGINT">
                 <constraints nullable="false" primaryKey="true" primaryKeyName="pk_users"/>
@@ -29,6 +34,12 @@
     </changeSet>
 
     <changeSet id="init-table-todos" author="lovanov anton">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="users"/>
+            <not>
+                <tableExists tableName="todos"/>
+            </not>
+        </preConditions>
         <createTable tableName="todos">
             <column autoIncrement="true" name="id" type="BIGINT">
                 <constraints nullable="false" primaryKey="true" primaryKeyName="pk_todos"/>
@@ -53,4 +64,46 @@
             <column name="due_date" type="DATETIME"/>
         </createTable>
     </changeSet>
+
+    <changeSet id="init-table-tags" author="lovanov anton">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <tableExists tableName="tags"/>
+            </not>
+        </preConditions>
+        <createTable tableName="tags">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="pk_tags"/>
+            </column>
+            <column name="title" type="VARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="description" type="TEXT"/>
+            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_at" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+
+    <changeSet id="init-table-todo_tags" author="lovanov anton">
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="todos"/>
+            <tableExists tableName="tags"/>
+            <not>
+                <tableExists tableName="todo_tags"/>
+            </not>
+        </preConditions>
+        <createTable tableName="todo_tags">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="pk_todo_tags"/>
+            </column>
+            <column autoIncrement="true" name="todo_id" type="BIGINT">
+                <constraints foreignKeyName="fk_todo_tags_todos" referencedTableName="todos"
+                             referencedColumnNames="id"/>
+            </column>
+            <column autoIncrement="true" name="tag_id" type="BIGINT">
+                <constraints foreignKeyName="fk_todo_tags_tags" referencedTableName="tags" referencedColumnNames="id"/>
+            </column>
+        </createTable>
+    </changeSet>
 </databaseChangeLog>
\ No newline at end of file

From e08a29848c1b0e52f6383f5e51f58f0f4978a580 Mon Sep 17 00:00:00 2001
From: GitLobanov <lobanovgithub@gmail.com>
Date: Tue, 24 Jun 2025 15:11:12 +0300
Subject: [PATCH 4/7] refactor: improve exception handling, fix tag API
 endpoints, update repository methods, and enhance DTO mappings for better
 consistency and error management

---
 .../com/emobile/springtodo/api/TagApi.java    |  15 +-
 .../com/emobile/springtodo/api/TodoApi.java   |  10 +-
 .../springtodo/controller/TagController.java  |  13 +-
 .../springtodo/controller/TodoController.java |   8 +-
 .../exception/TodoNotFoundException.java      |   8 +
 .../handler/GlobalExceptionHandler.java       |  25 +
 .../model/dto/TagListResponseDto.java         |  10 +
 .../springtodo/model/dto/TodoCreateDto.java   |   5 +
 .../emobile/springtodo/model/dto/TodoDto.java |   3 +
 .../model/dto/TodoListResponseDto.java        |   4 +-
 .../springtodo/model/dto/TodoUpdateDto.java   |   3 +
 .../emobile/springtodo/model/entity/Todo.java |   1 +
 .../emobile/springtodo/model/entity/User.java |   1 +
 .../springtodo/model/mapper/TagMapper.java    |   3 +
 .../springtodo/model/mapper/TodoMapper.java   |   2 +
 .../springtodo/repository/TagRepository.java  |   4 +-
 .../springtodo/repository/TodoRepository.java |   6 +-
 .../springtodo/repository/UserRepository.java |  20 +
 .../repository/impl/TagRepositoryJdbc.java    |  29 +-
 .../repository/impl/TodoRepositoryJdbc.java   |  33 +-
 .../repository/impl/UserRepositoryJdbc.java   | 181 ++++++++
 .../springtodo/repository/sql/TagSqlUtil.java |  13 +-
 .../repository/sql/TodoSqlUtil.java           |  36 +-
 .../repository/sql/UserSqlUtil.java           |  48 ++
 .../springtodo/service/TagService.java        |   1 +
 .../springtodo/service/TodoService.java       |   5 +-
 .../service/impl/TagServiceImpl.java          |  10 +-
 .../service/impl/TodoServiceImpl.java         |  20 +-
 .../SpringToDoApplicationTests.java           |  13 -
 .../springtodo/TodoRepositoryJdbcTest.java    |  62 ---
 .../springtodo/it/TodoControllerIT.java       | 432 ++++++++++++++++++
 src/test/resources/application-test.yaml      |   6 +
 .../sql/insert/insert-completed-todos.sql     |   7 +
 .../sql/insert/insert-large-dataset.sql       |  10 +
 .../sql/insert/insert-test-todos.sql          |   5 +
 .../sql/insert/insert-test-users.sql          |   5 +
 .../resources/sql/truncate/truncate-all.sql   |   3 +
 .../resources/sql/truncate/truncate-tags.sql  |   2 +
 .../resources/sql/truncate/truncate-todos.sql |   2 +
 .../resources/sql/truncate/truncate-users.sql |   2 +
 40 files changed, 923 insertions(+), 143 deletions(-)
 create mode 100644 src/main/java/com/emobile/springtodo/exception/TodoNotFoundException.java
 create mode 100644 src/main/java/com/emobile/springtodo/model/dto/TagListResponseDto.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/UserRepository.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/impl/UserRepositoryJdbc.java
 create mode 100644 src/main/java/com/emobile/springtodo/repository/sql/UserSqlUtil.java
 delete mode 100644 src/test/java/com/emobile/springtodo/SpringToDoApplicationTests.java
 delete mode 100644 src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
 create mode 100644 src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
 create mode 100644 src/test/resources/application-test.yaml
 create mode 100644 src/test/resources/sql/insert/insert-completed-todos.sql
 create mode 100644 src/test/resources/sql/insert/insert-large-dataset.sql
 create mode 100644 src/test/resources/sql/insert/insert-test-todos.sql
 create mode 100644 src/test/resources/sql/insert/insert-test-users.sql
 create mode 100644 src/test/resources/sql/truncate/truncate-all.sql
 create mode 100644 src/test/resources/sql/truncate/truncate-tags.sql
 create mode 100644 src/test/resources/sql/truncate/truncate-todos.sql
 create mode 100644 src/test/resources/sql/truncate/truncate-users.sql

diff --git a/src/main/java/com/emobile/springtodo/api/TagApi.java b/src/main/java/com/emobile/springtodo/api/TagApi.java
index ef3ae0a1..b57dc3d3 100644
--- a/src/main/java/com/emobile/springtodo/api/TagApi.java
+++ b/src/main/java/com/emobile/springtodo/api/TagApi.java
@@ -26,13 +26,16 @@ TagDto updateTag(@Parameter(description = "ID of the tag to update") @PathVariab
     @GetMapping("/{id}")
     TagDto getTagById(@Parameter(description = "ID of the tag to retrieve") @PathVariable Long id);
 
-    @PutMapping("/{id}/tag/{tagId}")
+    @GetMapping("/")
+    TagListResponseDto getAllTags();
+
+    @PutMapping("/{tagId}/tag/{todoId}")
     void appendTagForTodo(
-            @PathVariable @Parameter(description = "ID of the task to append") Long id,
-            @PathVariable @Parameter(description = "ID of the tag to append to the task") Long tagId);
+            @PathVariable @Parameter(description = "ID of the task to append") Long tagId,
+            @PathVariable @Parameter(description = "ID of the tag to append to the task") Long todoId);
 
-    @DeleteMapping("/{id}/tag/{tagId}")
+    @DeleteMapping("/{tagId}/tag/{todoId}")
     void removeTagForTodo(
-            @PathVariable @Parameter(description = "ID of the task to append") Long id,
-            @PathVariable @Parameter(description = "ID of the tag to append to the task") Long tagId);
+            @PathVariable @Parameter(description = "ID of the tag to delete from the task") Long tagId,
+            @PathVariable @Parameter(description = "ID of the task") Long todoId);
 }
diff --git a/src/main/java/com/emobile/springtodo/api/TodoApi.java b/src/main/java/com/emobile/springtodo/api/TodoApi.java
index 9b10f874..bdd1aec5 100644
--- a/src/main/java/com/emobile/springtodo/api/TodoApi.java
+++ b/src/main/java/com/emobile/springtodo/api/TodoApi.java
@@ -20,8 +20,7 @@ TodoDto updateTodo(@Parameter(description = "ID of the task to update") @PathVar
                            @Valid @RequestBody TodoUpdateDto requestDto);
 
     @GetMapping("/{id}")
-    TodoDto getTodoById(@Parameter(description = "ID of the task to retrieve") @PathVariable Long id);
-
+    TodoDto getTodoById(@Parameter(description = "ID of the task to retrieve") @PathVariable (value = "id") Long id);
 
     @DeleteMapping("/{id}")
     @ResponseStatus(org.springframework.http.HttpStatus.NO_CONTENT)
@@ -29,11 +28,8 @@ TodoDto updateTodo(@Parameter(description = "ID of the task to update") @PathVar
 
     @GetMapping("/user/{userId}")
     TodoListResponseDto getAllTodosByUserId(
-            @Parameter(description = "Page number, starts from 0", required = true)
-            @RequestParam(value = "page", defaultValue = "0") int page,
-            @Parameter(description = "Size of the page, defaults to 10", required = true)
-            @RequestParam(value = "size", defaultValue = "10") int size,
-            @PathVariable @Parameter(description = "ID of the user to retrieve tasks for") long userId
+            @PathVariable (value = "userId")
+            Long userId
     );
 
     @PutMapping("/{id}/complete")
diff --git a/src/main/java/com/emobile/springtodo/controller/TagController.java b/src/main/java/com/emobile/springtodo/controller/TagController.java
index 87f902f4..234f2593 100644
--- a/src/main/java/com/emobile/springtodo/controller/TagController.java
+++ b/src/main/java/com/emobile/springtodo/controller/TagController.java
@@ -34,12 +34,17 @@ public TagDto getTagById(Long id) {
     }
 
     @Override
-    public void appendTagForTodo(Long id, Long tagId) {
-        tagService.appendTagTodo(id, tagId);
+    public TagListResponseDto getAllTags() {
+        return tagService.getAllTags();
     }
 
     @Override
-    public void removeTagForTodo(Long id, Long tagId) {
-        tagService.removeTagTodo(id, tagId);
+    public void appendTagForTodo(Long tagId, Long todoId) {
+        tagService.appendTagTodo(todoId, tagId);
+    }
+
+    @Override
+    public void removeTagForTodo(Long tagId, Long todoId) {
+        tagService.removeTagTodo(tagId, todoId);
     }
 }
diff --git a/src/main/java/com/emobile/springtodo/controller/TodoController.java b/src/main/java/com/emobile/springtodo/controller/TodoController.java
index fe866723..0cf4d5d7 100644
--- a/src/main/java/com/emobile/springtodo/controller/TodoController.java
+++ b/src/main/java/com/emobile/springtodo/controller/TodoController.java
@@ -6,8 +6,6 @@
 import lombok.*;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
-
 @RestController
 @RequiredArgsConstructor
 public class TodoController implements TodoApi {
@@ -20,8 +18,8 @@ public TodoDto createTodo(TodoCreateDto createTodoDto) {
     }
 
     @Override
-    public TodoListResponseDto getAllTodosByUserId(int page, int size, long userId) {
-        return todoService.getAllTodosByUserId(page, size, userId);
+    public TodoListResponseDto getAllTodosByUserId(Long userId) {
+        return todoService.getAllTodosByUserId(userId);
     }
 
     @Override
@@ -41,7 +39,7 @@ public void incompleteTodo(Long id) {
 
     @Override
     public TodoDto getTodoById(Long id) {
-        return null;
+        return todoService.getTodoById(id);
     }
 
     @Override
diff --git a/src/main/java/com/emobile/springtodo/exception/TodoNotFoundException.java b/src/main/java/com/emobile/springtodo/exception/TodoNotFoundException.java
new file mode 100644
index 00000000..7ae6134e
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/exception/TodoNotFoundException.java
@@ -0,0 +1,8 @@
+package com.emobile.springtodo.exception;
+
+public class TodoNotFoundException extends RuntimeException {
+  
+  public TodoNotFoundException(String message) {
+    super(message);
+  }
+}
diff --git a/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java b/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
index a938adbe..d45f23f3 100644
--- a/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
+++ b/src/main/java/com/emobile/springtodo/handler/GlobalExceptionHandler.java
@@ -3,20 +3,45 @@
 import com.emobile.springtodo.exception.*;
 import lombok.extern.slf4j.*;
 import org.springframework.http.*;
+import org.springframework.validation.*;
+import org.springframework.web.bind.*;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.*;
 import org.springframework.web.servlet.mvc.method.annotation.*;
 
+import java.util.*;
+
 @ControllerAdvice
 @Slf4j
 public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
     @ExceptionHandler(TodoRepositoryException.class)
     public ResponseEntity<String> handleTodoRepositoryException(TodoRepositoryException ex) {
+        log.error(ex.getMessage());
         return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
     }
 
     @ExceptionHandler(TagRepositoryException.class)
     public ResponseEntity<String> handleTagRepositoryException(TagRepositoryException ex) {
+        log.error(ex.getMessage());
         return new ResponseEntity<>(ex.getMessage(), HttpStatus.BAD_REQUEST);
     }
+
+    @ExceptionHandler(TodoNotFoundException.class)
+    public ResponseEntity<String> handleTodoNotFoundException(TodoNotFoundException ex) {
+        log.error(ex.getMessage());
+        return new ResponseEntity<>(ex.getMessage(), HttpStatus.NOT_FOUND);
+    }
+
+    @Override
+    protected ResponseEntity<Object> handleMethodArgumentNotValid(MethodArgumentNotValidException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) {
+        Map<String, String> errors = new HashMap<>();
+        ex.getBindingResult().getAllErrors().forEach(error -> {
+            String fieldName = ((FieldError) error).getField();
+            String message = error.getDefaultMessage();
+            errors.put(fieldName, message);
+        });
+        log.error(errors.toString());
+        return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TagListResponseDto.java b/src/main/java/com/emobile/springtodo/model/dto/TagListResponseDto.java
new file mode 100644
index 00000000..03c5adcf
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/model/dto/TagListResponseDto.java
@@ -0,0 +1,10 @@
+package com.emobile.springtodo.model.dto;
+
+import java.util.*;
+
+public record TagListResponseDto(
+        List<TagDto> tags,
+        long total
+) {
+
+}
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
index 7ea409a6..d7cbc1ee 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
@@ -1,7 +1,12 @@
 package com.emobile.springtodo.model.dto;
 
+import jakarta.validation.constraints.*;
+import lombok.*;
+
+@Builder
 public record TodoCreateDto(
         Long userId,
+        @NotBlank
         String title,
         String description) {
 }
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
index 627c244f..1ad63cb5 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoDto.java
@@ -1,7 +1,10 @@
 package com.emobile.springtodo.model.dto;
 
+import lombok.*;
+
 import java.util.*;
 
+@Builder
 public record TodoDto(
         Long id,
         List<TagDto> tags,
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java
index 6d036fb5..4025b973 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoListResponseDto.java
@@ -4,9 +4,7 @@
 
 public record TodoListResponseDto(
         List<TodoDto> todos,
-        long total,
-        int limit,
-        int offset
+        long total
 ) {
 
 }
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java
index 3c039232..a241eeda 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoUpdateDto.java
@@ -1,5 +1,8 @@
 package com.emobile.springtodo.model.dto;
 
+import lombok.*;
+
+@Builder
 public record TodoUpdateDto(
         String title,
         String description,
diff --git a/src/main/java/com/emobile/springtodo/model/entity/Todo.java b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
index e97c0f94..c53e0a76 100644
--- a/src/main/java/com/emobile/springtodo/model/entity/Todo.java
+++ b/src/main/java/com/emobile/springtodo/model/entity/Todo.java
@@ -4,6 +4,7 @@
 
 import java.time.*;
 
+@Builder
 @Getter
 @Setter
 @NoArgsConstructor
diff --git a/src/main/java/com/emobile/springtodo/model/entity/User.java b/src/main/java/com/emobile/springtodo/model/entity/User.java
index 07e42a21..527c4827 100644
--- a/src/main/java/com/emobile/springtodo/model/entity/User.java
+++ b/src/main/java/com/emobile/springtodo/model/entity/User.java
@@ -4,6 +4,7 @@
 
 import java.time.*;
 
+@Builder
 @Getter
 @Setter
 @NoArgsConstructor
diff --git a/src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java b/src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java
index 40d923f3..0df79d57 100644
--- a/src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java
+++ b/src/main/java/com/emobile/springtodo/model/mapper/TagMapper.java
@@ -4,6 +4,8 @@
 import com.emobile.springtodo.model.entity.*;
 import org.mapstruct.*;
 
+import java.util.*;
+
 @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, componentModel = MappingConstants.ComponentModel.SPRING)
 public interface TagMapper {
 
@@ -11,4 +13,5 @@ public interface TagMapper {
     Tag toEntity(TagCreateDto tagDto);
     Tag toEntity(TagUpdateDto tagDto);
     TagDto toTagDto(Tag tag);
+    List<TagDto> toListDto (List<Tag> tags);
 }
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java b/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
index 6b87dc8e..d4b8fff5 100644
--- a/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
+++ b/src/main/java/com/emobile/springtodo/model/mapper/TodoMapper.java
@@ -10,6 +10,8 @@
 public interface TodoMapper {
 
     TodoDto toDto(Todo todo);
+    @Mapping(target = "tags", source = "tags")
+    TodoDto toDtoWithTags(Todo todo, List<Tag> tags);
     TodoListResponseDto toListResponseDto(List<Todo> todos, long total, int limit, int offset);
 
     @Mapping(target = "id", ignore = true)
diff --git a/src/main/java/com/emobile/springtodo/repository/TagRepository.java b/src/main/java/com/emobile/springtodo/repository/TagRepository.java
index 2eccc6d3..a58c149a 100644
--- a/src/main/java/com/emobile/springtodo/repository/TagRepository.java
+++ b/src/main/java/com/emobile/springtodo/repository/TagRepository.java
@@ -7,9 +7,11 @@
 public interface TagRepository {
 
     Optional<Tag> save(Tag todo);
-    Optional<Tag> update(Tag todo);
+    Optional<Tag> update(Long idTag, Tag todo);
     void appendTagToTodo(Long todoId, Long tagId);
     void removeTagForTodo(Long todoId, Long tagId);
     void deleteByID(Long id);
     Optional<Tag> findByID(Long id);
+    List<Tag> findByTodoId(Long todoId);
+    List<Tag> findAll();
 }
diff --git a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
index b2a6936b..357d630e 100644
--- a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
+++ b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
@@ -12,9 +12,9 @@ public interface TodoRepository {
     void completeById(Long id);
     void incompleteById(Long id);
     Optional<Todo> findByID(Long id);
-    List<Todo> findAll(int limit, int offset);
-    List<Todo> findAllByUserId(int limit, int offset, long userId);
+    List<Todo> findAll();
+    List<Todo> findAllByUserId(long userId);
     List<Todo> findAllByTagId(int limit, int offset, long tagId);
     long count();
-
+    boolean existsById(Long id);
 }
diff --git a/src/main/java/com/emobile/springtodo/repository/UserRepository.java b/src/main/java/com/emobile/springtodo/repository/UserRepository.java
new file mode 100644
index 00000000..55c02ad8
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/UserRepository.java
@@ -0,0 +1,20 @@
+package com.emobile.springtodo.repository;
+
+import com.emobile.springtodo.model.entity.*;
+
+import java.util.*;
+
+public interface UserRepository {
+
+    Optional<User> save(User user);
+    Optional<User> update(User user);
+    void deleteById(Long id);
+    Optional<User> findById(Long id);
+    Optional<User> findByUsername(String username);
+    Optional<User> findByEmail(String email);
+    List<User> findAll();
+    long count();
+    boolean existsById(Long id);
+    boolean existsByUsername(String username);
+    boolean existsByEmail(String email);
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java
index 820cd952..8ac15b7e 100644
--- a/src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java
+++ b/src/main/java/com/emobile/springtodo/repository/impl/TagRepositoryJdbc.java
@@ -17,8 +17,10 @@
 import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_DELETE_FROM_TODO;
 import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_INSERT_ALL;
 import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_INSERT_GROUP_TAGS;
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_SELECT_ALL;
 import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_SELECT_BY_ID;
-import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_ID;
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_SELECT_BY_TODO_ID;
+import static com.emobile.springtodo.repository.sql.TagSqlUtil.TAG_UPDATE_ALL;
 
 @Repository
 @RequiredArgsConstructor
@@ -60,14 +62,12 @@ public Optional<Tag> save(Tag todo) {
     }
 
     @Override
-    public Optional<Tag> update(Tag todo) {
-        LocalDateTime now = LocalDateTime.now();
-
+    public Optional<Tag> update(Long idTag, Tag todo) {
         jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement(TAG_INSERT_ALL, new String[]{"id"});
+            PreparedStatement ps = connection.prepareStatement(TAG_UPDATE_ALL);
             ps.setString(1, todo.getTitle());
             ps.setString(2, todo.getDescription());
-            ps.setTimestamp(3, Timestamp.valueOf(now));
+            ps.setLong(3, idTag);
             return ps;
         });
 
@@ -99,6 +99,23 @@ public Optional<Tag> findByID(Long id) {
         }
     }
 
+    @Override
+    public List<Tag> findByTodoId(Long todoId) {
+        return jdbcTemplate.query(
+                TAG_SELECT_BY_TODO_ID,
+                new TagRowMapper(),
+                todoId
+        );
+    }
+
+    @Override
+    public List<Tag> findAll() {
+        return jdbcTemplate.query(
+                TAG_SELECT_ALL,
+                new TagRowMapper()
+        );
+    }
+
     /**
      * A reusable RowMapper to map a database row to a Tag object.
      */
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
index 37d3da71..a6467b3f 100644
--- a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
+++ b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
@@ -15,8 +15,10 @@
 
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_DELETE_BY_ID;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_INSERT_ALL;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_ALL;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_ID;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_USER_ID;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_EXIST_BY_ID;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_UPDATE_ALL;
 
 @RequiredArgsConstructor
@@ -31,7 +33,7 @@ public Optional<Todo> save(Todo todo) {
         LocalDateTime now = LocalDateTime.now();
 
         jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement(TODO_INSERT_ALL, new String[]{"id"});
+            PreparedStatement ps = connection.prepareStatement(TODO_INSERT_ALL, Statement.RETURN_GENERATED_KEYS);
             ps.setLong(1, todo.getUserId());
             ps.setString(2, todo.getTitle());
             ps.setString(3, todo.getDescription());
@@ -53,8 +55,7 @@ public Optional<Todo> save(Todo todo) {
             generatedIdNum = (Number) keys.get("id");
         } else if (keyHolder.getKey() != null) {
             generatedIdNum = keyHolder.getKey();
-        }
-        else {
+        } else {
             throw new TodoRepositoryException("Failed to retrieve generated ID for Todo.");
         }
 
@@ -95,7 +96,7 @@ public Optional<Todo> update(Todo todo) {
     public void deleteByID(Long id) {
         jdbcTemplate.update(connection -> {
             PreparedStatement ps = connection.prepareStatement(TODO_DELETE_BY_ID);
-            ps.setLong(6, id);
+            ps.setLong(1, id);
             return ps;
         });
     }
@@ -125,18 +126,19 @@ public Optional<Todo> findByID(Long id) {
     }
 
     @Override
-    public List<Todo> findAll(int limit, int offset) {
-        return List.of();
+    public List<Todo> findAll() {
+        return jdbcTemplate.query(
+                TODO_SELECT_ALL,
+                new TodoRowMapper()
+        );
     }
 
     @Override
-    public List<Todo> findAllByUserId(int limit, int offset, long userId) {
+    public List<Todo> findAllByUserId(long userId) {
         return jdbcTemplate.query(
                 TODO_SELECT_BY_USER_ID,
                 new TodoRowMapper(),
-                userId,
-                limit,
-                offset
+                userId
         );
     }
 
@@ -156,6 +158,17 @@ public long count() {
         return 0;
     }
 
+    @Override
+    public boolean existsById(Long id) {
+        return Boolean.TRUE.equals(
+                jdbcTemplate.query(
+                        TODO_SELECT_EXIST_BY_ID,
+                        new SingleColumnRowMapper<>(Boolean.class),
+                        id
+                ).stream().findFirst().orElse(false)
+        );
+    }
+
     /**
      * A reusable RowMapper to map a database row to a Todo object.
      */
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/UserRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/UserRepositoryJdbc.java
new file mode 100644
index 00000000..68037b34
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/impl/UserRepositoryJdbc.java
@@ -0,0 +1,181 @@
+package com.emobile.springtodo.repository.impl;
+
+import com.emobile.springtodo.model.entity.*;
+import com.emobile.springtodo.repository.*;
+import com.emobile.springtodo.repository.sql.*;
+import lombok.*;
+import org.springframework.dao.*;
+import org.springframework.jdbc.core.*;
+import org.springframework.jdbc.support.*;
+import org.springframework.stereotype.*;
+
+import java.sql.*;
+import java.time.*;
+import java.util.*;
+
+@RequiredArgsConstructor
+@Repository
+public class UserRepositoryJdbc implements UserRepository {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    @Override
+    public Optional<User> save(User user) {
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        LocalDateTime now = LocalDateTime.now();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(
+                    UserSqlUtil.USER_INSERT_ALL,
+                    Statement.RETURN_GENERATED_KEYS
+            );
+            ps.setString(1, user.getUsername());
+            ps.setString(2, user.getPassword());
+            ps.setString(3, user.getEmail());
+            ps.setTimestamp(4, Timestamp.valueOf(now));
+            ps.setTimestamp(5, Timestamp.valueOf(now));
+            ps.setBoolean(6, user.isEnabled());
+            return ps;
+        }, keyHolder);
+
+        Long generatedId = keyHolder.getKeys().get("id") != null
+                ? ((Number) keyHolder.getKeys().get("id")).longValue()
+                : null;
+        user.setId(generatedId);
+        user.setCreatedAt(now);
+        user.setUpdatedAt(now);
+
+        return Optional.of(user);
+    }
+
+    @Override
+    public Optional<User> update(User user) {
+        LocalDateTime now = LocalDateTime.now();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(UserSqlUtil.USER_UPDATE_ALL);
+            ps.setString(1, user.getUsername());
+            ps.setString(2, user.getPassword());
+            ps.setString(3, user.getEmail());
+            ps.setTimestamp(4, Timestamp.valueOf(now));
+            ps.setBoolean(5, user.isEnabled());
+            ps.setLong(6, user.getId());
+            return ps;
+        });
+
+        user.setUpdatedAt(now);
+        return Optional.of(user);
+    }
+
+    @Override
+    public void deleteById(Long id) {
+        jdbcTemplate.update(UserSqlUtil.USER_DELETE_BY_ID, id);
+    }
+
+    @Override
+    public Optional<User> findById(Long id) {
+        try {
+            User user = jdbcTemplate.queryForObject(
+                    UserSqlUtil.USER_SELECT_BY_ID,
+                    new UserRowMapper(),
+                    id
+            );
+            return Optional.ofNullable(user);
+        } catch (EmptyResultDataAccessException e) {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public Optional<User> findByUsername(String username) {
+        try {
+            User user = jdbcTemplate.queryForObject(
+                    UserSqlUtil.USER_SELECT_BY_USERNAME,
+                    new UserRowMapper(),
+                    username
+            );
+            return Optional.ofNullable(user);
+        } catch (EmptyResultDataAccessException e) {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public Optional<User> findByEmail(String email) {
+        try {
+            User user = jdbcTemplate.queryForObject(
+                    UserSqlUtil.USER_SELECT_BY_EMAIL,
+                    new UserRowMapper(),
+                    email
+            );
+            return Optional.ofNullable(user);
+        } catch (EmptyResultDataAccessException e) {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public List<User> findAll() {
+        return jdbcTemplate.query(UserSqlUtil.USER_SELECT_ALL, new UserRowMapper());
+    }
+
+    @Override
+    public long count() {
+        Long count = jdbcTemplate.queryForObject(
+                UserSqlUtil.USER_COUNT_ALL,
+                Long.class
+        );
+        return count != null ? count : 0;
+    }
+
+    @Override
+    public boolean existsById(Long id) {
+        return Boolean.TRUE.equals(jdbcTemplate.query(
+                UserSqlUtil.USER_SELECT_EXIST_BY_ID,
+                rs -> rs.next() ? rs.getBoolean(1) : false,
+                id
+        ));
+    }
+
+    @Override
+    public boolean existsByUsername(String username) {
+        return Boolean.TRUE.equals(jdbcTemplate.query(
+                UserSqlUtil.USER_SELECT_EXIST_BY_USERNAME,
+                rs -> rs.next() ? rs.getBoolean(1) : false,
+                username
+        ));
+    }
+
+    @Override
+    public boolean existsByEmail(String email) {
+        return Boolean.TRUE.equals(jdbcTemplate.query(
+                UserSqlUtil.USER_SELECT_EXIST_BY_EMAIL,
+                rs -> rs.next() ? rs.getBoolean(1) : false,
+                email
+        ));
+    }
+
+    private static class UserRowMapper implements RowMapper<User> {
+        @Override
+        public User mapRow(ResultSet rs, int rowNum) throws SQLException {
+            User user = new User();
+            user.setId(rs.getLong("id"));
+            user.setUsername(rs.getString("username"));
+            user.setPassword(rs.getString("password"));
+            user.setEmail(rs.getString("email"));
+
+            Timestamp createdAt = rs.getTimestamp("created_at");
+            if (createdAt != null) {
+                user.setCreatedAt(createdAt.toLocalDateTime());
+            }
+
+            Timestamp updatedAt = rs.getTimestamp("updated_at");
+            if (updatedAt != null) {
+                user.setUpdatedAt(updatedAt.toLocalDateTime());
+            }
+
+            user.setEnabled(rs.getBoolean("enabled"));
+            return user;
+        }
+    }
+}
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java b/src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java
index 87ebbd8b..36f1e306 100644
--- a/src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java
+++ b/src/main/java/com/emobile/springtodo/repository/sql/TagSqlUtil.java
@@ -6,20 +6,27 @@
 public class TagSqlUtil {
 
     private static final String BASE_SELECT = """
-            SELECT id, title, description, created_at
-            FROM tags
+            SELECT ta.id, ta.title, ta.description, ta.created_at
+            FROM tags ta
             """;
 
     public static final String TAG_SELECT_ALL = BASE_SELECT + " ORDER BY created_at DESC";
     public static final String TAG_SELECT_BY_ID = BASE_SELECT + " WHERE id = ?";
+    public static final String TAG_SELECT_BY_TODO_ID = BASE_SELECT + """
+            JOIN todo_tags tt ON ta.id = tt.tag_id
+            JOIN todos tod ON tt.todo_id = tod.id
+            WHERE tod.id = ?
+            ORDER BY ta.created_at DESC
+            """;
 
     public static final String TAG_INSERT_ALL = """
                 INSERT INTO tags (title, description, created_at)
-                VALUES (?, ?, ?, ?, ?)
+                VALUES (?, ?, ?)
                 """;
 
     public static final String TAG_INSERT_GROUP_TAGS = """
             INSERT INTO todo_tags (todo_id, tag_id)
+            VALUES (?, ?)
             """;
 
     public static final String TAG_UPDATE_ALL = """
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
index 98e69870..56cf28a8 100644
--- a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
+++ b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
@@ -1,24 +1,38 @@
 package com.emobile.springtodo.repository.sql;
 
+import liquibase.util.*;
 import lombok.experimental.*;
 
 @UtilityClass
 public class TodoSqlUtil {
 
     private static final String BASE_SELECT = """
-            SELECT id, user_id, title, description, completed, created_at, updated_at, due_date
+            SELECT todos.id, user_id, todos.title, todos.description, completed, todos.created_at, updated_at, due_date
             FROM todos
-            JOIN todo_tags ON todos.id = todo_tags.todo_id
-            JOIN tags ON todo_tags.tag_id = tags.id
             """;
 
-    public static final String TODO_SELECT_ALL = BASE_SELECT + " ORDER BY created_at DESC LIMIT ? OFFSET ?";
-    public static final String TODO_SELECT_BY_ID = BASE_SELECT + " WHERE id = ?";
-    public static final String TODO_SELECT_BY_USER_ID = BASE_SELECT + " WHERE user_id = ? ORDER BY created_at DESC LIMIT ? OFFSET ?";
-    public static final String TODO_SELECT_BY_TAG_ID = BASE_SELECT +
-            "JOIN  WHERE user_id = ? ORDER BY created_at DESC LIMIT ? OFFSET ?";
-    public static final String TODO_SELECT_OVERDUE = BASE_SELECT + " WHERE due_date < ? AND completed = false";
-    public static final String TODO_SELECT_COMPLETED = BASE_SELECT + " WHERE completed = true";
+    private static final String WITH_TAGS_SELECT = """
+            SELECT
+                todos.id,
+                user_id,
+                todos.title,
+                todos.description,
+                completed,
+                todos.created_at,
+                updated_at,
+                due_date,
+                ARRAY_AGG(tags.title) AS tags
+            FROM todos
+            LEFT JOIN todo_tags ON todos.id = todo_tags.todo_id
+            LEFT JOIN tags ON todo_tags.tag_id = tags.id
+            %s
+            GROUP BY todos.id
+            """;
+
+    public static final String TODO_SELECT_BY_ID = String.format(WITH_TAGS_SELECT, "WHERE todos.id = ?");
+    public static final String TODO_SELECT_BY_USER_ID = String.format(WITH_TAGS_SELECT, "WHERE user_id = ?");
+    public static final String TODO_SELECT_ALL = String.format(WITH_TAGS_SELECT, "");
+    public static final String TODO_SELECT_EXIST_BY_ID = "SELECT EXISTS(SELECT 1 FROM todos WHERE id = ?)";
 
     public static final String TODO_INSERT_ALL = """
                 INSERT INTO todos (user_id, title, description, completed, created_at, updated_at, due_date)
@@ -26,7 +40,7 @@ INSERT INTO todos (user_id, title, description, completed, created_at, updated_a
                 """;
 
     public static final String TODO_UPDATE_ALL = """
-                UPDATE todos 
+                UPDATE todos
                 SET title = ?, description = ?, completed = ?, updated_at = ?, due_date = ? 
                 WHERE id = ?
                 """;
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/UserSqlUtil.java b/src/main/java/com/emobile/springtodo/repository/sql/UserSqlUtil.java
new file mode 100644
index 00000000..eef239b2
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/repository/sql/UserSqlUtil.java
@@ -0,0 +1,48 @@
+package com.emobile.springtodo.repository.sql;
+
+import lombok.experimental.*;
+
+@UtilityClass
+public class UserSqlUtil {
+    public static final String USER_SELECT_BY_ID = """
+            SELECT id, username, password, email, created_at, updated_at, enabled
+            FROM users 
+            WHERE id = ?
+            """;
+
+    public static final String USER_SELECT_BY_USERNAME = """
+            SELECT id, username, password, email, created_at, updated_at, enabled 
+            FROM users 
+            WHERE username = ?
+            """;
+
+    public static final String USER_SELECT_BY_EMAIL = """
+            SELECT id, username, password, email, created_at, updated_at, enabled 
+            FROM users 
+            WHERE email = ?
+            """;
+
+    public static final String USER_SELECT_ALL = """
+            SELECT id, username, password, email, created_at, updated_at, enabled 
+            FROM users
+            """;
+
+    public static final String USER_SELECT_EXIST_BY_ID = "SELECT EXISTS(SELECT 1 FROM users WHERE id = ?)";
+    public static final String USER_SELECT_EXIST_BY_USERNAME = "SELECT EXISTS(SELECT 1 FROM users WHERE username = ?)";
+    public static final String USER_SELECT_EXIST_BY_EMAIL = "SELECT EXISTS(SELECT 1 FROM users WHERE email = ?)";
+
+    public static final String USER_INSERT_ALL = """
+            INSERT INTO users (username, password, email, created_at, updated_at, enabled)
+            VALUES (?, ?, ?, ?, ?, ?)
+            """;
+
+    public static final String USER_UPDATE_ALL = """
+            UPDATE users 
+            SET username = ?, password = ?, email = ?, updated_at = ?, enabled = ?
+            WHERE id = ?
+            """;
+
+    public static final String USER_DELETE_BY_ID = "DELETE FROM users WHERE id = ?";
+
+    public static final String USER_COUNT_ALL = "SELECT COUNT(*) FROM users";
+}
diff --git a/src/main/java/com/emobile/springtodo/service/TagService.java b/src/main/java/com/emobile/springtodo/service/TagService.java
index 6a2357d1..523d1d2a 100644
--- a/src/main/java/com/emobile/springtodo/service/TagService.java
+++ b/src/main/java/com/emobile/springtodo/service/TagService.java
@@ -10,4 +10,5 @@ public interface TagService {
     TagDto getById (Long id);
     void appendTagTodo (Long todoId, Long tagId);
     void removeTagTodo (Long todoId, Long tagId);
+    TagListResponseDto getAllTags();
 }
diff --git a/src/main/java/com/emobile/springtodo/service/TodoService.java b/src/main/java/com/emobile/springtodo/service/TodoService.java
index 7e85a0d6..8febacad 100644
--- a/src/main/java/com/emobile/springtodo/service/TodoService.java
+++ b/src/main/java/com/emobile/springtodo/service/TodoService.java
@@ -1,7 +1,6 @@
 package com.emobile.springtodo.service;
 
 import com.emobile.springtodo.model.dto.*;
-import com.emobile.springtodo.model.entity.*;
 import org.springframework.stereotype.*;
 
 import java.util.*;
@@ -17,7 +16,7 @@ public interface TodoService {
     void incompleteTodo (Long id);
     void appendTagTodo (Long todoId, Long tagId);
     void removeTagTodo (Long todoId, Long tagId);
-    Todo getTodoById (Long id);
-    TodoListResponseDto getAllTodosByUserId (int page, int size, long userId);
+    TodoDto getTodoById (Long id);
+    TodoListResponseDto getAllTodosByUserId (long userId);
     TodoListResponseDto getAllTodosByTagId (int page, int size, long tagId);
 }
diff --git a/src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java b/src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java
index 2f2d6c10..bb9055c3 100644
--- a/src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java
+++ b/src/main/java/com/emobile/springtodo/service/impl/TagServiceImpl.java
@@ -7,6 +7,8 @@
 import lombok.*;
 import org.springframework.stereotype.*;
 
+import java.util.*;
+
 @Service
 @AllArgsConstructor
 public class TagServiceImpl implements TagService {
@@ -23,7 +25,7 @@ public TagDto createTodo(TagCreateDto createTodoDto) {
 
     @Override
     public TagDto updateTodo(Long id, TagUpdateDto requestDto) {
-        return tagRepository.save(tagMapper.toEntity(requestDto))
+        return tagRepository.update(id, tagMapper.toEntity(requestDto))
                 .map(tagMapper::toTagDto)
                 .orElseThrow(() -> new RuntimeException("Failed to create tag"));
     }
@@ -49,4 +51,10 @@ public void appendTagTodo(Long todoId, Long tagId) {
     public void removeTagTodo(Long todoId, Long tagId) {
         tagRepository.removeTagForTodo(todoId, tagId);
     }
+
+    @Override
+    public TagListResponseDto getAllTags() {
+        List<TagDto> tags = tagMapper.toListDto(tagRepository.findAll());
+        return new TagListResponseDto(tags, tags.size());
+    }
 }
diff --git a/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
index 163aa977..6f11545f 100644
--- a/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
+++ b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
@@ -37,6 +37,10 @@ public TodoDto createTodo(TodoCreateDto createTodoDto) {
 
     @Override
     public TodoDto updateTodo(Long id, TodoUpdateDto requestDto) {
+        if (!todoRepository.existsById(id)) {
+            throw new TodoNotFoundException("Todo not found with id: " + id);
+        }
+
         return todoRepository.update(todoMapper.toEntity(requestDto, id))
                 .map(todoMapper::toDto)
                 .orElseThrow(() -> new TodoRepositoryException("Error in updating"));
@@ -68,14 +72,20 @@ public void removeTagTodo(Long todoId, Long tagId) {
     }
 
     @Override
-    public Todo getTodoById(Long id) {
-        return null;
+    public TodoDto getTodoById(Long id) {
+        return todoRepository.findByID(id)
+                .map(todoMapper::toDto)
+                .orElseThrow(() -> new TodoNotFoundException("Todo not found"));
     }
 
     @Override
-    public TodoListResponseDto getAllTodosByUserId(int page, int size, long userId) {
-        List<Todo> allByUserId = todoRepository.findAllByUserId(size, page * size, USE_FAKE_USER_ID);
-        return todoMapper.toListResponseDto(allByUserId, todoRepository.count(), page, size);
+    public TodoListResponseDto getAllTodosByUserId(long userId) {
+        List<Todo> allByUserId = todoRepository.findAllByUserId(userId);
+        List<TodoDto> list = allByUserId.stream()
+                .map(todo ->
+                    todoMapper.toDtoWithTags(todo, tagRepository.findByTodoId(todo.getId())))
+                .toList();
+        return new TodoListResponseDto (list, list.size());
     }
 
     @Override
diff --git a/src/test/java/com/emobile/springtodo/SpringToDoApplicationTests.java b/src/test/java/com/emobile/springtodo/SpringToDoApplicationTests.java
deleted file mode 100644
index 3114a50b..00000000
--- a/src/test/java/com/emobile/springtodo/SpringToDoApplicationTests.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.emobile.springtodo;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class SpringToDoApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}
diff --git a/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java b/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
deleted file mode 100644
index 90ac6f28..00000000
--- a/src/test/java/com/emobile/springtodo/TodoRepositoryJdbcTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.emobile.springtodo;
-
-import com.emobile.springtodo.model.entity.*;
-import com.emobile.springtodo.repository.*;
-import com.emobile.springtodo.repository.sql.*;
-import org.junit.jupiter.api.*;
-import org.springframework.beans.factory.annotation.*;
-import org.springframework.boot.test.context.*;
-import org.springframework.jdbc.core.*;
-import org.springframework.test.context.*;
-import org.testcontainers.containers.*;
-import org.testcontainers.junit.jupiter.*;
-import org.testcontainers.junit.jupiter.Container;
-
-import java.sql.*;
-import java.time.*;
-import java.time.temporal.*;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-@Testcontainers
-@SpringBootTest
-@ActiveProfiles("test")
-@DisplayName("TodoRepositoryJdbc Integration Tests")
-class TodoRepositoryJdbcTest {
-
-    @Container
-    static PostgreSQLContainer<?> postgresContainer = new PostgreSQLContainer<>("postgres:15-alpine")
-            .withDatabaseName("test_todo_db")
-            .withUsername("testuser")
-            .withPassword("testpass");
-
-    @DynamicPropertySource
-    static void postgresqlProperties(DynamicPropertyRegistry registry) {
-        registry.add("spring.datasource.url", postgresContainer::getJdbcUrl);
-        registry.add("spring.datasource.username", postgresContainer::getUsername);
-        registry.add("spring.datasource.password", postgresContainer::getPassword);
-        registry.add("spring.datasource.driver-class-name", () -> "org.postgresql.Driver");
-        registry.add("spring.liquibase.enabled", () -> "true");
-        registry.add("spring.liquibase.change-log", () -> "classpath:/db/changelog/db.db.changelog-master.xml"); // Явно указываем путь
-    }
-
-    @Autowired
-    private TodoRepository todoRepository;
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    @BeforeEach
-    void cleanup() {
-        jdbcTemplate.execute("DELETE FROM todos");
-    }
-
-    @Test
-    @DisplayName("save() should insert a new todo and return it with generated ID and timestamps")
-    void save_shouldInsertNewTodo_andReturnWithIdAndTimestamps() {
-    }
-}
diff --git a/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java b/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
new file mode 100644
index 00000000..50cf2f58
--- /dev/null
+++ b/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
@@ -0,0 +1,432 @@
+package com.emobile.springtodo.it;
+
+
+import com.emobile.springtodo.model.dto.*;
+import com.emobile.springtodo.model.entity.*;
+import com.emobile.springtodo.repository.*;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.*;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.*;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.*;
+import org.springframework.test.context.jdbc.*;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.transaction.annotation.*;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.time.*;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+
+@SpringBootTest
+//@AutoConfigureWebMvc
+@AutoConfigureMockMvc
+@Testcontainers
+//@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+@Transactional
+//@Sql(value = "/sql/truncate/truncate-all.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
+class TodoControllerIT {
+
+    @Container
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:15")
+            .withDatabaseName("todo_test")
+            .withUsername("test")
+            .withPassword("test")
+            .withReuse(true);
+
+//    @Container
+//    static GenericContainer<?> redis = new GenericContainer<>("redis:7-alpine")
+//            .withExposedPorts(6379)
+//            .withReuse(true);
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.datasource.url", postgres::getJdbcUrl);
+        registry.add("spring.datasource.username", postgres::getUsername);
+        registry.add("spring.datasource.password", postgres::getPassword);
+        // registry.add("spring.redis.host", redis::getHost);
+        // registry.add("spring.redis.port", () -> redis.getMappedPort(6379));
+    }
+
+    @Autowired
+    private MockMvc mockMvc;
+    @Autowired
+    private TodoRepository todoRepository;
+    @Autowired
+    private UserRepository userRepository;
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    private static final String URL_TODOS = "/api/v1/todos";
+    private static final String URL_TODOS_ID = URL_TODOS + "/{id}";
+    private static final String URL_TODOS_ID_COMPLETE = URL_TODOS_ID + "/complete";
+    private static final String URL_TODOS_ID_INCOMPLETE = URL_TODOS_ID + "/incomplete";
+
+    private static Long USER_ID;
+    private static Long USER_ID_2;
+
+    @BeforeEach
+    void setUp() {
+        User user1 = User.builder()
+                .id(USER_ID)
+                .username("ranob")
+                .password("password")
+                .email("ranob@example.com")
+                .enabled(true)
+                .createdAt(LocalDateTime.now())
+                .updatedAt(LocalDateTime.now())
+                .build();
+
+        User user2 = User.builder()
+                .id(USER_ID_2)
+                .username("John Doe")
+                .password("password1123")
+                .email("johndoe@example.com")
+                .enabled(true)
+                .createdAt(LocalDateTime.now())
+                .updatedAt(LocalDateTime.now())
+                .build();
+
+        User userSaved1 = userRepository.save(user1).orElseThrow();
+        User userSaved2 = userRepository.save(user2).orElseThrow();
+
+        USER_ID = userSaved1.getId();
+        USER_ID_2 = userSaved2.getId();
+    }
+
+    @Test
+    @DisplayName("Should create new todo successfully")
+    void shouldCreateTodoSuccessfully() throws Exception {
+        // Given
+        TodoCreateDto createDto = TodoCreateDto.builder()
+                .title("Test Todo")
+                .description("Test Description")
+                .userId(1L)
+                .build();
+
+        TodoDto expectedResponse = TodoDto.builder()
+                .id(1L)
+                .tags(null)
+                .title("Test Todo")
+                .description("Test Description")
+                .completed(false)
+                .build();
+
+        // When & Then
+        MvcResult result = mockMvc.perform(post(URL_TODOS)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(createDto)))
+                .andExpect(status().isCreated())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andReturn();
+
+        JSONAssert.assertEquals(objectMapper.writeValueAsString(expectedResponse), result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT);
+    }
+
+    @Test
+    @DisplayName("Should return validation error when creating todo with invalid data")
+    void shouldReturnValidationErrorWhenCreatingTodoWithInvalidData() throws Exception {
+        // Given
+        TodoCreateDto createDto = TodoCreateDto.builder()
+                .title("") // Invalid empty title
+                .description("Test Description")
+                .userId(1L)
+                .build();
+
+        // When & Then
+        mockMvc.perform(post(URL_TODOS)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(createDto)))
+                .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    @DisplayName("Should get all todos by user ID with pagination")
+    @Sql("/sql/insert/insert-test-todos.sql")
+    void shouldGetAllTodosByUserIdWithPagination() throws Exception {
+        // Given
+        Long userId = 1L;
+        int page = 0;
+        int size = 2;
+
+        String expectedResponse = """
+                {
+                    "todos": [
+                        {
+                            "id": 1,
+                            "title": "First Todo",
+                            "description": "First Description",
+                            "completed": false,
+                            "userId": 1
+                        },
+                        {
+                            "id": 2,
+                            "title": "Second Todo",
+                            "description": "Second Description",
+                            "completed": true,
+                            "userId": 1
+                        }
+                    ],
+                    "totalElements": 3,
+                    "totalPages": 2,
+                    "currentPage": 0,
+                    "pageSize": 2
+                }
+                """;
+
+        // When & Then
+        MvcResult result = mockMvc.perform(get(URL_TODOS)
+                        .param("page", String.valueOf(page))
+                        .param("size", String.valueOf(size))
+                        .param("userId", String.valueOf(userId)))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andReturn();
+
+        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT);
+    }
+
+    @Test
+    @DisplayName("Should get todo by ID successfully")
+    void shouldGetTodoByIdSuccessfully() throws Exception {
+        // Given
+        Todo todo = Todo.builder()
+                .userId(USER_ID)
+                .title("First Todo")
+                .description("First Description")
+                .completed(false)
+                .createdAt(LocalDateTime.now())
+                .updatedAt(LocalDateTime.now())
+                .build();
+
+        Todo todoSaved = todoRepository.save(todo).orElseThrow();
+        Long todoId = todoSaved.getId();
+
+        TodoDto expectedResponse = TodoDto.builder()
+                .id(todoId)
+                .tags(null)
+                .title("First Todo")
+                .description("First Description")
+                .completed(false)
+                .build();
+
+        // When & Then
+        MvcResult result = mockMvc.perform(get(URL_TODOS_ID, todoId))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andReturn();
+
+        JSONAssert.assertEquals(objectMapper.writeValueAsString(expectedResponse), result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT);
+    }
+
+    @Test
+    @DisplayName("Should return 404 when getting non-existent todo")
+    void shouldReturn404WhenGettingNonExistentTodo() throws Exception {
+        // Given
+        Long nonExistentId = 999L;
+
+        // When & Then
+        mockMvc.perform(get(URL_TODOS_ID, nonExistentId))
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    @DisplayName("Should update todo successfully")
+    @Sql("/sql/insert/insert-test-todos.sql")
+    void shouldUpdateTodoSuccessfully() throws Exception {
+        // Given
+        Long todoId = 1L;
+        TodoUpdateDto updateDto = TodoUpdateDto.builder()
+                .title("Updated Todo")
+                .description("Updated Description")
+                .build();
+
+        String expectedResponse = """
+                {
+                    "id": 1,
+                    "title": "Updated Todo",
+                    "description": "Updated Description",
+                    "completed": false,
+                    "userId": 1
+                }
+                """;
+
+        // When & Then
+        MvcResult result = mockMvc.perform(put(URL_TODOS_ID, todoId)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(updateDto)))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andReturn();
+
+        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT);
+    }
+
+    @Test
+    @DisplayName("Should return 404 when updating non-existent todo")
+    void shouldReturn404WhenUpdatingNonExistentTodo() throws Exception {
+        // Given
+        Long nonExistentId = 999L;
+        TodoUpdateDto updateDto = TodoUpdateDto.builder()
+                .title("Updated Todo")
+                .description("Updated Description")
+                .build();
+
+        // When & Then
+        mockMvc.perform(put(URL_TODOS_ID, nonExistentId)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectMapper.writeValueAsString(updateDto)))
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    @DisplayName("Should complete todo successfully")
+    @Sql("/sql/insert/insert-test-todos.sql")
+    void shouldCompleteTodoSuccessfully() throws Exception {
+        // Given
+        Long todoId = 1L;
+
+        // When & Then
+        mockMvc.perform(patch(URL_TODOS_ID + "/complete", todoId))
+                .andExpect(status().isNoContent());
+
+        // Verify todo is completed
+        String expectedResponse = """
+                {
+                    "id": 1,
+                    "title": "First Todo",
+                    "description": "First Description",
+                    "completed": true,
+                    "userId": 1
+                }
+                """;
+
+        MvcResult result = mockMvc.perform(get("/api/v1/todos/{id}", todoId))
+                .andExpect(status().isOk())
+                .andReturn();
+
+        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT);
+    }
+
+    @Test
+    @DisplayName("Should incomplete todo successfully")
+    @Sql("/sql/insert/insert-test-todos.sql")
+    void shouldIncompleteTodoSuccessfully() throws Exception {
+        // Given
+        Long todoId = 2L; // This is completed in test data
+
+        // When & Then
+        mockMvc.perform(patch("/api/v1/todos/{id}/incomplete", todoId))
+                .andExpect(status().isNoContent());
+
+        // Verify is incompleted
+        String expectedResponse = """
+                {
+                    "id": 2,
+                    "title": "Second Todo",
+                    "description": "Second Description",
+                    "completed": false,
+                    "userId": 1
+                }
+                """;
+
+        MvcResult result = mockMvc.perform(get("/api/v1/todos/{id}", todoId))
+                .andExpect(status().isOk())
+                .andReturn();
+
+        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT);
+    }
+
+    @Test
+    @DisplayName("Should return 404 when completing non-existent todo")
+    void shouldReturn404WhenCompletingNonExistentTodo() throws Exception {
+        // Given
+        Long nonExistentId = 999L;
+
+        // When & Then
+        mockMvc.perform(patch(URL_TODOS_ID_COMPLETE, nonExistentId))
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    @DisplayName("Should delete todo successfully")
+    @Sql("/sql/insert/insert-test-todos.sql")
+    void shouldDeleteTodoSuccessfully() throws Exception {
+        // Given
+        Long todoId = 1L;
+
+        // When & Then
+        mockMvc.perform(delete(URL_TODOS_ID, todoId))
+                .andExpect(status().isNoContent());
+
+        // Verify is deleted
+        mockMvc.perform(get(URL_TODOS_ID, todoId))
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    @DisplayName("Should return 404 when deleting non-existent todo")
+    void shouldReturn404WhenDeletingNonExistentTodo() throws Exception {
+        // Given
+        Long nonExistentId = 999L;
+
+        // When & Then
+        mockMvc.perform(delete(URL_TODOS_ID, nonExistentId))
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    @DisplayName("Should handle invalid request parameters gracefully")
+    void shouldHandleInvalidRequestParametersGracefully() throws Exception {
+        // When & Then
+        mockMvc.perform(get(URL_TODOS)
+                        .param("page", "-1")
+                        .param("size", "0")
+                        .param("userId", "1"))
+                .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    @DisplayName("Should return empty list when user has no todos")
+    void shouldReturnEmptyListWhenUserHasNoTodos() throws Exception {
+        // Given
+        Long userId = 999L; // User with no todos
+
+        String expectedResponse = """
+                {
+                    "todos": [],
+                    "totalElements": 0,
+                    "totalPages": 0,
+                    "currentPage": 0,
+                    "pageSize": 10
+                }
+                """;
+
+        // When & Then
+        MvcResult result = mockMvc.perform(get(URL_TODOS)
+                        .param("userId", String.valueOf(userId)))
+                .andExpect(status().isOk())
+                .andReturn();
+
+        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT);
+    }
+}
+
+
diff --git a/src/test/resources/application-test.yaml b/src/test/resources/application-test.yaml
new file mode 100644
index 00000000..6d0ea406
--- /dev/null
+++ b/src/test/resources/application-test.yaml
@@ -0,0 +1,6 @@
+server:
+  port: 8888
+
+spring:
+  application:
+    name: SpringToDo
\ No newline at end of file
diff --git a/src/test/resources/sql/insert/insert-completed-todos.sql b/src/test/resources/sql/insert/insert-completed-todos.sql
new file mode 100644
index 00000000..173e4772
--- /dev/null
+++ b/src/test/resources/sql/insert/insert-completed-todos.sql
@@ -0,0 +1,7 @@
+-- Insert completed todos for specific tests
+INSERT INTO todos (id, title, description, completed, user_id, created_at, updated_at) VALUES
+(1, 'Completed Todo 1', 'First completed todo', true, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+(2, 'Completed Todo 2', 'Second completed todo', true, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+(3, 'Completed Todo 3', 'Third completed todo', true, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+
+ALTER SEQUENCE todos_id_seq RESTART WITH 4;
diff --git a/src/test/resources/sql/insert/insert-large-dataset.sql b/src/test/resources/sql/insert/insert-large-dataset.sql
new file mode 100644
index 00000000..ef04e0ce
--- /dev/null
+++ b/src/test/resources/sql/insert/insert-large-dataset.sql
@@ -0,0 +1,10 @@
+-- Insert large dataset for pagination tests
+INSERT INTO todos (title, description, completed, user_id, created_at, updated_at)
+SELECT
+    'Todo ' || generate_series,
+    'Description for todo ' || generate_series,
+    (generate_series % 2 = 0),
+    1,
+    CURRENT_TIMESTAMP,
+    CURRENT_TIMESTAMP
+FROM generate_series(1, 25);
diff --git a/src/test/resources/sql/insert/insert-test-todos.sql b/src/test/resources/sql/insert/insert-test-todos.sql
new file mode 100644
index 00000000..18f5164d
--- /dev/null
+++ b/src/test/resources/sql/insert/insert-test-todos.sql
@@ -0,0 +1,5 @@
+INSERT INTO todos (id, title, description, completed, user_id, created_at, updated_at) VALUES
+(1, 'First Todo', 'First Description', false, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+(2, 'Second Todo', 'Second Description', true, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+(3, 'Third Todo', 'Third Description', false, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
+(4, 'Fourth Todo', 'Fourth Description', false, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
diff --git a/src/test/resources/sql/insert/insert-test-users.sql b/src/test/resources/sql/insert/insert-test-users.sql
new file mode 100644
index 00000000..a3c10a7f
--- /dev/null
+++ b/src/test/resources/sql/insert/insert-test-users.sql
@@ -0,0 +1,5 @@
+INSERT INTO users (id, username, password, email, created_at, updated_at, enabled)
+VALUES (1, 'ranob', '123456', 'ranob@gmail.com', '2022-01-01 00:00:00', '2022-01-01 00:00:00', true);
+
+INSERT INTO users (id, username, password, email, created_at, updated_at, enabled)
+VALUES (2, 'john doe', '123456', 'user1@gmail.com', '2022-01-01 00:00:00', '2022-01-01 00:00:00', true);
\ No newline at end of file
diff --git a/src/test/resources/sql/truncate/truncate-all.sql b/src/test/resources/sql/truncate/truncate-all.sql
new file mode 100644
index 00000000..87d93e89
--- /dev/null
+++ b/src/test/resources/sql/truncate/truncate-all.sql
@@ -0,0 +1,3 @@
+TRUNCATE TABLE tags CASCADE;
+TRUNCATE TABLE todos CASCADE;
+TRUNCATE TABLE users CASCADE;
diff --git a/src/test/resources/sql/truncate/truncate-tags.sql b/src/test/resources/sql/truncate/truncate-tags.sql
new file mode 100644
index 00000000..d6071bce
--- /dev/null
+++ b/src/test/resources/sql/truncate/truncate-tags.sql
@@ -0,0 +1,2 @@
+TRUNCATE TABLE tags;
+ALTER SEQUENCE tags_id_seq RESTART WITH 1;
diff --git a/src/test/resources/sql/truncate/truncate-todos.sql b/src/test/resources/sql/truncate/truncate-todos.sql
new file mode 100644
index 00000000..4aa18314
--- /dev/null
+++ b/src/test/resources/sql/truncate/truncate-todos.sql
@@ -0,0 +1,2 @@
+TRUNCATE TABLE todos;
+ALTER SEQUENCE todos_id_seq RESTART WITH 1;
diff --git a/src/test/resources/sql/truncate/truncate-users.sql b/src/test/resources/sql/truncate/truncate-users.sql
new file mode 100644
index 00000000..0ae548ec
--- /dev/null
+++ b/src/test/resources/sql/truncate/truncate-users.sql
@@ -0,0 +1,2 @@
+TRUNCATE TABLE users;
+ALTER SEQUENCE users_id_seq RESTART WITH 1;

From fe865e3ab4e65124e793ea19ed89bb00f1197e8a Mon Sep 17 00:00:00 2001
From: GitLobanov <lobanovgithub@gmail.com>
Date: Wed, 25 Jun 2025 14:42:57 +0300
Subject: [PATCH 5/7] feat: Add Redis configuration and metrics aspect, fix
 tests

---
 README.md                                     |  27 +-
 pom.xml                                       |  21 +-
 .../com/emobile/springtodo/api/TodoApi.java   |   9 +-
 .../springtodo/aspect/TodoMetricsAspect.java  | 123 +++++++++
 .../springtodo/config/RedisConfig.java        |  45 ++++
 .../springtodo/model/dto/TodoCreateDto.java   |   1 +
 .../springtodo/repository/TodoRepository.java |   3 +-
 .../repository/impl/TodoRepositoryJdbc.java   |  13 +-
 .../repository/sql/TodoSqlUtil.java           |   3 +-
 .../springtodo/service/TodoService.java       |   2 +-
 .../service/impl/TodoServiceImpl.java         |  33 ++-
 src/main/resources/application.yaml           |   4 +
 .../springtodo/it/TodoControllerIT.java       | 242 +++++++-----------
 13 files changed, 328 insertions(+), 198 deletions(-)
 create mode 100644 src/main/java/com/emobile/springtodo/aspect/TodoMetricsAspect.java
 create mode 100644 src/main/java/com/emobile/springtodo/config/RedisConfig.java

diff --git a/README.md b/README.md
index f427c6f5..dc11619f 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,7 @@
 ## Модель данных Задачи (TODO item):
 
 *   `id` (Long, Primary Key, автоинкремент)
+*   `userId` (Long, Foreign Key, не null, ссылка на пользователя)
 *   `title` (String, не null, макс. длина, например, 255)
 *   `description` (String, опционально, text)
 *   `completed` (boolean, по умолчанию false)
@@ -157,28 +158,4 @@
     *   **Эндпоинт:** `DELETE /api/v1/todos/{id}`
     *   **Вход (path variable):** `id` задачи.
     *   **Выход:** Статус 204 No Content или 404.
-    *   **Действия:** Удаление задачи из БД.
-
-### Инновационные функции (предложения для расширения):
-
-1.  **Установка дедлайнов для задач и фильтрация по ним:**
-    *   **Изменение модели:** Добавить поле `dueDate` (Date или Timestamp) в задачу.
-    *   **Обновление DTO:** Добавить `dueDate` в DTO для создания и обновления.
-    *   **Новый эндпоинт/фильтр:**
-        *   `GET /api/v1/todos?isOverdue=true` - для получения всех просроченных задач.
-        *   `GET /api/v1/todos?dueBefore=YYYY-MM-DD` - для задач, которые нужно выполнить до указанной даты.
-    *   **Логика:** При создании/обновлении задачи позволить указывать дедлайн. Реализовать логику фильтрации.
-    *   **Кастомная метрика Actuator:** "Количество просроченных задач".
-
-2.  **Тегирование задач и фильтрация по тегам:**
-    *   **Изменение модели:**
-        *   Создать отдельную таблицу `tags` (`id`, `name`).
-        *   Создать связующую таблицу `todo_tags` (`todo_id`, `tag_id`).
-    *   **Обновление DTO:**
-        *   В DTO задачи (`TaskDto`) добавить поле `List<String> tags` или `List<TagDto> tags`.
-        *   При создании/обновлении задачи принимать список тегов. Если тега нет, он создается.
-    *   **Новые эндпоинты/фильтры:**
-        *   `GET /api/v1/todos?tag=tagName1&tag=tagName2` - получить задачи, содержащие все указанные теги.
-        *   (Опционально) `GET /api/v1/tags` - получить список всех существующих тегов.
-    *   **Логика:** Реализовать CRUD для тегов (неявно при добавлении к задачам, или явно через отдельные эндпоинты). Реализовать логику фильтрации задач по тегам.
-    *   **Кеширование:** Список всех тегов (`/api/v1/tags`) может быть хорошим кандидатом для кеширования.
+    *   **Действия:** Удаление задачи из БД.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 74cabc9d..16f06906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,15 +39,24 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-data-jpa</artifactId>-->
-<!--        </dependency>-->
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -110,6 +119,10 @@
             <artifactId>postgresql</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/com/emobile/springtodo/api/TodoApi.java b/src/main/java/com/emobile/springtodo/api/TodoApi.java
index bdd1aec5..25e87a3d 100644
--- a/src/main/java/com/emobile/springtodo/api/TodoApi.java
+++ b/src/main/java/com/emobile/springtodo/api/TodoApi.java
@@ -6,6 +6,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import static org.springframework.http.HttpStatus.CREATED;
+import static org.springframework.http.HttpStatus.NO_CONTENT;
 
 
 @RequestMapping("/api/v1/todos")
@@ -23,7 +24,7 @@ TodoDto updateTodo(@Parameter(description = "ID of the task to update") @PathVar
     TodoDto getTodoById(@Parameter(description = "ID of the task to retrieve") @PathVariable (value = "id") Long id);
 
     @DeleteMapping("/{id}")
-    @ResponseStatus(org.springframework.http.HttpStatus.NO_CONTENT)
+    @ResponseStatus(NO_CONTENT)
     void deleteTodoById(@Parameter(description = "ID of the TODO item to delete") @PathVariable Long id);
 
     @GetMapping("/user/{userId}")
@@ -32,10 +33,12 @@ TodoListResponseDto getAllTodosByUserId(
             Long userId
     );
 
-    @PutMapping("/{id}/complete")
+    @PatchMapping("/complete/{id}")
+    @ResponseStatus(NO_CONTENT)
     void completeTodo(@Parameter(description = "ID of the task to complete") @PathVariable Long id);
 
-    @PutMapping("/{id}/incomplete")
+    @PatchMapping("/incomplete/{id}")
+    @ResponseStatus(NO_CONTENT)
     void incompleteTodo(@Parameter(description = "ID of the task to mark incomplete") @PathVariable Long id);
 
 }
diff --git a/src/main/java/com/emobile/springtodo/aspect/TodoMetricsAspect.java b/src/main/java/com/emobile/springtodo/aspect/TodoMetricsAspect.java
new file mode 100644
index 00000000..ce0c2e38
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/aspect/TodoMetricsAspect.java
@@ -0,0 +1,123 @@
+package com.emobile.springtodo.aspect;
+
+import com.emobile.springtodo.model.entity.*;
+import com.emobile.springtodo.repository.*;
+import io.micrometer.core.instrument.*;
+import io.micrometer.core.instrument.Timer;
+import lombok.extern.slf4j.*;
+import org.aspectj.lang.*;
+import org.aspectj.lang.annotation.*;
+import org.springframework.stereotype.*;
+
+import java.time.*;
+import java.util.*;
+
+@Aspect
+@Component
+@Slf4j
+public class TodoMetricsAspect {
+
+    private final MeterRegistry meterRegistry;
+    private final TodoRepository todoRepository;
+
+    private final Counter todosCreatedCounter;
+    private final Counter todosCompletedCounter;
+    private final Counter todosDeletedCounter;
+    private final Counter tagsAppendedCounter;
+
+    public TodoMetricsAspect(MeterRegistry meterRegistry, TodoRepository todoRepository) {
+        this.meterRegistry = meterRegistry;
+        this.todoRepository = todoRepository;
+
+        this.todosCreatedCounter = Counter.builder("todos.created.total")
+                .description("Total number of created todos")
+                .register(meterRegistry);
+
+        this.todosCompletedCounter = Counter.builder("todos.completed.total")
+                .description("Total number of completed todos")
+                .register(meterRegistry);
+
+        this.todosDeletedCounter = Counter.builder("todos.deleted.total")
+                .description("Total number of deleted todos")
+                .register(meterRegistry);
+
+        this.tagsAppendedCounter = Counter.builder("todos.tags.appended.total")
+                .description("Total number of tags appended to todos")
+                .register(meterRegistry);
+
+        Gauge.builder("todos.active.count", todoRepository, repo -> repo.countByCompleted(false))
+                .description("Current number of active (incomplete) todos")
+                .register(meterRegistry);
+
+        Gauge.builder("todos.completed.count", todoRepository, repo -> repo.countByCompleted(true))
+                .description("Current number of completed todos")
+                .register(meterRegistry);
+    }
+
+    // --- Определения срезов (Pointcuts) ---
+
+    @Pointcut("execution(* com.emobile.springtodo.service.impl.TodoServiceImpl.createTodo(..))")
+    public void createTodoPointcut() {}
+
+    @Pointcut("execution(* com.emobile.springtodo.service.impl.TodoServiceImpl.completeTodo(..))")
+    public void completeTodoPointcut() {}
+
+    @Pointcut("execution(* com.emobile.springtodo.service.impl.TodoServiceImpl.deleteTodo(..))")
+    public void deleteTodoPointcut() {}
+
+    @Pointcut("execution(* com.emobile.springtodo.service.impl.TodoServiceImpl.appendTagTodo(..))")
+    public void appendTagTodoPointcut() {}
+
+
+    // --- Советы (Advices) ---
+
+    @AfterReturning("createTodoPointcut()")
+    public void afterTodoCreated() {
+        todosCreatedCounter.increment();
+    }
+
+    @AfterReturning("deleteTodoPointcut()")
+    public void afterTodoDeleted() {
+        todosDeletedCounter.increment();
+    }
+
+    @AfterReturning("appendTagTodoPointcut()")
+    public void afterTagAppended() {
+        tagsAppendedCounter.increment();
+    }
+
+    /**
+     * Самая интересная метрика: измеряем время от создания до завершения задачи.
+     * Используем @Around, чтобы получить доступ к аргументам метода и выполнить
+     * действия до и после его вызова.
+     */
+    @Around("completeTodoPointcut()")
+    public Object measureCompletionTime(ProceedingJoinPoint joinPoint) throws Throwable {
+        Long todoId = (Long) joinPoint.getArgs()[0];
+
+        // Получаем задачу ДО ее завершения, чтобы узнать время создания
+        Optional<Todo> todoOptional = todoRepository.findByID(todoId);
+
+        // Выполняем оригинальный метод completeTodo()
+        Object result = joinPoint.proceed();
+
+        // ПОСЛЕ успешного выполнения метода...
+        if (todoOptional.isPresent()) {
+            Todo todo = todoOptional.get();
+            if (todo.getCreatedAt() != null) {
+                // Увеличиваем счетчик завершенных задач
+                todosCompletedCounter.increment();
+
+                // Рассчитываем и записываем время выполнения
+                Duration timeToComplete = Duration.between(todo.getCreatedAt(), LocalDateTime.now());
+                Timer.builder("todos.completion.time")
+                        .description("Time taken to complete a todo from its creation")
+                        .register(meterRegistry)
+                        .record(timeToComplete);
+                log.info("Todo {} completed in {}", todoId, timeToComplete);
+            }
+        }
+
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/config/RedisConfig.java b/src/main/java/com/emobile/springtodo/config/RedisConfig.java
new file mode 100644
index 00000000..bd71d208
--- /dev/null
+++ b/src/main/java/com/emobile/springtodo/config/RedisConfig.java
@@ -0,0 +1,45 @@
+package com.emobile.springtodo.config;
+
+import com.emobile.springtodo.model.dto.*;
+import org.springframework.boot.autoconfigure.cache.*;
+import org.springframework.cache.*;
+import org.springframework.context.annotation.*;
+
+import java.time.*;
+import org.springframework.data.redis.cache.*;
+import org.springframework.data.redis.connection.*;
+import org.springframework.data.redis.connection.lettuce.*;
+import org.springframework.data.redis.serializer.*;
+
+@Configuration
+public class RedisConfig {
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        return new LettuceConnectionFactory("localhost", 6379);
+    }
+
+    @Bean
+    public CacheManager cacheManager(RedisConnectionFactory redisConnectionFactory) {
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofMinutes(10))
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair
+                        .fromSerializer(new Jackson2JsonRedisSerializer<>(TodoDto.class)))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair
+                        .fromSerializer(new Jackson2JsonRedisSerializer<>(TodoListResponseDto.class)));
+
+        return RedisCacheManager.builder(redisConnectionFactory)
+                .cacheDefaults(config)
+                .build();
+    }
+
+    @Bean
+    public RedisCacheManagerBuilderCustomizer redisCacheManagerBuilderCustomizer() {
+        return builder -> builder
+                .withCacheConfiguration("todo",
+                        RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofMinutes(30)))
+                .withCacheConfiguration("todoList",
+                        RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofMinutes(60)));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
index d7cbc1ee..e6c2678f 100644
--- a/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
+++ b/src/main/java/com/emobile/springtodo/model/dto/TodoCreateDto.java
@@ -5,6 +5,7 @@
 
 @Builder
 public record TodoCreateDto(
+        @NotNull
         Long userId,
         @NotBlank
         String title,
diff --git a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
index 357d630e..2b7cc000 100644
--- a/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
+++ b/src/main/java/com/emobile/springtodo/repository/TodoRepository.java
@@ -14,7 +14,8 @@ public interface TodoRepository {
     Optional<Todo> findByID(Long id);
     List<Todo> findAll();
     List<Todo> findAllByUserId(long userId);
-    List<Todo> findAllByTagId(int limit, int offset, long tagId);
+    List<Todo> findAllByTagId(long tagId);
     long count();
     boolean existsById(Long id);
+    long countByCompleted(boolean completed);
 }
diff --git a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
index a6467b3f..b5a2bce4 100644
--- a/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
+++ b/src/main/java/com/emobile/springtodo/repository/impl/TodoRepositoryJdbc.java
@@ -16,6 +16,7 @@
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_DELETE_BY_ID;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_INSERT_ALL;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_ALL;
+import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_COMPLETED;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_ID;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_BY_USER_ID;
 import static com.emobile.springtodo.repository.sql.TodoSqlUtil.TODO_SELECT_EXIST_BY_ID;
@@ -143,13 +144,11 @@ public List<Todo> findAllByUserId(long userId) {
     }
 
     @Override
-    public List<Todo> findAllByTagId(int limit, int offset, long tagId) {
+    public List<Todo> findAllByTagId(long tagId) {
         return jdbcTemplate.query(
                 TODO_SELECT_BY_USER_ID,
                 new TodoRowMapper(),
-                tagId,
-                limit,
-                offset
+                tagId
         );
     }
 
@@ -169,6 +168,12 @@ public boolean existsById(Long id) {
         );
     }
 
+    @Override
+    public long countByCompleted(boolean completed) {
+        Long count = jdbcTemplate.queryForObject(TODO_SELECT_BY_COMPLETED, Long.class, completed);
+        return (count != null) ? count : 0L;
+    }
+
     /**
      * A reusable RowMapper to map a database row to a Todo object.
      */
diff --git a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
index 56cf28a8..b3168e4b 100644
--- a/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
+++ b/src/main/java/com/emobile/springtodo/repository/sql/TodoSqlUtil.java
@@ -1,6 +1,5 @@
 package com.emobile.springtodo.repository.sql;
 
-import liquibase.util.*;
 import lombok.experimental.*;
 
 @UtilityClass
@@ -31,8 +30,10 @@ public class TodoSqlUtil {
 
     public static final String TODO_SELECT_BY_ID = String.format(WITH_TAGS_SELECT, "WHERE todos.id = ?");
     public static final String TODO_SELECT_BY_USER_ID = String.format(WITH_TAGS_SELECT, "WHERE user_id = ?");
+    public static final String TODO_SELECT_BY_TAG_ID = String.format(WITH_TAGS_SELECT, "WHERE tags.id = ?");
     public static final String TODO_SELECT_ALL = String.format(WITH_TAGS_SELECT, "");
     public static final String TODO_SELECT_EXIST_BY_ID = "SELECT EXISTS(SELECT 1 FROM todos WHERE id = ?)";
+    public static final String TODO_SELECT_BY_COMPLETED = "SELECT COUNT(*) FROM todos WHERE completed = ?";
 
     public static final String TODO_INSERT_ALL = """
                 INSERT INTO todos (user_id, title, description, completed, created_at, updated_at, due_date)
diff --git a/src/main/java/com/emobile/springtodo/service/TodoService.java b/src/main/java/com/emobile/springtodo/service/TodoService.java
index 8febacad..133f4ee5 100644
--- a/src/main/java/com/emobile/springtodo/service/TodoService.java
+++ b/src/main/java/com/emobile/springtodo/service/TodoService.java
@@ -18,5 +18,5 @@ public interface TodoService {
     void removeTagTodo (Long todoId, Long tagId);
     TodoDto getTodoById (Long id);
     TodoListResponseDto getAllTodosByUserId (long userId);
-    TodoListResponseDto getAllTodosByTagId (int page, int size, long tagId);
+    TodoListResponseDto getAllTodosByTagId (long tagId);
 }
diff --git a/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
index 6f11545f..2576a359 100644
--- a/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
+++ b/src/main/java/com/emobile/springtodo/service/impl/TodoServiceImpl.java
@@ -7,6 +7,7 @@
 import com.emobile.springtodo.repository.*;
 import com.emobile.springtodo.service.*;
 import lombok.*;
+import org.springframework.cache.annotation.*;
 import org.springframework.stereotype.*;
 
 import java.util.*;
@@ -18,29 +19,27 @@ public class TodoServiceImpl implements TodoService {
     private final TodoRepository todoRepository;
     private final TagRepository tagRepository;
     private final TodoMapper todoMapper;
-    // TODO fix in next versions
-    private final Long USE_FAKE_USER_ID = 1L;
 
     @Override
     public List<TodoDto> getTodos() {
-        return List.of();
+        return todoRepository.findAll()
+                .stream().map(todoMapper::toDto)
+                .toList();
     }
 
     @Override
+    @CacheEvict(value = "todoList", key = "#createTodoDto.userId")
     public TodoDto createTodo(TodoCreateDto createTodoDto) {
         Todo entity = todoMapper.toEntity(createTodoDto);
-        entity.setUserId(USE_FAKE_USER_ID);
         return todoRepository.save(entity)
                 .map(todoMapper::toDto)
                 .orElseThrow(() -> new IllegalArgumentException("Error in saving"));
     }
 
     @Override
+    @CacheEvict(value = "todo", key = "#id")
     public TodoDto updateTodo(Long id, TodoUpdateDto requestDto) {
-        if (!todoRepository.existsById(id)) {
-            throw new TodoNotFoundException("Todo not found with id: " + id);
-        }
-
+        validateTodoById(id);
         return todoRepository.update(todoMapper.toEntity(requestDto, id))
                 .map(todoMapper::toDto)
                 .orElseThrow(() -> new TodoRepositoryException("Error in updating"));
@@ -48,16 +47,19 @@ public TodoDto updateTodo(Long id, TodoUpdateDto requestDto) {
 
     @Override
     public void deleteTodo(Long id) {
+        validateTodoById(id);
         todoRepository.deleteByID(id);
     }
 
     @Override
     public void completeTodo(Long id) {
+        validateTodoById(id);
         todoRepository.completeById(id);
     }
 
     @Override
     public void incompleteTodo(Long id) {
+        validateTodoById(id);
         todoRepository.incompleteById(id);
     }
 
@@ -72,6 +74,7 @@ public void removeTagTodo(Long todoId, Long tagId) {
     }
 
     @Override
+    @Cacheable(value = "todo", key = "#id")
     public TodoDto getTodoById(Long id) {
         return todoRepository.findByID(id)
                 .map(todoMapper::toDto)
@@ -79,6 +82,7 @@ public TodoDto getTodoById(Long id) {
     }
 
     @Override
+    @Cacheable(value = "todoList", key = "#userId")
     public TodoListResponseDto getAllTodosByUserId(long userId) {
         List<Todo> allByUserId = todoRepository.findAllByUserId(userId);
         List<TodoDto> list = allByUserId.stream()
@@ -89,7 +93,16 @@ public TodoListResponseDto getAllTodosByUserId(long userId) {
     }
 
     @Override
-    public TodoListResponseDto getAllTodosByTagId(int page, int size, long tagId) {
-        return null;
+    @Cacheable(value = "todoList", key = "#tagId")
+    public TodoListResponseDto getAllTodosByTagId(long tagId) {
+        List<TodoDto> list = todoRepository.findAllByTagId(tagId)
+                .stream().map(todoMapper::toDto).toList();
+        return new TodoListResponseDto (list, list.size());
+    }
+
+    void validateTodoById (Long id) {
+        if (!todoRepository.existsById(id)) {
+            throw new TodoNotFoundException("Todo not found with id: " + id);
+        }
     }
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index ee216b06..09ba9914 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -10,6 +10,10 @@ spring:
     username: local
     password: local
     driver-class-name: org.postgresql.Driver
+  data:
+    redis:
+      host: localhost
+      port: 6379
   liquibase:
     enabled: true
     change-log: classpath:/db/changelog/db.changelog-master.xml
diff --git a/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java b/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
index 50cf2f58..062c825b 100644
--- a/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
+++ b/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
@@ -13,11 +13,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.*;
-import org.springframework.test.context.jdbc.*;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.transaction.annotation.*;
-import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.containers.*;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
@@ -28,13 +27,9 @@
 
 
 @SpringBootTest
-//@AutoConfigureWebMvc
 @AutoConfigureMockMvc
 @Testcontainers
-//@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-//@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 @Transactional
-//@Sql(value = "/sql/truncate/truncate-all.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
 class TodoControllerIT {
 
     @Container
@@ -44,18 +39,18 @@ class TodoControllerIT {
             .withPassword("test")
             .withReuse(true);
 
-//    @Container
-//    static GenericContainer<?> redis = new GenericContainer<>("redis:7-alpine")
-//            .withExposedPorts(6379)
-//            .withReuse(true);
+    @Container
+    static GenericContainer<?> redis = new GenericContainer<>("redis:7-alpine")
+            .withExposedPorts(6379)
+            .withReuse(true);
 
     @DynamicPropertySource
     static void configureProperties(DynamicPropertyRegistry registry) {
         registry.add("spring.datasource.url", postgres::getJdbcUrl);
         registry.add("spring.datasource.username", postgres::getUsername);
         registry.add("spring.datasource.password", postgres::getPassword);
-        // registry.add("spring.redis.host", redis::getHost);
-        // registry.add("spring.redis.port", () -> redis.getMappedPort(6379));
+         registry.add("spring.data.redis.host", redis::getHost);
+         registry.add("spring.data.redis.port", () -> redis.getMappedPort(6379));
     }
 
     @Autowired
@@ -68,9 +63,9 @@ static void configureProperties(DynamicPropertyRegistry registry) {
     private ObjectMapper objectMapper;
 
     private static final String URL_TODOS = "/api/v1/todos";
-    private static final String URL_TODOS_ID = URL_TODOS + "/{id}";
-    private static final String URL_TODOS_ID_COMPLETE = URL_TODOS_ID + "/complete";
-    private static final String URL_TODOS_ID_INCOMPLETE = URL_TODOS_ID + "/incomplete";
+    private static final String URL_TODOS_USER = URL_TODOS + "/user/";
+    private static final String URL_TODOS_COMPLETE = URL_TODOS + "/complete";
+    private static final String URL_TODOS_INCOMPLETE = URL_TODOS + "/incomplete";
 
     private static Long USER_ID;
     private static Long USER_ID_2;
@@ -153,49 +148,31 @@ void shouldReturnValidationErrorWhenCreatingTodoWithInvalidData() throws Excepti
 
     @Test
     @DisplayName("Should get all todos by user ID with pagination")
-    @Sql("/sql/insert/insert-test-todos.sql")
     void shouldGetAllTodosByUserIdWithPagination() throws Exception {
         // Given
-        Long userId = 1L;
-        int page = 0;
-        int size = 2;
-
-        String expectedResponse = """
-                {
-                    "todos": [
-                        {
-                            "id": 1,
-                            "title": "First Todo",
-                            "description": "First Description",
-                            "completed": false,
-                            "userId": 1
-                        },
-                        {
-                            "id": 2,
-                            "title": "Second Todo",
-                            "description": "Second Description",
-                            "completed": true,
-                            "userId": 1
-                        }
-                    ],
-                    "totalElements": 3,
-                    "totalPages": 2,
-                    "currentPage": 0,
-                    "pageSize": 2
-                }
-                """;
+        Todo todo1 = Todo.builder()
+                .userId(USER_ID)
+                .id(1L)
+                .completed(true)
+                .description("Second Description")
+                .title("Second Todo")
+                .build();
+
+        Todo todo2 = Todo.builder()
+                .userId(USER_ID)
+                .id(1L)
+                .completed(true)
+                .description("Second Description")
+                .title("Second Todo")
+                .build();
+
+        todoRepository.save(todo1);
+        todoRepository.save(todo2);
 
         // When & Then
-        MvcResult result = mockMvc.perform(get(URL_TODOS)
-                        .param("page", String.valueOf(page))
-                        .param("size", String.valueOf(size))
-                        .param("userId", String.valueOf(userId)))
+        mockMvc.perform(get(URL_TODOS_USER + "/" +  USER_ID))
                 .andExpect(status().isOk())
-                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
-                .andReturn();
-
-        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
-                JSONCompareMode.LENIENT);
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON));
     }
 
     @Test
@@ -223,7 +200,7 @@ void shouldGetTodoByIdSuccessfully() throws Exception {
                 .build();
 
         // When & Then
-        MvcResult result = mockMvc.perform(get(URL_TODOS_ID, todoId))
+        MvcResult result = mockMvc.perform(get(URL_TODOS + "/" + todoId))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON))
                 .andReturn();
@@ -239,40 +216,44 @@ void shouldReturn404WhenGettingNonExistentTodo() throws Exception {
         Long nonExistentId = 999L;
 
         // When & Then
-        mockMvc.perform(get(URL_TODOS_ID, nonExistentId))
+        mockMvc.perform(get(URL_TODOS + "/" + nonExistentId))
                 .andExpect(status().isNotFound());
     }
 
     @Test
     @DisplayName("Should update todo successfully")
-    @Sql("/sql/insert/insert-test-todos.sql")
     void shouldUpdateTodoSuccessfully() throws Exception {
         // Given
-        Long todoId = 1L;
+        Todo todo = Todo.builder()
+                .userId(USER_ID)
+                .completed(true)
+                .description("Second Description")
+                .title("Second Todo")
+                .build();
+
+        Todo todoSaved = todoRepository.save(todo).orElseThrow();
         TodoUpdateDto updateDto = TodoUpdateDto.builder()
                 .title("Updated Todo")
                 .description("Updated Description")
                 .build();
 
-        String expectedResponse = """
-                {
-                    "id": 1,
-                    "title": "Updated Todo",
-                    "description": "Updated Description",
-                    "completed": false,
-                    "userId": 1
-                }
-                """;
+        TodoDto dto = TodoDto.builder()
+                .id(todoSaved.getId())
+                .tags(null)
+                .title("Updated Todo")
+                .description("Updated Description")
+                .completed(false)
+                .build();
 
         // When & Then
-        MvcResult result = mockMvc.perform(put(URL_TODOS_ID, todoId)
+        MvcResult result = mockMvc.perform(put(URL_TODOS + "/" + todoSaved.getId())
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(updateDto)))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON))
                 .andReturn();
 
-        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
+        JSONAssert.assertEquals(objectMapper.writeValueAsString(dto), result.getResponse().getContentAsString(),
                 JSONCompareMode.LENIENT);
     }
 
@@ -287,7 +268,7 @@ void shouldReturn404WhenUpdatingNonExistentTodo() throws Exception {
                 .build();
 
         // When & Then
-        mockMvc.perform(put(URL_TODOS_ID, nonExistentId)
+        mockMvc.perform(put(URL_TODOS + "/" + nonExistentId)
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(objectMapper.writeValueAsString(updateDto)))
                 .andExpect(status().isNotFound());
@@ -295,62 +276,54 @@ void shouldReturn404WhenUpdatingNonExistentTodo() throws Exception {
 
     @Test
     @DisplayName("Should complete todo successfully")
-    @Sql("/sql/insert/insert-test-todos.sql")
     void shouldCompleteTodoSuccessfully() throws Exception {
         // Given
-        Long todoId = 1L;
+        Todo todo = Todo.builder()
+                .userId(USER_ID)
+                .completed(false)
+                .description("Second Description")
+                .title("Second Todo")
+                .build();
+
+        Todo todoSaved = todoRepository.save(todo).orElseThrow();
+        long todoId = todoSaved.getId();
+
+        TodoDto dto = TodoDto.builder()
+                .id(todoSaved.getId())
+                .tags(null)
+                .description("Second Description")
+                .title("Second Todo")
+                .completed(true)
+                .build();
 
         // When & Then
-        mockMvc.perform(patch(URL_TODOS_ID + "/complete", todoId))
+        mockMvc.perform(patch(URL_TODOS_COMPLETE + "/" + todoId))
                 .andExpect(status().isNoContent());
 
         // Verify todo is completed
-        String expectedResponse = """
-                {
-                    "id": 1,
-                    "title": "First Todo",
-                    "description": "First Description",
-                    "completed": true,
-                    "userId": 1
-                }
-                """;
-
-        MvcResult result = mockMvc.perform(get("/api/v1/todos/{id}", todoId))
+        MvcResult result = mockMvc.perform(get(URL_TODOS + "/" + todoId))
                 .andExpect(status().isOk())
                 .andReturn();
 
-        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
+        JSONAssert.assertEquals(objectMapper.writeValueAsString(dto), result.getResponse().getContentAsString(),
                 JSONCompareMode.LENIENT);
     }
 
     @Test
     @DisplayName("Should incomplete todo successfully")
-    @Sql("/sql/insert/insert-test-todos.sql")
     void shouldIncompleteTodoSuccessfully() throws Exception {
         // Given
-        Long todoId = 2L; // This is completed in test data
-
-        // When & Then
-        mockMvc.perform(patch("/api/v1/todos/{id}/incomplete", todoId))
-                .andExpect(status().isNoContent());
+        Todo todo = Todo.builder()
+                .userId(USER_ID)
+                .completed(true)
+                .description("Second Description")
+                .title("Second Todo")
+                .build();
 
-        // Verify is incompleted
-        String expectedResponse = """
-                {
-                    "id": 2,
-                    "title": "Second Todo",
-                    "description": "Second Description",
-                    "completed": false,
-                    "userId": 1
-                }
-                """;
-
-        MvcResult result = mockMvc.perform(get("/api/v1/todos/{id}", todoId))
-                .andExpect(status().isOk())
-                .andReturn();
+        Todo todoSaved = todoRepository.save(todo).orElseThrow();
 
-        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
-                JSONCompareMode.LENIENT);
+        mockMvc.perform(patch(URL_TODOS_INCOMPLETE + "/" + todoSaved.getId()))
+                .andExpect(status().isNoContent());
     }
 
     @Test
@@ -360,23 +333,31 @@ void shouldReturn404WhenCompletingNonExistentTodo() throws Exception {
         Long nonExistentId = 999L;
 
         // When & Then
-        mockMvc.perform(patch(URL_TODOS_ID_COMPLETE, nonExistentId))
+        mockMvc.perform(patch(URL_TODOS_INCOMPLETE + "/" + nonExistentId))
                 .andExpect(status().isNotFound());
     }
 
     @Test
     @DisplayName("Should delete todo successfully")
-    @Sql("/sql/insert/insert-test-todos.sql")
     void shouldDeleteTodoSuccessfully() throws Exception {
         // Given
-        Long todoId = 1L;
+        Todo todo = Todo.builder()
+                .userId(USER_ID)
+                .completed(true)
+                .description("Second Description")
+                .title("Second Todo")
+                .build();
+
+        Todo todoSaved = todoRepository.save(todo).orElseThrow();
+        Long todoId = todoSaved.getId();
+
 
         // When & Then
-        mockMvc.perform(delete(URL_TODOS_ID, todoId))
+        mockMvc.perform(delete(URL_TODOS + "/" + todoId))
                 .andExpect(status().isNoContent());
 
         // Verify is deleted
-        mockMvc.perform(get(URL_TODOS_ID, todoId))
+        mockMvc.perform(get(URL_TODOS + "/" + todoId))
                 .andExpect(status().isNotFound());
     }
 
@@ -387,46 +368,9 @@ void shouldReturn404WhenDeletingNonExistentTodo() throws Exception {
         Long nonExistentId = 999L;
 
         // When & Then
-        mockMvc.perform(delete(URL_TODOS_ID, nonExistentId))
+        mockMvc.perform(delete(URL_TODOS + "/" + nonExistentId))
                 .andExpect(status().isNotFound());
     }
-
-    @Test
-    @DisplayName("Should handle invalid request parameters gracefully")
-    void shouldHandleInvalidRequestParametersGracefully() throws Exception {
-        // When & Then
-        mockMvc.perform(get(URL_TODOS)
-                        .param("page", "-1")
-                        .param("size", "0")
-                        .param("userId", "1"))
-                .andExpect(status().isBadRequest());
-    }
-
-    @Test
-    @DisplayName("Should return empty list when user has no todos")
-    void shouldReturnEmptyListWhenUserHasNoTodos() throws Exception {
-        // Given
-        Long userId = 999L; // User with no todos
-
-        String expectedResponse = """
-                {
-                    "todos": [],
-                    "totalElements": 0,
-                    "totalPages": 0,
-                    "currentPage": 0,
-                    "pageSize": 10
-                }
-                """;
-
-        // When & Then
-        MvcResult result = mockMvc.perform(get(URL_TODOS)
-                        .param("userId", String.valueOf(userId)))
-                .andExpect(status().isOk())
-                .andReturn();
-
-        JSONAssert.assertEquals(expectedResponse, result.getResponse().getContentAsString(),
-                JSONCompareMode.LENIENT);
-    }
 }
 
 

From 5778c4ed984a7e78b6ddbf3ef733fccc985a851e Mon Sep 17 00:00:00 2001
From: GitLobanov <lobanovgithub@gmail.com>
Date: Mon, 30 Jun 2025 10:51:10 +0300
Subject: [PATCH 6/7] refactor(config): update RedisConfig to use properties
 for host and port, add management endpoints exposure configuration

---
 .../java/com/emobile/springtodo/config/RedisConfig.java   | 8 +++++++-
 src/main/resources/application.yaml                       | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/emobile/springtodo/config/RedisConfig.java b/src/main/java/com/emobile/springtodo/config/RedisConfig.java
index bd71d208..91d852c3 100644
--- a/src/main/java/com/emobile/springtodo/config/RedisConfig.java
+++ b/src/main/java/com/emobile/springtodo/config/RedisConfig.java
@@ -1,6 +1,7 @@
 package com.emobile.springtodo.config;
 
 import com.emobile.springtodo.model.dto.*;
+import org.springframework.beans.factory.annotation.*;
 import org.springframework.boot.autoconfigure.cache.*;
 import org.springframework.cache.*;
 import org.springframework.context.annotation.*;
@@ -14,9 +15,14 @@
 @Configuration
 public class RedisConfig {
 
+    @Value("${spring.data.redis.host}")
+    private String redisHost;
+    @Value("${spring.data.redis.port}")
+    private int redisPort;
+
     @Bean
     public RedisConnectionFactory redisConnectionFactory() {
-        return new LettuceConnectionFactory("localhost", 6379);
+        return new LettuceConnectionFactory(redisHost, redisPort);
     }
 
     @Bean
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 09ba9914..de69c101 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -24,3 +24,9 @@ spring:
     user: ${spring.datasource.username}
     password: ${spring.datasource.password}
     url: ${spring.datasource.url}
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: health,info,metrics,prometheus

From e2c34bedb2b1bfd07692ab5c9d651c9ca3076f72 Mon Sep 17 00:00:00 2001
From: GitLobanov <lobanovgithub@gmail.com>
Date: Mon, 30 Jun 2025 12:13:15 +0300
Subject: [PATCH 7/7] feat(test): add new SQL integration test

---
 .../springtodo/it/TodoControllerIT.java       |   2 +-
 .../springtodo/it/TodoControllerSqlIT.java    | 114 ++++++++++++++++++
 src/test/resources/sql/reset-sequences.sql    |   3 +
 .../resources/sql/truncate/truncate-all.sql   |   4 +-
 4 files changed, 119 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/com/emobile/springtodo/it/TodoControllerSqlIT.java
 create mode 100644 src/test/resources/sql/reset-sequences.sql

diff --git a/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java b/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
index 062c825b..77d2997a 100644
--- a/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
+++ b/src/test/java/com/emobile/springtodo/it/TodoControllerIT.java
@@ -33,7 +33,7 @@
 class TodoControllerIT {
 
     @Container
-    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:15")
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:12-alpine")
             .withDatabaseName("todo_test")
             .withUsername("test")
             .withPassword("test")
diff --git a/src/test/java/com/emobile/springtodo/it/TodoControllerSqlIT.java b/src/test/java/com/emobile/springtodo/it/TodoControllerSqlIT.java
new file mode 100644
index 00000000..89949f72
--- /dev/null
+++ b/src/test/java/com/emobile/springtodo/it/TodoControllerSqlIT.java
@@ -0,0 +1,114 @@
+package com.emobile.springtodo.it;
+
+import com.emobile.springtodo.model.dto.TodoDto;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.transaction.annotation.Transactional;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@Testcontainers
+@Transactional
+class TodoControllerSqlIT {
+
+    @Container
+    static PostgreSQLContainer<?> postgres = new PostgreSQLContainer<>("postgres:12-alpine")
+            .withDatabaseName("todo_test")
+            .withUsername("test")
+            .withPassword("test")
+            .withReuse(true);
+
+    @Container
+    static GenericContainer<?> redis = new GenericContainer<>("redis:7-alpine")
+            .withExposedPorts(6379)
+            .withReuse(true);
+
+    @DynamicPropertySource
+    static void configureProperties(DynamicPropertyRegistry registry) {
+        registry.add("spring.datasource.url", postgres::getJdbcUrl);
+        registry.add("spring.datasource.username", postgres::getUsername);
+        registry.add("spring.datasource.password", postgres::getPassword);
+        registry.add("spring.data.redis.host", redis::getHost);
+        registry.add("spring.data.redis.port", () -> redis.getMappedPort(6379));
+    }
+
+    @Autowired
+    private MockMvc mockMvc;
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    private static final String URL_TODOS = "/api/v1/todos";
+    private static final String URL_TODOS_USER = URL_TODOS + "/user/";
+
+    @Test
+    @DisplayName("Should get todo by ID successfully using @Sql setup")
+    @Sql(scripts = {
+            "/sql/insert/insert-test-users.sql",
+            "/sql/insert/insert-test-todos.sql"
+    }, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
+    @Sql(scripts = "/sql/truncate/truncate-all.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
+    void shouldGetTodoByIdSuccessfully() throws Exception {
+        // Given
+        long todoId = 1L;
+
+        TodoDto expectedResponse = TodoDto.builder()
+                .id(todoId)
+                .title("First Todo")
+                .description("First Description")
+                .completed(false)
+                .tags(null)
+                .build();
+
+        // When & Then
+        MvcResult result = mockMvc.perform(get(URL_TODOS + "/" + todoId))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andReturn();
+
+        JSONAssert.assertEquals(
+                objectMapper.writeValueAsString(expectedResponse),
+                result.getResponse().getContentAsString(),
+                JSONCompareMode.LENIENT // Игнорируем поля, которых нет в expected (createdAt, etc.)
+        );
+    }
+
+    @Test
+    @DisplayName("Should get all todos by user ID with pagination using @Sql setup")
+    @Sql(scripts = {
+            "/sql/insert/insert-test-users.sql",
+            "/sql/insert/insert-test-todos.sql"
+    }, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
+    @Sql(scripts = "/sql/truncate/truncate-all.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
+    void shouldGetAllTodosByUserIdWithPagination() throws Exception {
+        // Given у пользователя с id = 1 есть 3 задачи.
+        long userId = 1L;
+
+        // When & Then
+        mockMvc.perform(get(URL_TODOS_USER + "/" + userId))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andExpect(jsonPath("$.total").value(3))
+                .andExpect(jsonPath("$.todos.length()").value(3))
+                .andExpect(jsonPath("$.todos[0].title").value("First Todo"))
+                .andExpect(jsonPath("$.todos[1].title").value("Second Todo"));
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/sql/reset-sequences.sql b/src/test/resources/sql/reset-sequences.sql
new file mode 100644
index 00000000..d495f757
--- /dev/null
+++ b/src/test/resources/sql/reset-sequences.sql
@@ -0,0 +1,3 @@
+-- Сбрасываем счетчики, чтобы избежать конфликтов PK
+ALTER SEQUENCE todos_id_seq RESTART WITH 10;
+ALTER SEQUENCE users_id_seq RESTART WITH 10;
\ No newline at end of file
diff --git a/src/test/resources/sql/truncate/truncate-all.sql b/src/test/resources/sql/truncate/truncate-all.sql
index 87d93e89..a515603d 100644
--- a/src/test/resources/sql/truncate/truncate-all.sql
+++ b/src/test/resources/sql/truncate/truncate-all.sql
@@ -1,3 +1 @@
-TRUNCATE TABLE tags CASCADE;
-TRUNCATE TABLE todos CASCADE;
-TRUNCATE TABLE users CASCADE;
+TRUNCATE TABLE users, todos, tags, todo_tags RESTART IDENTITY CASCADE;
\ No newline at end of file