diff --git a/.run/ewm-db.run.xml b/.run/ewm-infra.run.xml
similarity index 70%
rename from .run/ewm-db.run.xml
rename to .run/ewm-infra.run.xml
index 816f561..a210515 100644
--- a/.run/ewm-db.run.xml
+++ b/.run/ewm-infra.run.xml
@@ -1,10 +1,11 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ewm-db" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+  <configuration default="false" name="ewm-infra" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
     <deployment type="docker-compose.yml">
       <settings>
         <option name="services">
           <list>
             <option value="ewm-db" />
+            <option value="kafka" />
           </list>
         </option>
         <option name="sourceFilePath" value="compose.yaml" />
diff --git a/README.md b/README.md
index 54e5b5e..6815b6b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Приложение-афиша, позволяющее пользователям делиться информацией об интересных событиях и находить компанию для участия в них. Изначально проект был разработан в команде в рамках обучения в Яндекс Практикуме.
 
-В настоящее время проект развивается как индивидуальный дипломный проект. В рамках проекта монолитная архитектура была полностью разделена на независимые микросервисы, управляемые с помощью **Spring Cloud**.
+В настоящее время проект представляет собой полностью переработанную систему, развитую в рамках индивидуального дипломного проекта. Монолитная архитектура была полностью разделена на независимые микросервисы, управляемые с помощью **Spring Cloud**, а система статистики заменена на **асинхронную, событийно-ориентированную систему рекомендаций**, построенную на **Apache Kafka** и **gRPC**.
 
 ## Оглавление
 
@@ -16,78 +16,79 @@
     - [Запуск с использованием Docker Compose (Рекомендуемый способ)](#запуск-с-использованием-docker-compose-рекомендуемый-способ)
     - [Локальный запуск для разработки (IntelliJ IDEA)](#локальный-запуск-для-разработки-intellij-idea)
 - [Примеры использования API](#примеры-использования-api)
-- [Тестирование](#тестирование)
-- [Реализованная Дополнительная Функциональность: Комментарии](#реализованная-дополнительная-функциональность-комментарии)
 - [История проекта и Автор](#история-проекта-и-автор)
 
 ## Архитектура
 
-Приложение построено на основе микросервисной архитектуры. Инфраструктурные компоненты **Spring Cloud** обеспечивают отказоустойчивость и централизованное управление, а бизнес-логика разделена на независимые сервисы.
+Приложение построено на основе микросервисной, событийно-ориентированной архитектуры. Инфраструктурные компоненты **Spring Cloud** обеспечивают отказоустойчивость и централизованное управление, а бизнес-логика разделена на независимые сервисы.
 
 #### Инфраструктурные сервисы:
 
--   **API Gateway (`gateway-server`)**: Единая точка входа для всех внешних запросов. Отвечает за маршрутизацию к соответствующим микросервисам, балансировку нагрузки и реализует паттерны отказоустойчивости (Retry, Circuit Breaker).
--   **Discovery Server (`discovery-server`)**: Сервер обнаружения сервисов (Netflix Eureka). Все микросервисы регистрируются в нем, что позволяет им динамически находить друг друга по имени.
--   **Config Server (`config-server`)**: Сервер конфигурации, предоставляющий централизованные настройки для всех сервисов.
+-   **API Gateway (`gateway-server`)**: Единая точка входа для всех внешних REST API запросов.
+-   **Discovery Server (`discovery-server`)**: Сервер обнаружения сервисов (Netflix Eureka).
+-   **Config Server (`config-server`)**: Сервер централизованной конфигурации.
+-   **Apache Kafka**: Брокер сообщений, используемый как основа для асинхронной обработки действий пользователей.
 
 #### Сервисы бизнес-логики:
 
--   **`event-service`**: Управляет событиями (Events), категориями (Categories) и подборками (Compilations).
--   **`user-service`**: Управляет пользователями (Users).
--   **`request-service`**: Управляет заявками на участие (Participation Requests).
--   **`comment-service`**: Управляет комментариями (Comments).
--   **`stats-server`**: Управляет сбором и предоставлением статистики.
+-   **`event-service`**, **`user-service`**, **`request-service`**, **`comment-service`**: Набор REST-сервисов, реализующих основную бизнес-логику приложения.
+
+#### Система Рекомендаций (асинхронный конвейер обработки данных):
+
+-   **`collector`**: gRPC-сервис, принимающий информацию о действиях пользователей (`VIEW`, `LIKE`, `REGISTER`) и отправляющий ее в топик Kafka.
+-   **`aggregator`**: Сервис-обработчик, который слушает топик с действиями, инкрементально пересчитывает косинусное сходство между событиями и публикует результаты в другой топик Kafka.
+-   **`analyzer`**: Сервис, который слушает оба топика, сохраняет историю взаимодействий и рассчитанные сходства в свою базу данных, а также предоставляет gRPC API для выдачи рекомендаций.
 
 #### Межсервисное взаимодействие:
 
--   Для коммуникации между сервисами используется декларативный HTTP-клиент **OpenFeign**, интегрированный с Eureka.
--   Общие классы (DTO, интерфейсы клиентов, утилиты) вынесены в модуль **`interaction-api`**, который выступает в роли общего контракта для всех сервисов.
+-   **Синхронное (REST API):** Внешние клиенты взаимодействуют с системой через API Gateway по REST.
+-   **Синхронное (внутреннее):** Для высокопроизводительных запросов к системе рекомендаций (например, `event-service` запрашивает рейтинг) используется **gRPC**, работающий через Eureka.
+-   **Асинхронное (события):** Для логирования действий пользователей используется **Apache Kafka** с сообщениями в формате **Avro**.
+-   **Общие контракты:**
+    -   **`interaction-api`**: Модуль с общими DTO для REST API.
+    -   **`serialization`**: Модуль с Avro и Protobuf схемами и сгенерированными классами.
+    -   **`stats-client`**: Клиентская библиотека, предоставляющая удобные gRPC-клиенты и AOP-аспекты для взаимодействия с системой рекомендаций.
 
 ## Технологии
 
-- Java 21
-- Spring Boot 3.5.5
-- Spring Cloud (Gateway, Netflix Eureka, Config)
-- OpenFeign, Resilience4j (межсервисное взаимодействие и отказоустойчивость)
-- Spring Data JPA, QueryDSL
-- Spring MVC, Spring AOP (интеграция со StatsClient)
-- PostgreSQL 16.1
-- Maven
-- Docker / Docker Compose
-- Lombok, MapStruct
-- JUnit 5, Mockito, Testcontainers
-- Checkstyle, Spotbugs, Jacoco (контроль качества кода)
+-   Java 21, Spring Boot 3.5.5
+-   **Микросервисы:** Spring Cloud (Gateway, Netflix Eureka, Config)
+-   **Асинхронная обработка:** Apache Kafka
+-   **Сериализация:** Apache Avro (для Kafka), Protocol Buffers (для gRPC)
+-   **RPC:** gRPC
+-   **Базы данных:** PostgreSQL 16.1, Spring Data JPA, QueryDSL
+-   **Сборка:** Maven
+-   **Контейнеризация:** Docker, Docker Compose
+-   **Качество кода:** Lombok, MapStruct, Checkstyle, Spotbugs
 
 ## Структура проекта
 
-Проект является многомодульным и разделен на два логических слоя: `core` (бизнес-логика) и `infra` (инфраструктурные сервисы).
-
 ```
 explore-with-me/
 |
 ├── core/           (Модули, реализующие бизнес-логику)
-│   ├── interaction-api/  (Общий контракт: DTO, Feign-клиенты)
+│   ├── serialization/    (Avro/Protobuf схемы)
+│   ├── stats-client/     (gRPC клиенты и AOP)
+│   ├── interaction-api/  (REST DTO)
 │   ├── event-service/
 │   ├── user-service/
 │   ├── request-service/
 │   ├── comment-service/
-│   └── stats-service/
-│       ├── stats-client/
-│       ├── stats-dto/
-│       └── stats-server/
+│   ├── collector/
+│   ├── aggregator/
+│   └── analyzer/
 |
 └── infra/          (Инфраструктурные сервисы Spring Cloud)
-    ├── config-server/      (Сервер конфигурации)
-    ├── discovery-server/   (Сервер обнаружения)
-    └── gateway-server/     (API-шлюз)
+    ├── config-server/
+    ├── discovery-server/
+    └── gateway-server/
 ```
 
 ## API Спецификации
 
-Спецификации API остаются без изменений, так как инфраструктурные преобразования не затронули публичный контракт сервисов.
+Внешний REST API, доступный через API Gateway, остался по большей части без изменений, за исключением замены поля `views` на `rating` у событий и добавления новых эндпоинтов для лайков и рекомендаций.
 
--   **Основной сервис:** [`ewm-main-service-spec.json`](https://github.com/impatient0/java-plus-graduation/blob/main/ewm-main-service-spec.json)
--   **Сервис статистики:** [`ewm-stats-service.json`](https://github.com/impatient0/java-plus-graduation/blob/main/ewm-stats-service-spec.json)
+-   **Основной сервис (внешний API):** [`ewm-main-service-spec.json`](https://github.com/impatient0/java-plus-graduation/blob/main/ewm-main-service-spec.json)
 
 ## Начало работы
 
@@ -99,7 +100,7 @@ explore-with-me/
 
 ### Сборка проекта
 
-Для сборки всех модулей проекта выполните команду в корневой директории:
+Для сборки всех модулей, включая генерацию классов из Avro и Protobuf схем:
 ```bash
 mvn clean install
 ```
@@ -110,14 +111,13 @@ mvn clean install
 
 1.  **Соберите проект:** `mvn clean install`
 2.  **Запустите сервисы:**
-    В корневой директории проекта выполните:
     ```bash
     docker-compose up --build
     ```
-    Эта команда последовательно запустит всю инфраструктуру, базы данных и все сервисы бизнес-логики.
+    Эта команда запустит все инфраструктурные и бизнес-сервисы.
 
 3.  **Доступ к приложению:**
-    - **Единая точка входа (API Gateway):** `http://localhost:8080`
+    - **Единая точка входа (REST API):** `http://localhost:8080`
     - **Eureka Dashboard:** `http://localhost:8761`
 
 4.  **Остановка сервисов:**
@@ -133,10 +133,11 @@ mvn clean install
 
 **Порядок запуска:**
 
-1.  **`discovery-server`**: Запустите `DiscoveryServerApplication`. Дождитесь полного старта.
+1.  **`discovery-server`**: Запустите `EurekaServerApp`. Дождитесь полного старта.
 2.  **`config-server`**: Запустите `ConfigServerApplication`. Убедитесь, что он зарегистрировался в Eureka.
-3.  **Сервисы бизнес-логики**: Запустите `StatsServerApplication`, `UserServiceApplication`, `EventServiceApplication`, `CommentServiceApplication`, `RequestServiceApplication`. Порядок между ними не важен.
-4.  **`gateway-server`**: Запустите `GatewayServerApplication`.
+3.  **Сервисы обработки данных**: Запустите `CollectorApplication`, `AggregatorApplication`, `AnalyzerApplication` (порядок между ними не важен).
+4.  **Сервисы бизнес-логики**: Запустите `UserServiceApplication`, `EventServiceApplication`, `CommentServiceApplication`, `RequestServiceApplication` (порядок между ними не важен).
+5.  **`gateway-server`**: Запустите `GatewayServerApplication`.
 
 После запуска всех сервисов **все API-запросы** должны направляться на порт API Gateway: `http://localhost:8080`.
 
@@ -168,17 +169,6 @@ mvn clean install
 -   **Получение списка комментариев к событию:**
     `GET http://localhost:8080/events/{eventId}/comments?from=0&size=10&sort=createdOn,DESC`
 
-## Тестирование
-
-### Юнит и Интеграционные тесты
-
-Для запуска всех тестов в проекте выполните:
-
-```bash
-mvn test
-```
-Проект использует JUnit 5, Mockito и Testcontainers для различных уровней тестирования (юнит-тесты, интеграционные тесты с БД). Отчеты о покрытии кода (Jacoco) генерируются в `target/site/jacoco/`.
-
 ### Postman-тесты для Дополнительной Функциональности
 
 Для проверки работоспособности эндпоинтов реализованной дополнительной функциональности "Комментарии" подготовлена Postman-коллекция.
@@ -186,10 +176,6 @@ mvn test
 -   **Расположение:** `postman/feature.json` в корне репозитория.
 -   **Проверка:** Тесты в коллекции проверяют основные сценарии использования API комментариев, включая коды ответов, базовый формат JSON и значения полей.
 
-## Реализованная Дополнительная Функциональность: Комментарии
-
-В рамках командного этапа проекта была выбрана и реализована дополнительная функциональность: **"Комментарии к событиям"**.
-
 ### Обзор функционала:
 
 Реализована возможность для пользователей оставлять, редактировать и удалять свои комментарии к опубликованным событиям, а также для администраторов модерировать (удалять, восстанавливать) любые комментарии.
diff --git a/compose.yaml b/compose.yaml
index db826ea..2f9fc40 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,4 +1,7 @@
 services:
+  # ===================================================================
+  # INFRASTRUCTURE SERVICES
+  # ===================================================================
   discovery-server:
     build: infra/discovery-server
     container_name: ewm-discovery-server
@@ -49,9 +52,106 @@ services:
       EUREKA_URI: http://discovery-server:8761/eureka/
       PORT: 8080
 
-  stats-server:
-    build: core/stats-service/stats-server
-    container_name: ewm-stats-server
+  # ===================================================================
+  # KAFKA AND DATABASE
+  # ===================================================================
+  kafka:
+    image: confluentinc/confluent-local:7.4.10
+    hostname: kafka
+    container_name: ewm-kafka
+    ports:
+      - "9092:9092"
+    restart: unless-stopped
+    environment:
+      KAFKA_NODE_ID: 1
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'
+      KAFKA_ADVERTISED_LISTENERS: 'PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092'
+      KAFKA_PROCESS_ROLES: 'broker,controller'
+      KAFKA_CONTROLLER_QUORUM_VOTERS: '1@kafka:29093'
+      KAFKA_LISTENERS: 'PLAINTEXT://0.0.0.0:29092,CONTROLLER://kafka:29093,PLAINTEXT_HOST://0.0.0.0:9092'
+      KAFKA_INTER_BROKER_LISTENER_NAME: 'PLAINTEXT'
+      KAFKA_CONTROLLER_LISTENER_NAMES: 'CONTROLLER'
+      CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
+      KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
+      KAFKA_GROUP_INITIAL_REBALANCE_DELAY_MS: 0
+      KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
+      KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
+    healthcheck:
+      test: [ "CMD-SHELL", "kafka-topics --bootstrap-server localhost:9092 --list" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  kafka-init-topics:
+    image: confluentinc/confluent-local:7.4.3
+    container_name: kafka-init-topics
+    depends_on:
+      kafka:
+        condition: service_healthy
+    command: >
+      bash -c "
+        echo 'Waiting for Kafka to be ready...' &&
+        cub kafka-ready -b kafka:29092 1 20 &&
+        echo 'Kafka is ready!' &&
+        kafka-topics --create --topic stats.user-actions.v1 --partitions 1 --replication-factor 1 --if-not-exists --bootstrap-server kafka:29092 &&
+        kafka-topics --create --topic stats.events-similarity.v1 --partitions 1 --replication-factor 1 --if-not-exists --bootstrap-server kafka:29092
+      "
+
+  ewm-db:
+    image: postgres:16.1
+    container_name: ewm-main-db
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: ewm_user
+      POSTGRES_PASSWORD: ewm_password
+      POSTGRES_DB: ewm_db
+    volumes:
+      - main_db_data:/var/lib/postgresql/data
+      - ./init-scripts/init.sql:/docker-entrypoint-initdb.d/01-schema.sql
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB} -p 5432" ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+
+  # ===================================================================
+  # BUSINESS LOGIC SERVICES
+  # ===================================================================
+  collector-service:
+    build: core/collector
+    container_name: ewm-collector-service
+    depends_on:
+      discovery-server:
+        condition: service_healthy
+      config-server:
+        condition: service_healthy
+      kafka:
+        condition: service_healthy
+    restart: unless-stopped
+    environment:
+      EUREKA_URI: http://discovery-server:8761/eureka/
+      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
+
+  aggregator-service:
+    build: core/aggregator
+    container_name: ewm-aggregator-service
+    depends_on:
+      discovery-server:
+        condition: service_healthy
+      config-server:
+        condition: service_healthy
+      kafka:
+        condition: service_healthy
+    restart: unless-stopped
+    environment:
+      EUREKA_URI: http://discovery-server:8761/eureka/
+      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
+
+  analyzer-service:
+    build: core/analyzer
+    container_name: ewm-analyzer-service
     depends_on:
       discovery-server:
         condition: service_healthy
@@ -59,14 +159,15 @@ services:
         condition: service_healthy
       ewm-db:
         condition: service_healthy
-    ports:
-      - "9090:9090"
+      kafka:
+        condition: service_healthy
+    restart: unless-stopped
     environment:
       EUREKA_URI: http://discovery-server:8761/eureka/
-      SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewm_stats_db
-      SPRING_DATASOURCE_USERNAME: ewm_user
-      SPRING_DATASOURCE_PASSWORD: ewm_password
-      JAVA_OPTS: -Duser.timezone=UTC
+      POSTGRES_HOST: ewm-db
+      POSTGRES_USER: ewm_user
+      POSTGRES_PASSWORD: ewm_password
+      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
 
   event-service:
     build: core/event-service
@@ -78,15 +179,13 @@ services:
         condition: service_healthy
       ewm-db:
         condition: service_healthy
-      stats-server:
-        condition: service_started
     ports:
       - "8081:8081"
     environment:
       EUREKA_URI: http://discovery-server:8761/eureka/
-      SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewm_event
-      SPRING_DATASOURCE_USERNAME: ewm_user
-      SPRING_DATASOURCE_PASSWORD: ewm_password
+      POSTGRES_HOST: ewm-db
+      POSTGRES_USER: ewm_user
+      POSTGRES_PASSWORD: ewm_password
       JAVA_OPTS: -Duser.timezone=UTC
 
   user-service:
@@ -99,15 +198,13 @@ services:
         condition: service_healthy
       ewm-db:
         condition: service_healthy
-      stats-server:
-        condition: service_started
     ports:
       - "8082:8082"
     environment:
       EUREKA_URI: http://discovery-server:8761/eureka/
-      SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewm_user
-      SPRING_DATASOURCE_USERNAME: ewm_user
-      SPRING_DATASOURCE_PASSWORD: ewm_password
+      POSTGRES_HOST: ewm-db
+      POSTGRES_USER: ewm_user
+      POSTGRES_PASSWORD: ewm_password
       JAVA_OPTS: -Duser.timezone=UTC
 
   request-service:
@@ -120,15 +217,13 @@ services:
         condition: service_healthy
       ewm-db:
         condition: service_healthy
-      stats-server:
-        condition: service_started
     ports:
       - "8083:8083"
     environment:
       EUREKA_URI: http://discovery-server:8761/eureka/
-      SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewm_request
-      SPRING_DATASOURCE_USERNAME: ewm_user
-      SPRING_DATASOURCE_PASSWORD: ewm_password
+      POSTGRES_HOST: ewm-db
+      POSTGRES_USER: ewm_user
+      POSTGRES_PASSWORD: ewm_password
       JAVA_OPTS: -Duser.timezone=UTC
 
   comment-service:
@@ -141,36 +236,14 @@ services:
         condition: service_healthy
       ewm-db:
         condition: service_healthy
-      stats-server:
-        condition: service_started
     ports:
       - "8084:8084"
     environment:
       EUREKA_URI: http://discovery-server:8761/eureka/
-      SPRING_DATASOURCE_URL: jdbc:postgresql://ewm-db:5432/ewm_comment
-      SPRING_DATASOURCE_USERNAME: ewm_user
-      SPRING_DATASOURCE_PASSWORD: ewm_password
-      JAVA_OPTS: -Duser.timezone=UTC
-
-  ewm-db:
-    image: postgres:16.1
-    container_name: ewm-main-db
-    ports:
-      - "5432:5432"
-    environment:
+      POSTGRES_HOST: ewm-db
       POSTGRES_USER: ewm_user
       POSTGRES_PASSWORD: ewm_password
-      POSTGRES_DB: ewm_db
-    volumes:
-      - main_db_data:/var/lib/postgresql/data
-      - ./init-scripts/init.sql:/docker-entrypoint-initdb.d/01-schema.sql
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB} -p 5432" ]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
+      JAVA_OPTS: -Duser.timezone=UTC
 
 volumes:
-  stats_db_data: {}
-  main_db_data: {}
\ No newline at end of file
+  main_db_data: { }
\ No newline at end of file
diff --git a/core/stats-service/stats-server/Dockerfile b/core/aggregator/Dockerfile
similarity index 100%
rename from core/stats-service/stats-server/Dockerfile
rename to core/aggregator/Dockerfile
diff --git a/core/aggregator/pom.xml b/core/aggregator/pom.xml
new file mode 100644
index 0000000..8d8a6eb
--- /dev/null
+++ b/core/aggregator/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>ru.practicum</groupId>
+    <artifactId>core</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>aggregator</artifactId>
+  <packaging>jar</packaging>
+
+  <properties>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>ru.practicum</groupId>
+      <artifactId>serialization</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.kafka</groupId>
+      <artifactId>spring-kafka</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-config</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/AggregatorApplication.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/AggregatorApplication.java
new file mode 100644
index 0000000..2273b1e
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/AggregatorApplication.java
@@ -0,0 +1,15 @@
+package ru.practicum.ewm.aggregator;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import ru.practicum.ewm.aggregator.application.config.RecommendationProperties;
+
+@SpringBootApplication
+@EnableConfigurationProperties(RecommendationProperties.class)
+public class AggregatorApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AggregatorApplication.class, args);
+    }
+}
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/application/SimilarityCalculationService.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/application/SimilarityCalculationService.java
new file mode 100644
index 0000000..7ede61d
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/application/SimilarityCalculationService.java
@@ -0,0 +1,113 @@
+package ru.practicum.ewm.aggregator.application;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.practicum.ewm.aggregator.application.config.RecommendationProperties;
+import ru.practicum.ewm.aggregator.domain.EventPairMinWeightSumsRepository;
+import ru.practicum.ewm.aggregator.domain.EventWeightSumsRepository;
+import ru.practicum.ewm.aggregator.domain.UserActionType;
+import ru.practicum.ewm.aggregator.domain.UserEventWeightsRepository;
+import ru.practicum.ewm.aggregator.infrastructure.kafka.EventSimilarityProducer;
+import ru.practicum.ewm.stats.kafka.EventSimilarityAvro;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class SimilarityCalculationService {
+
+    private final EventPairMinWeightSumsRepository eventPairMinWeightSumsRepo;
+    private final EventWeightSumsRepository eventWeightSumsRepo;
+    private final UserEventWeightsRepository userEventWeightsRepo;
+    private final EventSimilarityProducer producer;
+
+    private final RecommendationProperties recommendationProperties;
+
+    private final Map<Long, Object> userLocks = new ConcurrentHashMap<>();
+
+    public void updateSimilarities(long userId, long eventId, UserActionType actionType) {
+        log.info("Attempting to update similarities for user {} and event {} with action type {}", userId, eventId, actionType);
+
+        // Create a unique lock object for each user
+        Object userLock = userLocks.computeIfAbsent(userId, k -> new Object());
+
+        // Prevent concurrent processing of actions by the same user
+        synchronized (userLock) {
+            // Fetch the old weight
+            double oldWeight = userEventWeightsRepo.findWeight(userId, eventId);
+
+            // Check if the weight increased
+            double newWeight = recommendationProperties.getActionWeight(actionType);
+            if (newWeight <= oldWeight) {
+                log.info("New weight {} is not greater than old weight {}. No update needed for user {} and event {}", newWeight, oldWeight, userId, eventId);
+                return;
+            }
+
+            // Update weights
+            double weightDelta = newWeight - oldWeight;
+            double newWeightSum = eventWeightSumsRepo.findWeightSum(eventId) + weightDelta;
+
+            userEventWeightsRepo.save(userId, eventId, newWeight);
+            eventWeightSumsRepo.saveWeightSum(eventId, newWeightSum);
+
+            // Update contributions and recalculate similarities
+            Map<Long, Double> userEventWeights = userEventWeightsRepo.findWeightsByUserId(userId);
+            if (userEventWeights.size() <= 1) {
+                log.warn("User {} has interacted with only one event ({}). No similarity calculation needed.", userId, eventId);
+                return;
+            }
+            log.debug("Retrieved all event weights for user {}: {}", userId, userEventWeights.keySet());
+
+            // Store deltas for affected events
+            Map<Long, Double> minWeightDeltas = new HashMap<>();
+
+            for (Entry<Long, Double> entry : userEventWeights.entrySet()) {
+                long otherEventId = entry.getKey();
+                if (otherEventId == eventId) {
+                    continue; // Skip self-comparison
+                }
+                double otherEventWeight = entry.getValue();
+                log.debug("Processing other event {} with weight {} for user {}", otherEventId, otherEventWeight, userId);
+
+                // Update the minimal weight for user-eventA-eventB combination
+                double oldMin = Math.min(oldWeight, otherEventWeight);
+                double newMin = Math.min(newWeight, otherEventWeight);
+
+                minWeightDeltas.put(otherEventId, Math.max(newMin - oldMin, 0.0)); // Add zero-deltas for unchanged events
+            }
+
+            // Update affected events and retrieve their weights
+            Map<Long, Double> minWeightSums = eventPairMinWeightSumsRepo.updateWithDeltas(eventId, minWeightDeltas);
+            Map<Long, Double> weightSums = eventWeightSumsRepo.findWeightSums(minWeightDeltas.keySet());
+
+            for (Long otherEventId : minWeightDeltas.keySet()) {
+                long eventA = Math.min(eventId, otherEventId);
+                long eventB = Math.max(eventId, otherEventId);
+
+                // Calculate new similarity score
+                double otherEventWeightSum = weightSums.get(otherEventId);
+                double minWeightSum = minWeightSums.get(otherEventId);
+                double similarity = minWeightSum / Math.sqrt(newWeightSum * otherEventWeightSum);
+                log.debug("Calculated similarity for pair ({}, {}): {} (newMinSum: {}, newWeightSum: {}, otherEventWeightSum: {})",
+                    eventA, eventB, similarity, minWeightSum, newWeightSum, otherEventWeightSum);
+
+                EventSimilarityAvro avroMessage = EventSimilarityAvro.newBuilder()
+                    .setEventA(eventA)
+                    .setEventB(eventB)
+                    .setScore(similarity)
+                    .setTimestamp(Instant.now())
+                    .build();
+
+                // Publish similarity to Kafka
+                producer.sendEventSimilarity(avroMessage);
+            }
+            log.info("Updated {} similarity values", minWeightDeltas.size());
+        }
+        log.info("Finished updating similarities for user {} and event {}", userId, eventId);
+    }
+}
\ No newline at end of file
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/application/config/RecommendationProperties.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/application/config/RecommendationProperties.java
new file mode 100644
index 0000000..90196bc
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/application/config/RecommendationProperties.java
@@ -0,0 +1,20 @@
+package ru.practicum.ewm.aggregator.application.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import ru.practicum.ewm.aggregator.domain.UserActionType;
+
+@ConfigurationProperties(prefix = "recommendations")
+public record RecommendationProperties(Map<String, Double> actionWeights) {
+
+    public RecommendationProperties {
+        if (actionWeights == null) {
+            actionWeights = new HashMap<>();
+        }
+    }
+
+    public Double getActionWeight(UserActionType actionType) {
+        return this.actionWeights.get(actionType.name());
+    }
+}
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/EventPairMinWeightSumsRepository.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/EventPairMinWeightSumsRepository.java
new file mode 100644
index 0000000..3089ace
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/EventPairMinWeightSumsRepository.java
@@ -0,0 +1,21 @@
+package ru.practicum.ewm.aggregator.domain;
+
+import java.util.Map;
+
+public interface EventPairMinWeightSumsRepository {
+
+    /**
+     * Updates the aggregated sums of minimum weights between a primary event and a set of other
+     * events, applying specified delta values for each pair. For each entry in the {@code deltas}
+     * map, the method updates the sum of minimum weights for the pair consisting of {@code eventId}
+     * and the key from the {@code deltas} map, incrementing it by the corresponding delta value.
+     *
+     * @param eventId The ID of the primary event.
+     * @param deltas  A {@link Map} where keys are the IDs of the other events to form pairs with
+     *                {@code eventId}, and values are the delta amounts to add to the current
+     *                aggregated sum for each pair.
+     * @return A {@link Map} where keys are the IDs of the other events and values are their
+     * corresponding *updated* aggregated sums of minimum weights with {@code eventId}.
+     */
+    Map<Long, Double> updateWithDeltas(long eventId, Map<Long, Double> deltas);
+}
\ No newline at end of file
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/EventWeightSumsRepository.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/EventWeightSumsRepository.java
new file mode 100644
index 0000000..fc362c4
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/EventWeightSumsRepository.java
@@ -0,0 +1,36 @@
+package ru.practicum.ewm.aggregator.domain;
+
+import java.util.Map;
+import java.util.Set;
+
+public interface EventWeightSumsRepository {
+
+    /**
+     * Retrieves the total sum of weights for a given event across all users. This sum represents
+     * the aggregation of individual user weights for the specified event.
+     *
+     * @param eventId The ID of the event for which to retrieve the total weight sum.
+     * @return The aggregated sum of weights for the specified event across all users.
+     */
+    double findWeightSum(long eventId);
+
+    /**
+     * Saves or updates the total sum of weights for a given event across all users. This method
+     * stores the pre-calculated aggregate sum of weights for the specified event.
+     *
+     * @param eventId The ID of the event for which to save or update the total weight sum.
+     * @param sum     The calculated total sum of weights for the event across all users.
+     */
+    void saveWeightSum(long eventId, double sum);
+
+    /**
+     * Retrieves the total sums of weights for a given set of events across all users. The returned
+     * map contains event IDs as keys and their corresponding aggregated total weight sums as
+     * values.
+     *
+     * @param eventIds A {@link Set} of event IDs for which to retrieve the total weight sums.
+     * @return A {@link Map} where keys are event IDs and values are their respective aggregated
+     * total weight sums across all users.
+     */
+    Map<Long, Double> findWeightSums(Set<Long> eventIds);
+}
\ No newline at end of file
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/UserActionType.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/UserActionType.java
new file mode 100644
index 0000000..d7c7038
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/UserActionType.java
@@ -0,0 +1,7 @@
+package ru.practicum.ewm.aggregator.domain;
+
+public enum UserActionType {
+    VIEW,
+    REGISTER,
+    LIKE
+}
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/UserEventWeightsRepository.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/UserEventWeightsRepository.java
new file mode 100644
index 0000000..279d5f8
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/domain/UserEventWeightsRepository.java
@@ -0,0 +1,35 @@
+package ru.practicum.ewm.aggregator.domain;
+
+import java.util.Map;
+
+public interface UserEventWeightsRepository {
+
+    /**
+     * Retrieves the current maximum weight associated with a specific user and event.
+     *
+     * @param userId  The ID of the user.
+     * @param eventId The ID of the event.
+     * @return The maximum weight if found, 0 otherwise.
+     */
+    double findWeight(long userId, long eventId);
+
+    /**
+     * Saves or updates the maximum weight for a specific user and event. If a weight for the given
+     * user and event already exists, it will be updated.
+     *
+     * @param userId  The ID of the user.
+     * @param eventId The ID of the event.
+     * @param weight  The new maximum weight to save.
+     */
+    void save(long userId, long eventId, double weight);
+
+    /**
+     * Retrieves the weights for all events that a specific user has interacted with. The returned
+     * map contains event IDs as keys and the user's corresponding maximum weights as values.
+     *
+     * @param userId The ID of the user for whom to retrieve event weights.
+     * @return A {@link Map} where keys are event IDs and values are the user's respective maximum
+     * weights for those events.
+     */
+    Map<Long, Double> findWeightsByUserId(long userId);
+}
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/kafka/EventSimilarityProducer.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/kafka/EventSimilarityProducer.java
new file mode 100644
index 0000000..e5baf65
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/kafka/EventSimilarityProducer.java
@@ -0,0 +1,37 @@
+package ru.practicum.ewm.aggregator.infrastructure.kafka;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Component;
+import ru.practicum.ewm.stats.kafka.EventSimilarityAvro;
+
+@Component
+@Slf4j
+public class EventSimilarityProducer {
+
+    private final String eventSimilarityTopic;
+
+    private final KafkaTemplate<String, EventSimilarityAvro> kafkaTemplate;
+
+    public EventSimilarityProducer(
+        @Value("${kafka.topic.events-similarity}") String eventSimilarityTopic,
+        KafkaTemplate<String, EventSimilarityAvro> kafkaTemplate) {
+        this.eventSimilarityTopic = eventSimilarityTopic;
+        this.kafkaTemplate = kafkaTemplate;
+    }
+
+    public void sendEventSimilarity(EventSimilarityAvro eventSimilarity) {
+        log.info("Sending event similarity data to Kafka topic '{}': {}", eventSimilarityTopic, eventSimilarity);
+
+        kafkaTemplate.send(eventSimilarityTopic, eventSimilarity)
+            .whenComplete((result, ex) -> {
+                if (ex == null) {
+                    log.info("Successfully sent event similarity data to offset {}",
+                        result.getRecordMetadata().offset());
+                } else {
+                    log.error("Failed to send event similarity data: {}", ex.getMessage());
+                }
+            });
+    }
+}
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/kafka/UserActionConsumer.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/kafka/UserActionConsumer.java
new file mode 100644
index 0000000..406af94
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/kafka/UserActionConsumer.java
@@ -0,0 +1,29 @@
+package ru.practicum.ewm.aggregator.infrastructure.kafka;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+import ru.practicum.ewm.aggregator.application.SimilarityCalculationService;
+import ru.practicum.ewm.aggregator.domain.UserActionType;
+import ru.practicum.ewm.stats.kafka.UserActionAvro;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class UserActionConsumer {
+
+    private final SimilarityCalculationService similarityCalculationService;
+
+    @KafkaListener(
+        id = "action-listener",
+        topics = "${kafka.topic.user-actions}",
+        groupId = "${spring.kafka.consumer.group-id}"
+    )
+    public void consumeAction(UserActionAvro action) {
+        log.info("Received action from user {} on event {}", action.getUserId(), action.getEventId());
+
+        UserActionType actionType = UserActionType.valueOf(action.getActionType().name());
+        similarityCalculationService.updateSimilarities(action.getUserId(), action.getEventId(), actionType);
+    }
+}
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryEventPairMinWeightSumsRepository.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryEventPairMinWeightSumsRepository.java
new file mode 100644
index 0000000..4787f56
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryEventPairMinWeightSumsRepository.java
@@ -0,0 +1,42 @@
+package ru.practicum.ewm.aggregator.infrastructure.state;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.springframework.stereotype.Repository;
+import ru.practicum.ewm.aggregator.domain.EventPairMinWeightSumsRepository;
+
+@Repository
+public class InMemoryEventPairMinWeightSumsRepository implements EventPairMinWeightSumsRepository {
+
+    private final Map<Long, Map<Long, Double>> minWeightSums = new ConcurrentHashMap<>();
+
+    @Override
+    public Map<Long, Double> updateWithDeltas(long eventId, Map<Long, Double> deltas) {
+        if (deltas == null || deltas.isEmpty()) {
+            return Map.of();
+        }
+
+        Map<Long, Double> updatedSums = new ConcurrentHashMap<>();
+
+        for (Map.Entry<Long, Double> entry : deltas.entrySet()) {
+            long otherEventId = entry.getKey();
+            double delta = entry.getValue();
+
+            long eventA = Math.min(eventId, otherEventId);
+            long eventB = Math.max(eventId, otherEventId);
+
+            Map<Long, Double> innerMap = minWeightSums.computeIfAbsent(eventA, k -> new ConcurrentHashMap<>());
+
+            double newSum = innerMap.compute(eventB, (key, currentSum) -> {
+                if (currentSum == null) {
+                    return delta; // First time seeing this pair
+                }
+                return currentSum + delta; // Add delta to existing sum
+            });
+
+            updatedSums.put(otherEventId, newSum);
+        }
+
+        return updatedSums;
+    }
+}
\ No newline at end of file
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryEventWeightSumsRepository.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryEventWeightSumsRepository.java
new file mode 100644
index 0000000..81fe9fb
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryEventWeightSumsRepository.java
@@ -0,0 +1,38 @@
+package ru.practicum.ewm.aggregator.infrastructure.state;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Repository;
+import ru.practicum.ewm.aggregator.domain.EventWeightSumsRepository;
+
+@Repository
+public class InMemoryEventWeightSumsRepository implements EventWeightSumsRepository {
+
+    private final Map<Long, Double> eventWeightSums = new ConcurrentHashMap<>();
+
+    @Override
+    public double findWeightSum(long eventId) {
+        return eventWeightSums.getOrDefault(eventId, 0.0);
+    }
+
+    @Override
+    public void saveWeightSum(long eventId, double sum) {
+        eventWeightSums.put(eventId, sum);
+    }
+
+    @Override
+    public Map<Long, Double> findWeightSums(Set<Long> eventIds) {
+        if (eventIds == null || eventIds.isEmpty()) {
+            return Map.of();
+        }
+
+        return eventIds.stream()
+            .collect(Collectors.toConcurrentMap( // Use a concurrent map for thread safety
+                Function.identity(),
+                eventId -> eventWeightSums.getOrDefault(eventId, 0.0) // Provide 0 for missing values
+            ));
+    }
+}
\ No newline at end of file
diff --git a/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryUserEventWeightsRepository.java b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryUserEventWeightsRepository.java
new file mode 100644
index 0000000..542d399
--- /dev/null
+++ b/core/aggregator/src/main/java/ru/practicum/ewm/aggregator/infrastructure/state/InMemoryUserEventWeightsRepository.java
@@ -0,0 +1,33 @@
+package ru.practicum.ewm.aggregator.infrastructure.state;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.springframework.stereotype.Repository;
+import ru.practicum.ewm.aggregator.domain.UserEventWeightsRepository;
+
+@Repository
+public class InMemoryUserEventWeightsRepository implements UserEventWeightsRepository {
+
+    private final Map<Long, Map<Long, Double>> userEventWeights = new ConcurrentHashMap<>();
+
+    @Override
+    public double findWeight(long userId, long eventId) {
+        Map<Long, Double> eventWeights = userEventWeights.get(userId);
+        if (eventWeights == null) {
+            return 0.0; // User has no interactions, so weight is 0
+        }
+        return eventWeights.getOrDefault(eventId, 0.0);
+    }
+
+    @Override
+    public void save(long userId, long eventId, double weight) {
+        userEventWeights.computeIfAbsent(userId, k -> new ConcurrentHashMap<>())
+            .put(eventId, weight);
+    }
+
+    @Override
+    public Map<Long, Double> findWeightsByUserId(long userId) {
+        return Collections.unmodifiableMap(userEventWeights.getOrDefault(userId, Collections.emptyMap()));
+    }
+}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/resources/application.yaml b/core/aggregator/src/main/resources/application.yaml
similarity index 73%
rename from core/stats-service/stats-server/src/main/resources/application.yaml
rename to core/aggregator/src/main/resources/application.yaml
index cf15002..4003187 100644
--- a/core/stats-service/stats-server/src/main/resources/application.yaml
+++ b/core/aggregator/src/main/resources/application.yaml
@@ -1,8 +1,8 @@
 spring:
   application:
-    name: stats-server
+    name: aggregator
   profiles:
-    active: postgres
+    active: kafka, recommendations
   config:
     import: "configserver:"
   cloud:
@@ -21,5 +21,4 @@ eureka:
     serviceUrl:
       defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
   instance:
-    instance-id: "${spring.application.name}:${random.value}"
-    leaseRenewalIntervalInSeconds: 10
+    instance-id: "${spring.application.name}:${random.value}"
\ No newline at end of file
diff --git a/core/analyzer/Dockerfile b/core/analyzer/Dockerfile
new file mode 100644
index 0000000..0ff1817
--- /dev/null
+++ b/core/analyzer/Dockerfile
@@ -0,0 +1,5 @@
+FROM eclipse-temurin:21-jre-jammy
+VOLUME /tmp
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]
\ No newline at end of file
diff --git a/core/stats-service/stats-server/pom.xml b/core/analyzer/pom.xml
similarity index 57%
rename from core/stats-service/stats-server/pom.xml
rename to core/analyzer/pom.xml
index dee9f36..7d48f79 100644
--- a/core/stats-service/stats-server/pom.xml
+++ b/core/analyzer/pom.xml
@@ -5,80 +5,76 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>ru.practicum</groupId>
-    <artifactId>stats-service</artifactId>
+    <artifactId>core</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>stats-server</artifactId>
+  <artifactId>analyzer</artifactId>
   <packaging>jar</packaging>
 
+  <properties>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <dependencies>
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-config</artifactId>
+      <groupId>ru.practicum</groupId>
+      <artifactId>serialization</artifactId>
+      <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-jpa</artifactId>
+      <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
+      <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
+      <scope>runtime</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>ru.practicum</groupId>
-      <artifactId>stats-dto</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.springframework.kafka</groupId>
+      <artifactId>spring-kafka</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>postgresql</artifactId>
-      <scope>test</scope>
+      <groupId>net.devh</groupId>
+      <artifactId>grpc-server-spring-boot-starter</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-config</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>ru.practicum</groupId>
-      <artifactId>interaction-api</artifactId>
-      <version>${project.version}</version>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
     </dependency>
+
     <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <optional>true</optional>
     </dependency>
+
     <dependency>
-      <groupId>ru.practicum</groupId>
-      <artifactId>stats-client</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct</artifactId>
     </dependency>
   </dependencies>
 
@@ -87,15 +83,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>org.projectlombok</groupId>
-              <artifactId>lombok</artifactId>
-              <version>${lombok.version}</version>
-            </path>
-          </annotationProcessorPaths>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/AnalyzerApplication.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/AnalyzerApplication.java
new file mode 100644
index 0000000..19e49c0
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/AnalyzerApplication.java
@@ -0,0 +1,17 @@
+package ru.practicum.ewm.analyzer;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import ru.practicum.ewm.analyzer.application.config.RecommendationProperties;
+
+@SpringBootApplication
+@EnableJpaAuditing
+@EnableConfigurationProperties(RecommendationProperties.class)
+public class AnalyzerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(AnalyzerApplication.class, args);
+    }
+}
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/IngestionService.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/IngestionService.java
new file mode 100644
index 0000000..a69e37f
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/IngestionService.java
@@ -0,0 +1,53 @@
+package ru.practicum.ewm.analyzer.application;
+
+import jakarta.transaction.Transactional;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ru.practicum.ewm.analyzer.application.config.RecommendationProperties;
+import ru.practicum.ewm.analyzer.domain.EventSimilarity;
+import ru.practicum.ewm.analyzer.domain.EventSimilarityRepository;
+import ru.practicum.ewm.analyzer.domain.UserActionType;
+import ru.practicum.ewm.analyzer.domain.UserInteraction;
+import ru.practicum.ewm.analyzer.domain.UserInteractionRepository;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class IngestionService {
+
+    private final UserInteractionRepository interactionRepository;
+    private final EventSimilarityRepository similarityRepository;
+
+    private final RecommendationProperties properties;
+
+    @Transactional
+    public void processUserAction(long userId, long eventId, UserActionType actionType) {
+        log.info("Processing user action: userId={}, eventId={}, actionType={}", userId, eventId, actionType);
+        UserInteraction interaction = new UserInteraction();
+        interaction.setUserId(userId);
+        interaction.setEventId(eventId);
+        interaction.setWeight(properties.getActionWeight(actionType));
+        interactionRepository.save(interaction);
+        log.info("Saved user interaction for userId {} and eventId {} with weight {}.", userId, eventId, interaction.getWeight());
+    }
+
+    @Transactional
+    public void processEventSimilarity(long eventA, long eventB, double similarityScore) {
+        log.info("Processing event similarity: eventA={}, eventB={}, score={}", eventA, eventB, similarityScore);
+        EventSimilarity similarity = new EventSimilarity();
+        similarity.setEventA(eventA);
+        similarity.setEventB(eventB);
+        similarity.setScore(similarityScore);
+        Optional<EventSimilarity> oldSimilarityData = similarityRepository.findByEventAAndEventB(eventA, eventB);
+        if (oldSimilarityData.isPresent()) {
+            log.debug("Updating existing similarity for event pair ({}, {}). Old score: {}, New score: {}",
+                eventA, eventB, oldSimilarityData.get().getScore(), similarityScore);
+            similarity.setId(oldSimilarityData.get().getId());
+        }
+        similarityRepository.save(similarity);
+        log.info("{} event similarity for event pair ({}, {}) with score {}.",
+            oldSimilarityData.isPresent() ? "Updated" : "Saved", eventA, eventB, similarityScore);
+    }
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/RecommendationsService.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/RecommendationsService.java
new file mode 100644
index 0000000..c39ac3b
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/RecommendationsService.java
@@ -0,0 +1,107 @@
+package ru.practicum.ewm.analyzer.application;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import ru.practicum.ewm.analyzer.application.config.RecommendationProperties;
+import ru.practicum.ewm.analyzer.domain.EventSimilarityRepository;
+import ru.practicum.ewm.analyzer.domain.Recommendation;
+import ru.practicum.ewm.analyzer.domain.UserInteractionRepository;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class RecommendationsService {
+
+    private final EventSimilarityRepository similarityRepository;
+    private final UserInteractionRepository interactionRepository;
+
+    private final RecommendationProperties properties;
+
+    @Transactional(readOnly = true)
+    public List<Recommendation> findSimilarEvents(long eventId, long userId, int maxResults) {
+        log.info("Finding top {} similar events for event {} excluding events interacted by user {}", maxResults, eventId, userId);
+
+        List<Long> interactedEvents = interactionRepository.findInteractedEvents(userId);
+        log.debug("User {} has interacted with {} events.", userId, interactedEvents.size());
+
+        List<Recommendation> similarEvents = similarityRepository.findTopSimilarExcluding(eventId, interactedEvents, maxResults);
+        log.info("Found {} similar events for event {} excluding user {}'s interactions.", similarEvents.size(), eventId, userId);
+        return similarEvents;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Recommendation> getInteractionsCount(Collection<Long> eventIds) {
+        log.info("Finding interaction counts for {} events.", eventIds.size());
+
+        List<Recommendation> interactionCounts = interactionRepository.findInteractionsCount(eventIds);
+        log.info("Retrieved interaction counts for {} events.", interactionCounts.size());
+        return interactionCounts;
+    }
+
+    @Transactional(readOnly = true)
+    public List<Recommendation> getUserPredictions(long userId, int maxResults) {
+        log.info("Generating top {} event predictions for user {}.", maxResults, userId);
+
+        // Select candidates for suggestion
+        List<Long> interactedEvents = interactionRepository.findInteractedEvents(userId);
+        List<Long> recentlyInteractedEvents = interactionRepository.findRecentlyInteractedEvents(
+            userId, properties.getMaxRecentEventsForPrediction());
+        log.debug("User {} recently interacted with {} events (max {}).", userId,
+            recentlyInteractedEvents.size(), properties.getMaxRecentEventsForPrediction());
+
+        List<Long> similarEvents = similarityRepository.findTopSimilarToSet(
+            recentlyInteractedEvents, maxResults);
+        log.debug("Found {} candidate events similar to user {}'s recently interacted events (based on {} events, max {} results).",
+            similarEvents.size(), userId, recentlyInteractedEvents.size(), maxResults);
+
+        if (similarEvents.isEmpty()) {
+            log.info("No similar events found as candidates for user {}. Returning empty predictions.", userId);
+            return List.of();
+        }
+
+        // Find neighbours for candidates
+        Map<Long, List<Recommendation>> neighbourEvents =
+            similarityRepository.findNeighbourEventsFrom(
+            similarEvents, interactedEvents, properties.getMaxNeighboursForPrediction());
+        log.debug("Found neighbour events for {} candidate events with max {} neighbours each.",
+            similarEvents.size(), properties.getMaxNeighboursForPrediction());
+
+        // Collect all unique event IDs from neighbour events for fetching weights
+        List<Long> neighbourEventIds = neighbourEvents.values().stream()
+            .flatMap(List::stream)
+            .map(Recommendation::getEventId)
+            .collect(Collectors.toList());
+
+        Map<Long, Double> neighbourUserWeights = interactionRepository.findInteractionWeights(userId,
+            neighbourEventIds);
+
+        // Calculate predicted scores based on neighbour scores
+        List<Recommendation> predictions = similarEvents.stream().map(candidateEventId  -> {
+            List<Recommendation> neighbours = neighbourEvents.getOrDefault(candidateEventId, List.of());
+            if (neighbours.isEmpty()) {
+                log.debug("Candidate event {} has no neighbours. Predicted score will be 0.0.", candidateEventId);
+                return new Recommendation(candidateEventId, 0.0); // Nothing to base the prediction on
+            }
+
+            // Calculate prediction for candidate
+            double weightedSumOfScores = neighbours.stream().mapToDouble(
+                neighbour -> neighbour.getScore() * neighbourUserWeights.getOrDefault(
+                    neighbour.getEventId(), 0.0)).sum();
+            double sumOfSimilarities = neighbours.stream().mapToDouble(Recommendation::getScore).sum();
+            double predictedScore = (sumOfSimilarities == 0) ? 0.0 : weightedSumOfScores / sumOfSimilarities;
+
+            log.debug("Calculated predicted score for candidate event {}: {} (weightedSum: {}, sumSimilarities: {})",
+                candidateEventId , predictedScore, weightedSumOfScores, sumOfSimilarities);
+            return new Recommendation(candidateEventId , predictedScore);
+        }).toList();
+
+        log.info("Finished generating {} event predictions for user {}.", predictions.size(), userId);
+        return predictions;
+    }
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/config/RecommendationProperties.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/config/RecommendationProperties.java
new file mode 100644
index 0000000..be58288
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/application/config/RecommendationProperties.java
@@ -0,0 +1,21 @@
+package ru.practicum.ewm.analyzer.application.config;
+
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import ru.practicum.ewm.analyzer.domain.UserActionType;
+
+@ConfigurationProperties(prefix = "recommendations")
+@Getter
+@Setter
+public class RecommendationProperties {
+    private Map<String, Double> actionWeights;
+
+    private int maxRecentEventsForPrediction = 10;
+    private int maxNeighboursForPrediction = 10;
+
+    public Double getActionWeight(UserActionType actionType) {
+        return this.actionWeights.get(actionType.name());
+    }
+}
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/EventSimilarity.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/EventSimilarity.java
new file mode 100644
index 0000000..2975fdb
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/EventSimilarity.java
@@ -0,0 +1,33 @@
+package ru.practicum.ewm.analyzer.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Table(name = "event_similarities", uniqueConstraints = @UniqueConstraint(columnNames = {"event_a",
+    "event_b"}))
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class EventSimilarity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @Column(name = "event_a", nullable = false)
+    private Long eventA; // The smaller ID
+    @Column(name = "event_b", nullable = false)
+    private Long eventB; // The larger ID
+    @Column(nullable = false)
+    private Double score;
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/EventSimilarityRepository.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/EventSimilarityRepository.java
new file mode 100644
index 0000000..03e2082
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/EventSimilarityRepository.java
@@ -0,0 +1,66 @@
+package ru.practicum.ewm.analyzer.domain;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+public interface EventSimilarityRepository {
+
+    /**
+     * Retrieves event similarity data for a specific pair of events.
+     * The method considers the pair (eventA, eventB) regardless of the order, typically by
+     * normalizing the event IDs internally (e.g., using {@code Math.min} and {@code Math.max}).
+     *
+     * @param eventA The ID of the first event in the pair.
+     * @param eventB The ID of the second event in the pair.
+     * @return An {@link Optional} containing the {@link EventSimilarity} object if data for the pair is found,
+     *         or an empty {@link Optional} otherwise.
+     */
+    Optional<EventSimilarity> findByEventAAndEventB(long eventA, long eventB);
+
+    /**
+     * Saves a new event similarity record or updates an existing one.
+     *
+     * @param similarity The {@link EventSimilarity} object to be saved.
+     * @return The saved {@link EventSimilarity} object, possibly with generated IDs or updated fields.
+     */
+    EventSimilarity save(EventSimilarity similarity);
+
+    /**
+     * Retrieves a specified number of events that are most similar to a target event,
+     * excluding any events provided in the exclusion list. The results are ordered by similarity score.
+     *
+     * @param eventId The ID of the primary event for which similar events are sought.
+     * @param excludedEvents A {@link Collection} of event IDs that should be excluded from the search results.
+     * @param maxResults The maximum number of similar events to return.
+     * @return A {@link List} of {@link Recommendation} objects, representing the top similar events
+     *         that are not in the excluded list, up to {@code maxResults}.
+     */
+    List<Recommendation> findTopSimilarExcluding(long eventId, Collection<Long> excludedEvents, int maxResults);
+
+    /**
+     * Retrieves the `maxResults` number of top events based on their average similarity to a given set of events.
+     * The returned list is ordered by the average similarity score in descending order.
+     *
+     * @param recentlyInteractedEvents A {@link Collection} of event IDs representing the base set for similarity calculation.
+     * @param maxResults The maximum number of top similar events to return.
+     * @return A {@link List} of {@code Long} representing the IDs of the top similar events, ordered by average similarity.
+     */
+    List<Long> findTopSimilarToSet(Collection<Long> recentlyInteractedEvents, int maxResults);
+
+    /**
+     * Retrieves at most `maxNeighbours` most similar events from a list of candidate events
+     * for each of the given set of primary events.
+     * The result maps each primary event ID to a list of its most similar "neighbor" events
+     * (with their similarity scores) found within the candidate pool, ordered by similarity.
+     *
+     * @param primaryEvents A {@link Collection} of event IDs for which to find neighbor events.
+     * @param candidates A {@link Collection} of event IDs from which the neighbor events should be selected.
+     * @param maxNeighbours The maximum number of neighbor events to retrieve for each primary event.
+     * @return A {@link Map} where keys are event IDs from {@code primaryEvents} and values are
+     *         {@link List}s of {@link Recommendation} objects, representing their top similar
+     *         neighbors from the {@code candidates} collection.
+     */
+    Map<Long, List<Recommendation>> findNeighbourEventsFrom(Collection<Long> primaryEvents, Collection<Long> candidates, int maxNeighbours);
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/Recommendation.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/Recommendation.java
new file mode 100644
index 0000000..28c0093
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/Recommendation.java
@@ -0,0 +1,11 @@
+package ru.practicum.ewm.analyzer.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class Recommendation {
+    private long eventId;
+    private double score;
+}
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserActionType.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserActionType.java
new file mode 100644
index 0000000..b48006a
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserActionType.java
@@ -0,0 +1,7 @@
+package ru.practicum.ewm.analyzer.domain;
+
+public enum UserActionType {
+    VIEW,
+    REGISTER,
+    LIKE
+}
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserInteraction.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserInteraction.java
new file mode 100644
index 0000000..7b88134
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserInteraction.java
@@ -0,0 +1,39 @@
+package ru.practicum.ewm.analyzer.domain;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import java.time.Instant;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@Entity
+@Table(name = "user_interactions")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@EntityListeners(AuditingEntityListener.class)
+public class UserInteraction {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @Column(name = "user_id", nullable = false)
+    private Long userId;
+    @Column(name = "event_id", nullable = false)
+    private Long eventId;
+    @Column(nullable = false)
+    private Double weight;
+    @CreationTimestamp
+    @Column(nullable = false, updatable = false)
+    private Instant interactionTime;
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserInteractionRepository.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserInteractionRepository.java
new file mode 100644
index 0000000..676dc0c
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/domain/UserInteractionRepository.java
@@ -0,0 +1,56 @@
+package ru.practicum.ewm.analyzer.domain;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public interface UserInteractionRepository {
+
+    /**
+     * Saves a new user interaction record or updates an existing one.
+     *
+     * @param interaction The {@link UserInteraction} object to be saved.
+     * @return The saved {@link UserInteraction} object, possibly with generated IDs or updated fields.
+     */
+    UserInteraction save(UserInteraction interaction);
+
+    /**
+     * Retrieves a list of event IDs that a specific user has interacted with.
+     *
+     * @param userId The ID of the user whose interactions are to be retrieved.
+     * @return A {@link List} of {@code Long} representing the IDs of events the user has interacted with.
+     */
+    List<Long> findInteractedEvents(long userId);
+
+    /**
+     * Retrieves a list of aggregated interaction counts (or sums of maximum interaction weights)
+     * for a given collection of events across all users.
+     *
+     * @param eventIds A {@link Collection} of event IDs for which to retrieve interaction counts.
+     * @return A {@link List} of {@link Recommendation} objects, where each object contains
+     *         an event ID and its corresponding aggregated interaction count or sum.
+     */
+    List<Recommendation> findInteractionsCount(Collection<Long> eventIds);
+
+    /**
+     * Retrieves a list of event IDs that a specific user has most recently interacted with,
+     * up to a maximum number of results. The events are ordered by recency of interaction.
+     *
+     * @param userId The ID of the user whose recent interactions are to be retrieved.
+     * @param maxResults The maximum number of recently interacted events to return.
+     * @return A {@link List} of {@code Long} representing the IDs of events the user has most recently interacted with, ordered by recency.
+     */
+    List<Long> findRecentlyInteractedEvents(long userId, int maxResults);
+
+    /**
+     * Retrieves the maximum interaction weights for a given set of events specific to a particular user.
+     * This method returns a map where keys are event IDs and values are the corresponding
+     * maximum interaction weights for the specified user with those events.
+     *
+     * @param userId The ID of the user whose interaction weights are to be retrieved.
+     * @param eventIds A {@link Collection} of event IDs for which to retrieve interaction weights.
+     * @return A {@link Map} where keys are event IDs and values are the specified user's
+     *         corresponding maximum interaction weights for those events.
+     */
+    Map<Long, Double> findInteractionWeights(long userId, Collection<Long> eventIds);
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/EventSimilarityConsumer.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/EventSimilarityConsumer.java
new file mode 100644
index 0000000..f1c04cd
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/EventSimilarityConsumer.java
@@ -0,0 +1,27 @@
+package ru.practicum.ewm.analyzer.infrastructure.kafka;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+import ru.practicum.ewm.analyzer.application.IngestionService;
+import ru.practicum.ewm.stats.kafka.EventSimilarityAvro;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class EventSimilarityConsumer {
+
+    private final IngestionService ingestionService;
+
+    @KafkaListener(
+        id = "similarity-listener",
+        containerFactory = "similarityContainerFactory",
+        topics = "${kafka.topic.events-similarity}"
+    )
+    public void consumeSimilarity(EventSimilarityAvro similarity) {
+        log.info("Received similarity data for events {} and {}", similarity.getEventA(), similarity.getEventB());
+        ingestionService.processEventSimilarity(similarity.getEventA(), similarity.getEventB(), similarity.getScore());
+    }
+
+}
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/UserActionConsumer.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/UserActionConsumer.java
new file mode 100644
index 0000000..b7c87d8
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/UserActionConsumer.java
@@ -0,0 +1,28 @@
+package ru.practicum.ewm.analyzer.infrastructure.kafka;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.stereotype.Component;
+import ru.practicum.ewm.analyzer.application.IngestionService;
+import ru.practicum.ewm.analyzer.domain.UserActionType;
+import ru.practicum.ewm.stats.kafka.UserActionAvro;
+
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class UserActionConsumer {
+
+    private final IngestionService ingestionService;
+
+    @KafkaListener(
+        id = "action-listener",
+        containerFactory = "actionContainerFactory",
+        topics = "${kafka.topic.user-actions}"
+    )
+    public void consumeAction(UserActionAvro action) {
+        log.info("Received action from user {} on event {}", action.getUserId(), action.getEventId());
+        ingestionService.processUserAction(action.getUserId(), action.getEventId(), UserActionType.valueOf(action.getActionType().name()));
+    }
+
+}
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/config/KafkaConsumerConfig.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/config/KafkaConsumerConfig.java
new file mode 100644
index 0000000..6667993
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/kafka/config/KafkaConsumerConfig.java
@@ -0,0 +1,57 @@
+package ru.practicum.ewm.analyzer.infrastructure.kafka.config;
+
+import java.util.HashMap;
+import java.util.Map;
+import lombok.RequiredArgsConstructor;
+import org.apache.kafka.clients.consumer.ConsumerConfig;
+import org.apache.kafka.common.serialization.StringDeserializer;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.config.KafkaListenerContainerFactory;
+import org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.kafka.core.DefaultKafkaConsumerFactory;
+import ru.practicum.ewm.stats.common.kafka.EventSimilarityAvroDeserializer;
+import ru.practicum.ewm.stats.common.kafka.UserActionAvroDeserializer;
+import ru.practicum.ewm.stats.kafka.EventSimilarityAvro;
+import ru.practicum.ewm.stats.kafka.UserActionAvro;
+
+@Configuration
+@RequiredArgsConstructor
+public class KafkaConsumerConfig {
+
+    private final KafkaProperties kafkaProperties;
+
+    // --- FACTORY FOR USER ACTIONS ---
+    @Bean
+    public ConsumerFactory<String, UserActionAvro> userActionConsumerFactory() {
+        Map<String, Object> props = new HashMap<>(kafkaProperties.buildConsumerProperties());
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, UserActionAvroDeserializer.class);
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+        return new DefaultKafkaConsumerFactory<>(props);
+    }
+
+    @Bean
+    public KafkaListenerContainerFactory<?> actionContainerFactory() {
+        ConcurrentKafkaListenerContainerFactory<String, UserActionAvro> factory = new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(userActionConsumerFactory());
+        return factory;
+    }
+
+    // --- FACTORY FOR EVENT SIMILARITIES ---
+    @Bean
+    public ConsumerFactory<String, EventSimilarityAvro> eventSimilarityConsumerFactory() {
+        Map<String, Object> props = new HashMap<>(kafkaProperties.buildConsumerProperties());
+        props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, EventSimilarityAvroDeserializer.class);
+        props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, StringDeserializer.class);
+        return new DefaultKafkaConsumerFactory<>(props);
+    }
+
+    @Bean
+    public KafkaListenerContainerFactory<?> similarityContainerFactory() {
+        ConcurrentKafkaListenerContainerFactory<String, EventSimilarityAvro> factory = new ConcurrentKafkaListenerContainerFactory<>();
+        factory.setConsumerFactory(eventSimilarityConsumerFactory());
+        return factory;
+    }
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/mapper/RecommendationMapper.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/mapper/RecommendationMapper.java
new file mode 100644
index 0000000..a0ac132
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/mapper/RecommendationMapper.java
@@ -0,0 +1,21 @@
+package ru.practicum.ewm.analyzer.infrastructure.mapper;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Mappings;
+import ru.practicum.ewm.analyzer.domain.Recommendation;
+import ru.practicum.ewm.stats.grpc.RecommendedEventProto;
+
+@Mapper(componentModel = "spring")
+public interface RecommendationMapper {
+
+    @Mappings({
+        @Mapping(target = "mergeFrom", ignore = true),
+        @Mapping(target = "clearField", ignore = true),
+        @Mapping(target = "clearOneof", ignore = true),
+        @Mapping(target = "unknownFields", ignore = true),
+        @Mapping(target = "mergeUnknownFields", ignore = true),
+        @Mapping(target = "allFields", ignore = true),
+    })
+    RecommendedEventProto toProto(Recommendation recommendation);
+}
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/persistence/JpaEventSimilarityRepository.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/persistence/JpaEventSimilarityRepository.java
new file mode 100644
index 0000000..dd903d4
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/persistence/JpaEventSimilarityRepository.java
@@ -0,0 +1,109 @@
+package ru.practicum.ewm.analyzer.infrastructure.persistence;
+
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import ru.practicum.ewm.analyzer.domain.EventSimilarity;
+import ru.practicum.ewm.analyzer.domain.EventSimilarityRepository;
+import ru.practicum.ewm.analyzer.domain.Recommendation;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public interface JpaEventSimilarityRepository extends EventSimilarityRepository, JpaRepository<EventSimilarity, Long> {
+
+    Optional<EventSimilarity> findByEventAAndEventB(long eventA, long eventB);
+
+    @Override
+    default List<Recommendation> findTopSimilarExcluding(long eventId, Collection<Long> excludedEvents, int maxResults) {
+        Pageable limit = PageRequest.of(0, maxResults);
+        return findTopSimilarExcludingPageable(eventId, excludedEvents, limit);
+    }
+
+    @Query(value = """
+        SELECT new ru.practicum.ewm.analyzer.domain.Recommendation(
+            CASE WHEN es.eventA = :eventId THEN es.eventB ELSE es.eventA END,
+            es.score
+        )
+        FROM EventSimilarity es
+        WHERE (es.eventA = :eventId OR es.eventB = :eventId)
+          AND (CASE WHEN es.eventA = :eventId THEN es.eventB ELSE es.eventA END NOT IN :excludedEvents)
+        ORDER BY es.score DESC
+    """)
+    List<Recommendation> findTopSimilarExcludingPageable(@Param("eventId") long eventId,
+        @Param("excludedEvents") Collection<Long> excludedEvents,
+        Pageable pageable);
+
+    @Override
+    default List<Long> findTopSimilarToSet(Collection<Long> recentlyInteractedEvents, int maxResults) {
+        if (recentlyInteractedEvents == null || recentlyInteractedEvents.isEmpty()) {
+            return List.of();
+        }
+        Pageable limit = PageRequest.of(0, maxResults);
+        return findTopSimilarToSetPageable(recentlyInteractedEvents, limit);
+    }
+
+    @Query(value = """
+        SELECT CASE WHEN es.eventA IN :eventSet THEN es.eventB ELSE es.eventA END as similarEventId
+        FROM EventSimilarity es
+        WHERE (es.eventA IN :eventSet AND es.eventB NOT IN :eventSet)
+           OR (es.eventB IN :eventSet AND es.eventA NOT IN :eventSet)
+        GROUP BY similarEventId
+        ORDER BY AVG(es.score) DESC
+    """)
+    List<Long> findTopSimilarToSetPageable(@Param("eventSet") Collection<Long> recentlyInteractedEvents,
+        Pageable pageable);
+
+    @Override
+    default Map<Long, List<Recommendation>> findNeighbourEventsFrom(Collection<Long> primaryEvents,
+        Collection<Long> candidates,
+        int maxNeighbours) {
+        if (primaryEvents == null || primaryEvents.isEmpty() || candidates == null || candidates.isEmpty()) {
+            return Map.of();
+        }
+
+        List<NeighborProjection> results = findTopNNeighborsNative(primaryEvents, candidates, maxNeighbours);
+
+        return results.stream()
+            .collect(Collectors.groupingBy(
+                NeighborProjection::getPrimaryEvent,
+                Collectors.mapping(
+                    proj -> new Recommendation(proj.getNeighborEvent(), proj.getScore()),
+                    Collectors.toList()
+                )
+            ));
+    }
+
+    interface NeighborProjection {
+        Long getPrimaryEvent();
+        Long getNeighborEvent();
+        Double getScore();
+    }
+
+    @Query(value = """
+        WITH ranked_neighbors AS (
+            SELECT
+                primary_event,
+                neighbor_event,
+                score,
+                ROW_NUMBER() OVER(PARTITION BY primary_event ORDER BY score DESC) as rn
+            FROM (
+                SELECT event_a as primary_event, event_b as neighbor_event, score FROM event_similarities WHERE event_a IN :primaryEvents AND event_b IN :candidates
+                UNION ALL
+                SELECT event_b as primary_event, event_a as neighbor_event, score FROM event_similarities WHERE event_b IN :primaryEvents AND event_a IN :candidates
+            ) as pairs
+        )
+        SELECT primary_event as primaryEvent, neighbor_event as neighborEvent, score
+        FROM ranked_neighbors
+        WHERE rn <= :maxNeighbours
+        ORDER BY primary_event, score DESC
+    """, nativeQuery = true)
+    List<NeighborProjection> findTopNNeighborsNative(@Param("primaryEvents") Collection<Long> primaryEvents,
+        @Param("candidates") Collection<Long> candidates,
+        @Param("maxNeighbours") int maxNeighbours);
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/persistence/JpaUserInteractionRepository.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/persistence/JpaUserInteractionRepository.java
new file mode 100644
index 0000000..7272439
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/infrastructure/persistence/JpaUserInteractionRepository.java
@@ -0,0 +1,72 @@
+package ru.practicum.ewm.analyzer.infrastructure.persistence;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import ru.practicum.ewm.analyzer.domain.Recommendation;
+import ru.practicum.ewm.analyzer.domain.UserInteraction;
+import ru.practicum.ewm.analyzer.domain.UserInteractionRepository;
+
+public interface JpaUserInteractionRepository extends UserInteractionRepository, JpaRepository<UserInteraction, Long> {
+
+    @Override
+    @Query("""
+        SELECT DISTINCT ui.eventId
+        FROM UserInteraction ui
+        WHERE ui.userId = :userId
+        """)
+    List<Long> findInteractedEvents(@Param("userId") long userId);
+
+    @Query("""
+        SELECT new ru.practicum.ewm.analyzer.domain.Recommendation(T.eventId, SUM(T.maxWeight))
+        FROM (
+            SELECT ui.eventId AS eventId, MAX(ui.weight) AS maxWeight
+            FROM UserInteraction ui
+            WHERE ui.eventId IN :eventIds
+            GROUP BY ui.userId, ui.eventId
+            ) AS T
+            GROUP BY T.eventId
+        """)
+    List<Recommendation> findInteractionsCount(@Param("eventIds") Collection<Long> eventIds);
+
+    @Override
+    default List<Long> findRecentlyInteractedEvents(long userId, int maxResults) {
+        return findRecentlyInteractedEventsPageable(userId, PageRequest.of(0, maxResults));
+    }
+
+    @Query("""
+        SELECT ui.eventId
+        FROM UserInteraction ui
+        WHERE ui.userId = :userId
+        ORDER BY ui.interactionTime DESC
+        """)
+    List<Long> findRecentlyInteractedEventsPageable(@Param("userId") long userId, Pageable pageable);
+
+    @Query("""
+        SELECT ui.eventId AS eventId, MAX(ui.weight) AS weight
+        FROM UserInteraction ui
+        WHERE ui.userId = :userId AND ui.eventId IN :eventIds
+        GROUP BY ui.eventId
+    """)
+    List<InteractionWeightProjection> findMaxWeightsForUserAndEvents(@Param("userId") long userId, @Param("eventIds") Collection<Long> eventIds);
+
+    @Override
+    default Map<Long, Double> findInteractionWeights(long userId, Collection<Long> eventIds) {
+        return findMaxWeightsForUserAndEvents(userId, eventIds).stream()
+            .collect(Collectors.toMap(
+                InteractionWeightProjection::getEventId,
+                InteractionWeightProjection::getWeight
+            ));
+    }
+
+    interface InteractionWeightProjection {
+        Long getEventId();
+        Double getWeight();
+    }
+}
\ No newline at end of file
diff --git a/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/presentation/RecommendationsControllerImpl.java b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/presentation/RecommendationsControllerImpl.java
new file mode 100644
index 0000000..767e4ce
--- /dev/null
+++ b/core/analyzer/src/main/java/ru/practicum/ewm/analyzer/presentation/RecommendationsControllerImpl.java
@@ -0,0 +1,110 @@
+package ru.practicum.ewm.analyzer.presentation;
+
+import io.grpc.Status;
+import io.grpc.stub.StreamObserver;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.server.service.GrpcService;
+import ru.practicum.ewm.analyzer.application.RecommendationsService;
+import ru.practicum.ewm.analyzer.domain.Recommendation;
+import ru.practicum.ewm.analyzer.infrastructure.mapper.RecommendationMapper;
+import ru.practicum.ewm.stats.grpc.InteractionsCountRequestProto;
+import ru.practicum.ewm.stats.grpc.RecommendationsControllerGrpc;
+import ru.practicum.ewm.stats.grpc.RecommendedEventProto;
+import ru.practicum.ewm.stats.grpc.SimilarEventsRequestProto;
+import ru.practicum.ewm.stats.grpc.UserPredictionsRequestProto;
+
+@GrpcService
+@Slf4j
+@RequiredArgsConstructor
+public class RecommendationsControllerImpl extends RecommendationsControllerGrpc.RecommendationsControllerImplBase {
+
+    private final RecommendationsService recommendationsService;
+    private final RecommendationMapper mapper;
+
+    @Override
+    public void getSimilarEvents(
+        SimilarEventsRequestProto request,
+        StreamObserver<RecommendedEventProto> responseObserver) {
+        log.info("gRPC request received for GetSimilarEvents: {}", request);
+
+        try {
+            List<Recommendation> recommendations = recommendationsService.findSimilarEvents(
+                request.getEventId(),
+                request.getUserId(),
+                request.getMaxResults()
+            );
+
+            for (Recommendation recommendation : recommendations) {
+                RecommendedEventProto protoMessage = mapper.toProto(recommendation);
+                responseObserver.onNext(protoMessage);
+            }
+
+            responseObserver.onCompleted();
+            log.info("Successfully streamed {} recommendations.", recommendations.size());
+
+        } catch (Exception e) {
+            log.error("Error processing GetSimilarEvents request", e);
+
+            Status status = Status.INTERNAL.withDescription("An error occurred: " + e.getMessage());
+            responseObserver.onError(status.asRuntimeException());
+        }
+    }
+
+    @Override
+    public void getInteractionsCount(
+        InteractionsCountRequestProto request,
+        StreamObserver<RecommendedEventProto> responseObserver
+    ) {
+        log.info("gRPC request received for GetInteractionsCount: {}", request);
+
+        try {
+            List<Recommendation> recommendations = recommendationsService.getInteractionsCount(
+                request.getEventIdsList()
+            );
+
+            for (Recommendation recommendation : recommendations) {
+                RecommendedEventProto protoMessage = mapper.toProto(recommendation);
+                responseObserver.onNext(protoMessage);
+            }
+
+            responseObserver.onCompleted();
+            log.info("Successfully streamed {} interaction counts.", recommendations.size());
+
+        } catch (Exception e) {
+            log.error("Error processing GetInteractionsCount request", e);
+
+            Status status = Status.INTERNAL.withDescription("An error occurred: " + e.getMessage());
+            responseObserver.onError(status.asRuntimeException());
+        }
+    }
+
+    @Override
+    public void getRecommendationsForUser(
+        UserPredictionsRequestProto request,
+        StreamObserver<RecommendedEventProto> responseObserver
+    ) {
+        log.info("gRPC request received for GetRecommendationsForUser: {}", request);
+        try {
+            List<Recommendation> predictions = recommendationsService.getUserPredictions(
+                request.getUserId(),
+                request.getMaxResults()
+            );
+
+            for (Recommendation prediction : predictions) {
+                RecommendedEventProto protoMessage = mapper.toProto(prediction);
+                responseObserver.onNext(protoMessage);
+            }
+
+            responseObserver.onCompleted();
+            log.info("Successfully streamed {} user predictions.", predictions.size());
+
+        } catch (Exception e) {
+            log.error("Error processing GetRecommendationsForUser request", e);
+
+            Status status = Status.INTERNAL.withDescription("An error occurred: " + e.getMessage());
+            responseObserver.onError(status.asRuntimeException());
+        }
+    }
+}
diff --git a/core/analyzer/src/main/resources/application.yaml b/core/analyzer/src/main/resources/application.yaml
new file mode 100644
index 0000000..08600c8
--- /dev/null
+++ b/core/analyzer/src/main/resources/application.yaml
@@ -0,0 +1,24 @@
+spring:
+  application:
+    name: analyzer
+  profiles:
+    active: postgres, kafka, recommendations
+  config:
+    import: "configserver:"
+  cloud:
+    config:
+      discovery:
+        enabled: true
+        serviceId: config-server
+      fail-fast: true
+      retry:
+        max-attempts: 10
+        initial-interval: 1000
+        useRandomPolicy: true
+
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
+  instance:
+    instance-id: "${spring.application.name}:${random.value}"
\ No newline at end of file
diff --git a/core/collector/Dockerfile b/core/collector/Dockerfile
new file mode 100644
index 0000000..0ff1817
--- /dev/null
+++ b/core/collector/Dockerfile
@@ -0,0 +1,5 @@
+FROM eclipse-temurin:21-jre-jammy
+VOLUME /tmp
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} app.jar
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar"]
\ No newline at end of file
diff --git a/core/collector/pom.xml b/core/collector/pom.xml
new file mode 100644
index 0000000..8d68546
--- /dev/null
+++ b/core/collector/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>ru.practicum</groupId>
+    <artifactId>core</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>collector</artifactId>
+  <packaging>jar</packaging>
+
+  <properties>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>ru.practicum</groupId>
+      <artifactId>serialization</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.kafka</groupId>
+      <artifactId>spring-kafka</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-config</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>net.devh</groupId>
+      <artifactId>grpc-server-spring-boot-starter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mapstruct</groupId>
+      <artifactId>mapstruct</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/core/collector/src/main/java/ru/practicum/ewm/collector/CollectorApplication.java b/core/collector/src/main/java/ru/practicum/ewm/collector/CollectorApplication.java
new file mode 100644
index 0000000..e2dea4d
--- /dev/null
+++ b/core/collector/src/main/java/ru/practicum/ewm/collector/CollectorApplication.java
@@ -0,0 +1,11 @@
+package ru.practicum.ewm.collector;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class CollectorApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(CollectorApplication.class, args);
+    }
+}
\ No newline at end of file
diff --git a/core/collector/src/main/java/ru/practicum/ewm/collector/infrastructure/kafka/UserActionProducer.java b/core/collector/src/main/java/ru/practicum/ewm/collector/infrastructure/kafka/UserActionProducer.java
new file mode 100644
index 0000000..7f2836d
--- /dev/null
+++ b/core/collector/src/main/java/ru/practicum/ewm/collector/infrastructure/kafka/UserActionProducer.java
@@ -0,0 +1,37 @@
+package ru.practicum.ewm.collector.infrastructure.kafka;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Component;
+import ru.practicum.ewm.stats.kafka.UserActionAvro;
+
+@Slf4j
+@Component
+public class UserActionProducer {
+
+    private final String userActionsTopic;
+
+    private final KafkaTemplate<String, UserActionAvro> kafkaTemplate;
+
+    public UserActionProducer(
+        @Value("${kafka.topic.user-actions}") String userActionsTopic,
+        KafkaTemplate<String, UserActionAvro> kafkaTemplate) {
+        this.userActionsTopic = userActionsTopic;
+        this.kafkaTemplate = kafkaTemplate;
+    }
+
+    public void sendUserAction(UserActionAvro userAction) {
+        log.info("Sending user action to Kafka topic '{}': {}", userActionsTopic, userAction);
+
+        kafkaTemplate.send(userActionsTopic, userAction)
+            .whenComplete((result, ex) -> {
+                if (ex == null) {
+                    log.info("Successfully sent user action to offset {}",
+                        result.getRecordMetadata().offset());
+                } else {
+                    log.error("Failed to send user action: {}", ex.getMessage());
+                }
+            });
+    }
+}
diff --git a/core/collector/src/main/java/ru/practicum/ewm/collector/infrastructure/mapper/UserActionMapper.java b/core/collector/src/main/java/ru/practicum/ewm/collector/infrastructure/mapper/UserActionMapper.java
new file mode 100644
index 0000000..acbc5fb
--- /dev/null
+++ b/core/collector/src/main/java/ru/practicum/ewm/collector/infrastructure/mapper/UserActionMapper.java
@@ -0,0 +1,36 @@
+package ru.practicum.ewm.collector.infrastructure.mapper;
+
+import com.google.protobuf.Timestamp;
+import java.time.Instant;
+import org.mapstruct.Mapper;
+import ru.practicum.ewm.stats.grpc.ActionTypeProto;
+import ru.practicum.ewm.stats.grpc.UserActionProto;
+import ru.practicum.ewm.stats.kafka.ActionTypeAvro;
+import ru.practicum.ewm.stats.kafka.UserActionAvro;
+
+@Mapper(componentModel = "spring")
+public interface UserActionMapper {
+
+    UserActionAvro toAvro(UserActionProto userActionProto);
+
+    default ActionTypeAvro toAvroActionType(ActionTypeProto actionTypeProto) {
+        if (actionTypeProto == null) {
+            throw new IllegalArgumentException("ActionTypeProto cannot be null.");
+        }
+
+        return switch (actionTypeProto) {
+            case ACTION_VIEW -> ActionTypeAvro.VIEW;
+            case ACTION_REGISTER -> ActionTypeAvro.REGISTER;
+            case ACTION_LIKE -> ActionTypeAvro.LIKE;
+            case UNRECOGNIZED ->
+                throw new IllegalArgumentException("Cannot map unknown or unrecognized ActionTypeProto: " + actionTypeProto);
+        };
+    }
+
+    default Instant toInstant(Timestamp timestamp) {
+        if (timestamp == null) {
+            return null;
+        }
+        return Instant.ofEpochSecond(timestamp.getSeconds(), timestamp.getNanos());
+    }
+}
diff --git a/core/collector/src/main/java/ru/practicum/ewm/collector/presentation/UserActionControllerImpl.java b/core/collector/src/main/java/ru/practicum/ewm/collector/presentation/UserActionControllerImpl.java
new file mode 100644
index 0000000..5460528
--- /dev/null
+++ b/core/collector/src/main/java/ru/practicum/ewm/collector/presentation/UserActionControllerImpl.java
@@ -0,0 +1,30 @@
+package ru.practicum.ewm.collector.presentation;
+
+import com.google.protobuf.Empty;
+import io.grpc.stub.StreamObserver;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.server.service.GrpcService;
+import ru.practicum.ewm.collector.infrastructure.kafka.UserActionProducer;
+import ru.practicum.ewm.collector.infrastructure.mapper.UserActionMapper;
+import ru.practicum.ewm.stats.grpc.UserActionControllerGrpc;
+import ru.practicum.ewm.stats.grpc.UserActionProto;
+
+@GrpcService
+@Slf4j
+@RequiredArgsConstructor
+public class UserActionControllerImpl extends UserActionControllerGrpc.UserActionControllerImplBase {
+
+    private final UserActionProducer producer;
+    private final UserActionMapper mapper;
+
+    @Override
+    public void collectUserAction(UserActionProto request, StreamObserver<Empty> responseObserver) {
+        log.info("Received user action via gRPC: {}", request);
+
+        producer.sendUserAction(mapper.toAvro(request));
+
+        responseObserver.onNext(Empty.getDefaultInstance());
+        responseObserver.onCompleted();
+    }
+}
\ No newline at end of file
diff --git a/core/collector/src/main/resources/application.yaml b/core/collector/src/main/resources/application.yaml
new file mode 100644
index 0000000..be0803b
--- /dev/null
+++ b/core/collector/src/main/resources/application.yaml
@@ -0,0 +1,24 @@
+spring:
+  application:
+    name: collector
+  profiles:
+    active: kafka
+  config:
+    import: "configserver:"
+  cloud:
+    config:
+      discovery:
+        enabled: true
+        serviceId: config-server
+      fail-fast: true
+      retry:
+        max-attempts: 10
+        initial-interval: 1000
+        useRandomPolicy: true
+
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
+  instance:
+    instance-id: "${spring.application.name}:${random.value}"
\ No newline at end of file
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/CommentServiceApplication.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/CommentServiceApplication.java
similarity index 77%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/CommentServiceApplication.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/CommentServiceApplication.java
index a89c3ef..7f3aebe 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/CommentServiceApplication.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/CommentServiceApplication.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment;
+package ru.practicum.ewm.comment;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,8 +8,8 @@
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients(basePackages = {
-    "ru.practicum.explorewithme.api.client.user",
-    "ru.practicum.explorewithme.api.client.event"
+    "ru.practicum.ewm.api.client.user",
+    "ru.practicum.ewm.api.client.event"
 })
 public class CommentServiceApplication {
     public static void main(String[] args) {
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/CommentService.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/CommentService.java
similarity index 57%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/CommentService.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/application/CommentService.java
index 4466b62..5019cde 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/CommentService.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/CommentService.java
@@ -1,12 +1,12 @@
-package ru.practicum.explorewithme.comment.application;
+package ru.practicum.ewm.comment.application;
 
 import java.util.List;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentAdminDto;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentDto;
-import ru.practicum.explorewithme.api.client.comment.dto.NewCommentDto;
-import ru.practicum.explorewithme.api.client.comment.dto.UpdateCommentDto;
-import ru.practicum.explorewithme.comment.application.params.AdminCommentSearchParams;
-import ru.practicum.explorewithme.comment.application.params.PublicCommentParameters;
+import ru.practicum.ewm.api.client.comment.dto.CommentAdminDto;
+import ru.practicum.ewm.api.client.comment.dto.CommentDto;
+import ru.practicum.ewm.api.client.comment.dto.NewCommentDto;
+import ru.practicum.ewm.api.client.comment.dto.UpdateCommentDto;
+import ru.practicum.ewm.comment.application.params.AdminCommentSearchParams;
+import ru.practicum.ewm.comment.application.params.PublicCommentParameters;
 
 public interface CommentService {
 
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/CommentServiceImpl.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/CommentServiceImpl.java
similarity index 84%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/CommentServiceImpl.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/application/CommentServiceImpl.java
index 551e506..d12aa36 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/CommentServiceImpl.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/CommentServiceImpl.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.application;
+package ru.practicum.ewm.comment.application;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -11,25 +11,25 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentAdminDto;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentDto;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentDtoWithAuthor;
-import ru.practicum.explorewithme.api.client.comment.dto.NewCommentDto;
-import ru.practicum.explorewithme.api.client.comment.dto.UpdateCommentDto;
-import ru.practicum.explorewithme.api.client.event.EventClient;
-import ru.practicum.explorewithme.api.client.event.dto.EventInternalDto;
-import ru.practicum.explorewithme.api.client.event.enums.EventState;
-import ru.practicum.explorewithme.api.client.user.UserClient;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
-import ru.practicum.explorewithme.api.utility.DtoMapper;
-import ru.practicum.explorewithme.comment.application.params.AdminCommentSearchParams;
-import ru.practicum.explorewithme.comment.application.params.PublicCommentParameters;
-import ru.practicum.explorewithme.comment.domain.Comment;
-import ru.practicum.explorewithme.comment.domain.CommentRepository;
-import ru.practicum.explorewithme.comment.infrastructure.mapper.CommentMapper;
+import ru.practicum.ewm.api.client.comment.dto.CommentAdminDto;
+import ru.practicum.ewm.api.client.comment.dto.CommentDto;
+import ru.practicum.ewm.api.client.comment.dto.CommentDtoWithAuthor;
+import ru.practicum.ewm.api.client.comment.dto.NewCommentDto;
+import ru.practicum.ewm.api.client.comment.dto.UpdateCommentDto;
+import ru.practicum.ewm.api.client.event.EventClient;
+import ru.practicum.ewm.api.client.event.dto.EventInternalDto;
+import ru.practicum.ewm.api.client.event.enums.EventState;
+import ru.practicum.ewm.api.client.user.UserClient;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.utility.DtoMapper;
+import ru.practicum.ewm.comment.application.params.AdminCommentSearchParams;
+import ru.practicum.ewm.comment.application.params.PublicCommentParameters;
+import ru.practicum.ewm.comment.domain.Comment;
+import ru.practicum.ewm.comment.domain.CommentRepository;
+import ru.practicum.ewm.comment.infrastructure.mapper.CommentMapper;
 
 @Service
 @RequiredArgsConstructor
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/params/AdminCommentSearchParams.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/params/AdminCommentSearchParams.java
similarity index 83%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/params/AdminCommentSearchParams.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/application/params/AdminCommentSearchParams.java
index c2d73e0..37a5f92 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/params/AdminCommentSearchParams.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/params/AdminCommentSearchParams.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.application.params;
+package ru.practicum.ewm.comment.application.params;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/params/PublicCommentParameters.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/params/PublicCommentParameters.java
similarity index 85%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/params/PublicCommentParameters.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/application/params/PublicCommentParameters.java
index 5db0370..0873ac2 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/application/params/PublicCommentParameters.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/application/params/PublicCommentParameters.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.application.params;
+package ru.practicum.ewm.comment.application.params;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/domain/Comment.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/domain/Comment.java
similarity index 98%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/domain/Comment.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/domain/Comment.java
index 05a4ca0..da94a70 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/domain/Comment.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/domain/Comment.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.domain;
+package ru.practicum.ewm.comment.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/domain/CommentRepository.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/domain/CommentRepository.java
similarity index 92%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/domain/CommentRepository.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/domain/CommentRepository.java
index 27d7672..969bdb4 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/domain/CommentRepository.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/domain/CommentRepository.java
@@ -1,9 +1,9 @@
-package ru.practicum.explorewithme.comment.domain;
+package ru.practicum.ewm.comment.domain;
 
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Sort;
-import ru.practicum.explorewithme.comment.application.params.AdminCommentSearchParams;
+import ru.practicum.ewm.comment.application.params.AdminCommentSearchParams;
 
 public interface CommentRepository {
 
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/config/JpaAuditingConfig.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/config/JpaAuditingConfig.java
similarity index 78%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/config/JpaAuditingConfig.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/config/JpaAuditingConfig.java
index b6a4e90..3f49d10 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/config/JpaAuditingConfig.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/config/JpaAuditingConfig.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.infrastructure.config;
+package ru.practicum.ewm.comment.infrastructure.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/mapper/CommentMapper.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/mapper/CommentMapper.java
similarity index 85%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/mapper/CommentMapper.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/mapper/CommentMapper.java
index 969777e..ca188fa 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/mapper/CommentMapper.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/mapper/CommentMapper.java
@@ -1,13 +1,13 @@
-package ru.practicum.explorewithme.comment.infrastructure.mapper;
+package ru.practicum.ewm.comment.infrastructure.mapper;
 
 import java.util.List;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentAdminDto;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentDto;
-import ru.practicum.explorewithme.api.client.comment.dto.NewCommentDto;
-import ru.practicum.explorewithme.comment.domain.Comment;
+import ru.practicum.ewm.api.client.comment.dto.CommentAdminDto;
+import ru.practicum.ewm.api.client.comment.dto.CommentDto;
+import ru.practicum.ewm.api.client.comment.dto.NewCommentDto;
+import ru.practicum.ewm.comment.domain.Comment;
 
 @Mapper(componentModel = "spring")
 public interface CommentMapper {
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/persistence/CommentRepositoryAdapter.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/persistence/CommentRepositoryAdapter.java
similarity index 86%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/persistence/CommentRepositoryAdapter.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/persistence/CommentRepositoryAdapter.java
index 379a593..d058b3c 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/persistence/CommentRepositoryAdapter.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/persistence/CommentRepositoryAdapter.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.infrastructure.persistence;
+package ru.practicum.ewm.comment.infrastructure.persistence;
 
 import com.querydsl.core.BooleanBuilder;
 import java.util.List;
@@ -8,10 +8,10 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Component;
-import ru.practicum.explorewithme.comment.application.params.AdminCommentSearchParams;
-import ru.practicum.explorewithme.comment.domain.Comment;
-import ru.practicum.explorewithme.comment.domain.CommentRepository;
-import ru.practicum.explorewithme.comment.domain.QComment;
+import ru.practicum.ewm.comment.application.params.AdminCommentSearchParams;
+import ru.practicum.ewm.comment.domain.Comment;
+import ru.practicum.ewm.comment.domain.CommentRepository;
+import ru.practicum.ewm.comment.domain.QComment;
 
 @Component
 @RequiredArgsConstructor
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/persistence/JpaCommentRepository.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/persistence/JpaCommentRepository.java
similarity index 81%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/persistence/JpaCommentRepository.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/persistence/JpaCommentRepository.java
index 1d9a979..ea8aebc 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/persistence/JpaCommentRepository.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/infrastructure/persistence/JpaCommentRepository.java
@@ -1,11 +1,11 @@
-package ru.practicum.explorewithme.comment.infrastructure.persistence;
+package ru.practicum.ewm.comment.infrastructure.persistence;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
-import ru.practicum.explorewithme.comment.domain.Comment;
+import ru.practicum.ewm.comment.domain.Comment;
 
 @Repository
 public interface JpaCommentRepository extends JpaRepository<Comment, Long>, QuerydslPredicateExecutor<Comment> {
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/admin/AdminCommentController.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/admin/AdminCommentController.java
similarity index 92%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/admin/AdminCommentController.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/admin/AdminCommentController.java
index 2943e69..7002213 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/admin/AdminCommentController.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/admin/AdminCommentController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.presentation.admin;
+package ru.practicum.ewm.comment.presentation.admin;
 
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.PositiveOrZero;
@@ -15,9 +15,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentAdminDto;
-import ru.practicum.explorewithme.comment.application.params.AdminCommentSearchParams;
-import ru.practicum.explorewithme.comment.application.CommentService;
+import ru.practicum.ewm.api.client.comment.dto.CommentAdminDto;
+import ru.practicum.ewm.comment.application.params.AdminCommentSearchParams;
+import ru.practicum.ewm.comment.application.CommentService;
 
 @RestController
 @RequestMapping("/admin/comments")
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/error/GlobalExceptionHandler.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/error/GlobalExceptionHandler.java
similarity index 90%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/error/GlobalExceptionHandler.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/error/GlobalExceptionHandler.java
index efced85..4a34ac1 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/error/GlobalExceptionHandler.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/error/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.presentation.error;
+package ru.practicum.ewm.comment.presentation.error;
 
 import java.time.LocalDateTime;
 import lombok.extern.slf4j.Slf4j;
@@ -7,10 +7,10 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.practicum.explorewithme.api.error.ApiError;
-import ru.practicum.explorewithme.api.error.BaseExceptionHandler;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.error.ApiError;
+import ru.practicum.ewm.api.error.BaseExceptionHandler;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
 
 @RestControllerAdvice
 @Slf4j
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/priv/PrivateCommentController.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/priv/PrivateCommentController.java
similarity index 90%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/priv/PrivateCommentController.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/priv/PrivateCommentController.java
index 4a0b111..4503754 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/priv/PrivateCommentController.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/priv/PrivateCommentController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.presentation.priv;
+package ru.practicum.ewm.comment.presentation.priv;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -19,10 +19,10 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentDto;
-import ru.practicum.explorewithme.api.client.comment.dto.NewCommentDto;
-import ru.practicum.explorewithme.api.client.comment.dto.UpdateCommentDto;
-import ru.practicum.explorewithme.comment.application.CommentService;
+import ru.practicum.ewm.api.client.comment.dto.CommentDto;
+import ru.practicum.ewm.api.client.comment.dto.NewCommentDto;
+import ru.practicum.ewm.api.client.comment.dto.UpdateCommentDto;
+import ru.practicum.ewm.comment.application.CommentService;
 
 @RestController
 @RequestMapping("/users/{userId}/comments")
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/pub/PublicCommentController.java b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/pub/PublicCommentController.java
similarity index 89%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/pub/PublicCommentController.java
rename to core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/pub/PublicCommentController.java
index e469082..faeec85 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/presentation/pub/PublicCommentController.java
+++ b/core/comment-service/src/main/java/ru/practicum/ewm/comment/presentation/pub/PublicCommentController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.presentation.pub;
+package ru.practicum.ewm.comment.presentation.pub;
 
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Positive;
@@ -15,9 +15,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.comment.dto.CommentDto;
-import ru.practicum.explorewithme.comment.application.CommentService;
-import ru.practicum.explorewithme.comment.application.params.PublicCommentParameters;
+import ru.practicum.ewm.api.client.comment.dto.CommentDto;
+import ru.practicum.ewm.comment.application.CommentService;
+import ru.practicum.ewm.comment.application.params.PublicCommentParameters;
 
 @RestController
 @RequestMapping("/events/{eventId}/comments")
diff --git a/core/comment-service/src/main/resources/application.yaml b/core/comment-service/src/main/resources/application.yaml
index 5c66cea..541f89b 100644
--- a/core/comment-service/src/main/resources/application.yaml
+++ b/core/comment-service/src/main/resources/application.yaml
@@ -21,5 +21,4 @@ eureka:
     serviceUrl:
       defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
   instance:
-    instance-id: "${spring.application.name}:${random.value}"
-    leaseRenewalIntervalInSeconds: 10
\ No newline at end of file
+    instance-id: "${spring.application.name}:${random.value}"
\ No newline at end of file
diff --git a/core/event-service/pom.xml b/core/event-service/pom.xml
index 2806e05..beeee2a 100644
--- a/core/event-service/pom.xml
+++ b/core/event-service/pom.xml
@@ -39,11 +39,6 @@
       <artifactId>stats-client</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>ru.practicum</groupId>
-      <artifactId>stats-dto</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>ru.practicum</groupId>
       <artifactId>interaction-api</artifactId>
@@ -87,23 +82,6 @@
       <groupId>org.mapstruct</groupId>
       <artifactId>mapstruct</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>postgresql</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/EventServiceApplication.java b/core/event-service/src/main/java/ru/practicum/ewm/event/EventServiceApplication.java
similarity index 72%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/EventServiceApplication.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/EventServiceApplication.java
index 70437f0..ea62159 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/EventServiceApplication.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/EventServiceApplication.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event;
+package ru.practicum.ewm.event;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,9 +8,9 @@
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients(basePackages = {
-    "ru.practicum.explorewithme.stats.client",
-    "ru.practicum.explorewithme.api.client.user",
-    "ru.practicum.explorewithme.api.client.request"
+    "ru.practicum.ewm.stats.client",
+    "ru.practicum.ewm.api.client.user",
+    "ru.practicum.ewm.api.client.request"
 })
 public class EventServiceApplication {
     public static void main(String[] args) {
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CategoryService.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CategoryService.java
similarity index 65%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CategoryService.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/CategoryService.java
index 94d5735..03ad52c 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CategoryService.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CategoryService.java
@@ -1,8 +1,8 @@
-package ru.practicum.explorewithme.event.application;
+package ru.practicum.ewm.event.application;
 
 import java.util.List;
-import ru.practicum.explorewithme.api.client.event.dto.CategoryDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCategoryDto;
+import ru.practicum.ewm.api.client.event.dto.CategoryDto;
+import ru.practicum.ewm.api.client.event.dto.NewCategoryDto;
 
 public interface CategoryService {
 
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CategoryServiceImpl.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CategoryServiceImpl.java
similarity index 80%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CategoryServiceImpl.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/CategoryServiceImpl.java
index f85d226..7b9a857 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CategoryServiceImpl.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CategoryServiceImpl.java
@@ -1,19 +1,19 @@
-package ru.practicum.explorewithme.event.application;
+package ru.practicum.ewm.event.application;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.practicum.explorewithme.api.client.event.dto.CategoryDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCategoryDto;
-import ru.practicum.explorewithme.api.error.EntityAlreadyExistsException;
-import ru.practicum.explorewithme.api.error.EntityDeletedException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
-import ru.practicum.explorewithme.event.domain.Category;
-import ru.practicum.explorewithme.event.domain.CategoryRepository;
-import ru.practicum.explorewithme.event.domain.EventRepository;
-import ru.practicum.explorewithme.event.infrastructure.mapper.CategoryMapper;
+import ru.practicum.ewm.api.client.event.dto.CategoryDto;
+import ru.practicum.ewm.api.client.event.dto.NewCategoryDto;
+import ru.practicum.ewm.api.error.EntityAlreadyExistsException;
+import ru.practicum.ewm.api.error.EntityDeletedException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
+import ru.practicum.ewm.event.domain.Category;
+import ru.practicum.ewm.event.domain.CategoryRepository;
+import ru.practicum.ewm.event.domain.EventRepository;
+import ru.practicum.ewm.event.infrastructure.mapper.CategoryMapper;
 
 @Service
 @RequiredArgsConstructor
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CompilationService.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CompilationService.java
similarity index 58%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CompilationService.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/CompilationService.java
index 572aea6..4c843d4 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CompilationService.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CompilationService.java
@@ -1,9 +1,9 @@
-package ru.practicum.explorewithme.event.application;
+package ru.practicum.ewm.event.application;
 
 import java.util.List;
-import ru.practicum.explorewithme.api.client.event.dto.CompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateCompilationRequestDto;
+import ru.practicum.ewm.api.client.event.dto.CompilationDto;
+import ru.practicum.ewm.api.client.event.dto.NewCompilationDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateCompilationRequestDto;
 
 public interface CompilationService {
     List<CompilationDto> getCompilations(Boolean pinned, Integer from, Integer size);
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CompilationServiceImpl.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CompilationServiceImpl.java
similarity index 86%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CompilationServiceImpl.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/CompilationServiceImpl.java
index 6917782..4e7ae5a 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/CompilationServiceImpl.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/CompilationServiceImpl.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.application;
+package ru.practicum.ewm.event.application;
 
 import java.util.HashSet;
 import java.util.List;
@@ -9,17 +9,17 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.practicum.explorewithme.api.client.event.dto.CompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventShortDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateCompilationRequestDto;
-import ru.practicum.explorewithme.api.error.EntityAlreadyExistsException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
-import ru.practicum.explorewithme.event.domain.Compilation;
-import ru.practicum.explorewithme.event.domain.CompilationRepository;
-import ru.practicum.explorewithme.event.domain.Event;
-import ru.practicum.explorewithme.event.domain.EventRepository;
-import ru.practicum.explorewithme.event.infrastructure.mapper.CompilationMapper;
+import ru.practicum.ewm.api.client.event.dto.CompilationDto;
+import ru.practicum.ewm.api.client.event.dto.EventShortDto;
+import ru.practicum.ewm.api.client.event.dto.NewCompilationDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateCompilationRequestDto;
+import ru.practicum.ewm.api.error.EntityAlreadyExistsException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
+import ru.practicum.ewm.event.domain.Compilation;
+import ru.practicum.ewm.event.domain.CompilationRepository;
+import ru.practicum.ewm.event.domain.Event;
+import ru.practicum.ewm.event.domain.EventRepository;
+import ru.practicum.ewm.event.infrastructure.mapper.CompilationMapper;
 
 @Service
 @RequiredArgsConstructor
@@ -130,7 +130,7 @@ private CompilationDto addConfirmedRequestsAndViews(CompilationDto compilationDt
         if (compilationDto.getEvents() != null) {
             for (EventShortDto eventDto : compilationDto.getEvents()) {
                 eventDto.setConfirmedRequests(0L);
-                eventDto.setViews(0L);
+                eventDto.setRating(0.0);
             }
         }
         return compilationDto;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/EventService.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/EventService.java
similarity index 52%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/EventService.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/EventService.java
index 1dd2e25..82f1905 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/EventService.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/EventService.java
@@ -1,14 +1,14 @@
-package ru.practicum.explorewithme.event.application;
+package ru.practicum.ewm.event.application;
 
 import java.util.List;
-import ru.practicum.explorewithme.api.client.event.dto.EventFullDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventInternalDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventShortDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewEventDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateEventAdminRequestDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateEventUserRequestDto;
-import ru.practicum.explorewithme.event.application.params.AdminEventSearchParams;
-import ru.practicum.explorewithme.event.application.params.PublicEventSearchParams;
+import ru.practicum.ewm.api.client.event.dto.EventFullDto;
+import ru.practicum.ewm.api.client.event.dto.EventInternalDto;
+import ru.practicum.ewm.api.client.event.dto.EventShortDto;
+import ru.practicum.ewm.api.client.event.dto.NewEventDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateEventAdminRequestDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateEventUserRequestDto;
+import ru.practicum.ewm.event.application.params.AdminEventSearchParams;
+import ru.practicum.ewm.event.application.params.PublicEventSearchParams;
 
 public interface EventService {
     List<EventFullDto> getEventsAdmin(
@@ -32,4 +32,8 @@ List<EventFullDto> getEventsAdmin(
     EventFullDto getEventByIdPublic(Long eventId);
 
     EventInternalDto getEventById(Long eventId);
+
+    void addLike(Long userId, Long eventId);
+
+    List<EventShortDto> getRecommendations(Long userId, Integer maxCount);
 }
\ No newline at end of file
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/EventServiceImpl.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/EventServiceImpl.java
similarity index 74%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/EventServiceImpl.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/EventServiceImpl.java
index f0899c9..785e8cb 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/EventServiceImpl.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/EventServiceImpl.java
@@ -1,10 +1,9 @@
-package ru.practicum.explorewithme.event.application;
+package ru.practicum.ewm.event.application;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -13,30 +12,30 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.practicum.explorewithme.api.client.event.dto.EventDtoWithConfirmedRequests;
-import ru.practicum.explorewithme.api.client.event.dto.EventFullDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventInternalDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventShortDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewEventDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateEventAdminRequestDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateEventUserRequestDto;
-import ru.practicum.explorewithme.api.client.request.RequestClient;
-import ru.practicum.explorewithme.api.client.user.UserClient;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
-import ru.practicum.explorewithme.api.utility.DtoMapper;
-import ru.practicum.explorewithme.event.application.params.AdminEventSearchParams;
-import ru.practicum.explorewithme.event.application.params.PublicEventSearchParams;
-import ru.practicum.explorewithme.event.domain.Category;
-import ru.practicum.explorewithme.event.domain.CategoryRepository;
-import ru.practicum.explorewithme.event.domain.Event;
-import ru.practicum.explorewithme.event.domain.EventRepository;
-import ru.practicum.explorewithme.event.domain.EventState;
-import ru.practicum.explorewithme.event.infrastructure.mapper.EventMapper;
-import ru.practicum.explorewithme.event.infrastructure.mapper.LocationMapper;
-import ru.practicum.explorewithme.stats.client.StatsClient;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
+import ru.practicum.ewm.api.client.event.dto.EventDtoWithRatingAndRequests;
+import ru.practicum.ewm.api.client.event.dto.EventFullDto;
+import ru.practicum.ewm.api.client.event.dto.EventInternalDto;
+import ru.practicum.ewm.api.client.event.dto.EventShortDto;
+import ru.practicum.ewm.api.client.event.dto.NewEventDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateEventAdminRequestDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateEventUserRequestDto;
+import ru.practicum.ewm.api.client.request.RequestClient;
+import ru.practicum.ewm.api.client.user.UserClient;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.error.IllegalLikeException;
+import ru.practicum.ewm.api.utility.DtoMapper;
+import ru.practicum.ewm.event.application.params.AdminEventSearchParams;
+import ru.practicum.ewm.event.application.params.PublicEventSearchParams;
+import ru.practicum.ewm.event.domain.Category;
+import ru.practicum.ewm.event.domain.CategoryRepository;
+import ru.practicum.ewm.event.domain.Event;
+import ru.practicum.ewm.event.domain.EventRepository;
+import ru.practicum.ewm.event.domain.EventState;
+import ru.practicum.ewm.event.infrastructure.mapper.EventMapper;
+import ru.practicum.ewm.event.infrastructure.mapper.LocationMapper;
+import ru.practicum.ewm.stats.client.AnalyzerClient;
 
 @Service
 @RequiredArgsConstructor
@@ -50,7 +49,7 @@ public class EventServiceImpl implements EventService {
     private final UserClient userClient;
     private final CategoryRepository categoryRepository;
     private final RequestClient requestClient;
-    private final StatsClient statsClient;
+    private final AnalyzerClient analyzerClient;
     private final DtoMapper dtoMapper;
 
     private static final long MIN_HOURS_BEFORE_PUBLICATION_FOR_ADMIN = 1;
@@ -65,12 +64,9 @@ public List<EventShortDto> getEventsPublic(PublicEventSearchParams params, int f
             return Collections.emptyList();
         }
 
-        Map<Long, Long> viewsMap = getViewsForEvents(foundEvents);
-
         List<EventShortDto> eventDtos = eventMapper.toEventShortDtoList(foundEvents);
-        eventDtos.forEach(dto -> dto.setViews(viewsMap.getOrDefault(dto.getId(), 0L)));
 
-        enrichEventsWithConfirmedRequests(eventDtos);
+        enrichEvents(eventDtos);
 
         if (Boolean.TRUE.equals(params.getOnlyAvailable())) {
             Map<Long, Integer> participantLimitMap = foundEvents.stream()
@@ -84,8 +80,8 @@ public List<EventShortDto> getEventsPublic(PublicEventSearchParams params, int f
                 .collect(Collectors.toList());
         }
 
-        if (params.getSort() != null && params.getSort().equalsIgnoreCase("VIEWS")) {
-            eventDtos.sort(Comparator.comparing(EventShortDto::getViews).reversed());
+        if (params.getSort() != null && params.getSort().equalsIgnoreCase("RATING")) {
+            eventDtos.sort(Comparator.comparing(EventShortDto::getRating).reversed());
         }
 
         log.info("Public search prepared {} DTOs after enrichment and filtering.", eventDtos.size());
@@ -103,13 +99,10 @@ public EventFullDto getEventByIdPublic(Long eventId) {
 
         EventFullDto resultDto = eventMapper.toEventFullDto(event);
 
-        long views = getViewsForEvents(List.of(event)).getOrDefault(eventId, 0L);
-        resultDto.setViews(views);
-
-        enrichEventsWithConfirmedRequests(List.of(resultDto));
+        enrichEvents(List.of(resultDto));
 
-        log.info("Public: Found event id={} with title='{}', views={}, confirmedRequests={}",
-            eventId, resultDto.getTitle(), resultDto.getViews(), resultDto.getConfirmedRequests());
+        log.info("Public: Found event id={} with title='{}', rating={}, confirmedRequests={}",
+            eventId, resultDto.getTitle(), resultDto.getRating(), resultDto.getConfirmedRequests());
 
         return resultDto;
     }
@@ -128,11 +121,8 @@ public List<EventFullDto> getEventsAdmin(AdminEventSearchParams params, int from
 
         List<EventFullDto> result = eventMapper.toEventFullDtoList(foundEvents);
 
-        Map<Long, Long> viewsData = getViewsForEvents(foundEvents);
-        result.forEach(dto -> dto.setViews(viewsData.get(dto.getId())));
-
         log.debug("Admin search found {} events", result.size());
-        return enrichEventsWithConfirmedRequests(result);
+        return enrichEvents(result);
     }
 
     @Override
@@ -201,7 +191,7 @@ public EventFullDto moderateEventByAdmin(Long eventId, UpdateEventAdminRequestDt
 
         Event updatedEvent = eventRepository.save(event);
         log.info("Admin: Event id={} moderated successfully. New state: {}", eventId, updatedEvent.getState());
-        return enrichEventsWithConfirmedRequests(List.of(eventMapper.toEventFullDto(updatedEvent))).getFirst();
+        return enrichEvents(List.of(eventMapper.toEventFullDto(updatedEvent))).getFirst();
     }
 
     @Override
@@ -223,7 +213,7 @@ public List<EventShortDto> getEventsByOwner(Long userId, int from, int size) {
 
         List<EventShortDto> result = eventMapper.toEventShortDtoList(foundEvents);
         log.debug("Found {} events for owner id: {}", result.size(), userId);
-        return enrichEventsWithConfirmedRequests(result);
+        return enrichEvents(result);
     }
 
     @Override
@@ -286,7 +276,7 @@ public EventFullDto updateEventByOwner(Long userId, Long eventId, UpdateEventUse
 
         Event updatedEvent = eventRepository.save(event);
         log.info("User id={}: Event id={} updated successfully.", userId, eventId);
-        return enrichEventsWithConfirmedRequests(List.of(eventMapper.toEventFullDto(updatedEvent))).getFirst();
+        return enrichEvents(List.of(eventMapper.toEventFullDto(updatedEvent))).getFirst();
     }
 
     @Override
@@ -302,7 +292,7 @@ public EventFullDto getEventPrivate(Long userId, Long eventId) {
 
         EventFullDto result = eventMapper.toEventFullDto(event);
         log.debug("Found event: {}", result);
-        return enrichEventsWithConfirmedRequests(List.of(result)).getFirst();
+        return enrichEvents(List.of(result)).getFirst();
     }
 
     @Override
@@ -324,65 +314,53 @@ public EventFullDto addEventPrivate(Long userId, NewEventDto newEventDto) {
         event.setInitiatorId(userId);
         EventFullDto savedEvent = eventMapper.toEventFullDto(eventRepository.save(event));
         savedEvent.setInitiator(dtoMapper.toUserShortDto(initiator));
-        return enrichEventsWithConfirmedRequests(List.of(savedEvent)).getFirst();
+        return enrichEvents(List.of(savedEvent)).getFirst();
     }
 
-    public EventInternalDto getEventById(Long eventId) {
+    @Override
+    public void addLike(Long userId, Long eventId) {
+        eventRepository.findByIdAndState(eventId, EventState.PUBLISHED).orElseThrow(
+            () -> new EntityNotFoundException(
+                "Event with id=" + eventId + " not found or is not published."));
 
-        if (eventId == null ) {
-            throw new EntityNotFoundException("Event", "Id", null);
+        try {
+            requestClient.checkUserParticipation(userId, eventId);
+        } catch (EntityNotFoundException e) {
+            throw new IllegalLikeException("User has not participated in this event and cannot like it.");
         }
-
-        return eventMapper.toEventInternalDto(eventRepository.findById(eventId)
-            .orElseThrow(() -> new EntityNotFoundException("Event", "Id", eventId)));
     }
 
-    private Map<Long, Long> getViewsForEvents(List<Event> events) {
-        if (events == null || events.isEmpty()) {
-            return Collections.emptyMap();
+    @Override
+    public List<EventShortDto> getRecommendations(Long userId, Integer maxCount) {
+        Map<Long, Double> recommendationsMap = analyzerClient.getRecommendationsForUser(userId, maxCount);
+        if (recommendationsMap.isEmpty()) {
+            log.warn("No recommendations found for user id={}", userId);
+            return List.of();
         }
-        List<String> uris = events.stream()
-            .map(event -> "/events/" + event.getId())
-            .distinct()
-            .collect(Collectors.toList());
 
-        LocalDateTime earliestCreation = events.stream()
-            .map(Event::getCreatedOn)
-            .min(LocalDateTime::compareTo)
-            .orElse(LocalDateTime.of(1970, 1, 1, 0, 0));
+        List<Event> recommendedEvents = eventRepository.findAllByIdIn(recommendationsMap.keySet());
+        log.info("Found {} recommended events for user id={}", recommendedEvents.size(), userId);
+        return enrichEvents(eventMapper.toEventShortDtoList(recommendedEvents));
+    }
 
-        Map<Long, Long> viewsMap = new HashMap<>();
-        try {
-            List<ViewStatsDto> stats = statsClient.getStats(
-                earliestCreation,
-                LocalDateTime.now(),
-                uris,
-                true // Уникальные просмотры
-            );
-            if (stats != null) {
-                for (ViewStatsDto stat : stats) {
-                    try {
-                        Long eventId = Long.parseLong(stat.getUri().substring("/events/".length()));
-                        viewsMap.put(eventId, stat.getHits());
-                    } catch (NumberFormatException | IndexOutOfBoundsException e) {
-                        log.warn("Could not parse eventId from URI {} from stats service", stat.getUri());
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("Failed to retrieve views for multiple events. Error: {}", e.getMessage());
+    public EventInternalDto getEventById(Long eventId) {
+
+        if (eventId == null ) {
+            throw new EntityNotFoundException("Event", "Id", null);
         }
-        return viewsMap;
+
+        return eventMapper.toEventInternalDto(eventRepository.findById(eventId)
+            .orElseThrow(() -> new EntityNotFoundException("Event", "Id", eventId)));
     }
 
     /**
-     * Enriches a list of event DTOs with the count of confirmed participation requests.
+     * Enriches a list of event DTOs with the count of confirmed participation requests and their rating values.
      *
-     * @param dtos A list of DTOs that extend a base type with getId() and setConfirmedRequests().
+     * @param dtos A list of DTOs that extend a base type with getId(), setConfirmedRequests(), and setRating().
      * @param <T> The specific type of the DTO (e.g., EventFullDto, EventShortDto).
-     * @return The same list of DTOs, now with the confirmedRequests field populated.
+     * @return The same list of DTOs, now with the confirmedRequests and rating fields populated.
      */
-    private <T extends EventDtoWithConfirmedRequests> List<T> enrichEventsWithConfirmedRequests(List<T> dtos) {
+    private <T extends EventDtoWithRatingAndRequests> List<T> enrichEvents(List<T> dtos) {
         if (dtos == null || dtos.isEmpty()) {
             return Collections.emptyList();
         }
@@ -392,10 +370,12 @@ private <T extends EventDtoWithConfirmedRequests> List<T> enrichEventsWithConfir
             .collect(Collectors.toSet());
 
         Map<Long, Long> confirmedCountsMap = requestClient.getConfirmedRequestCounts(eventIds);
+        Map<Long, Double> ratingsMap = analyzerClient.getInteractionsCount(eventIds);
 
-        dtos.forEach(dto ->
-            dto.setConfirmedRequests(confirmedCountsMap.getOrDefault(dto.getId(), 0L))
-        );
+        dtos.forEach(dto -> {
+            dto.setConfirmedRequests(confirmedCountsMap.getOrDefault(dto.getId(), 0L));
+            dto.setRating(ratingsMap.getOrDefault(dto.getId(), 0.0));
+        });
 
         return dtos;
     }
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/AdminEventSearchParams.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/params/AdminEventSearchParams.java
similarity index 71%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/AdminEventSearchParams.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/params/AdminEventSearchParams.java
index 3febf2a..da591fd 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/AdminEventSearchParams.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/params/AdminEventSearchParams.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.event.application.params;
+package ru.practicum.ewm.event.application.params;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -9,8 +9,8 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.springframework.format.annotation.DateTimeFormat;
-import ru.practicum.explorewithme.event.application.validation.ValidDateRange;
-import ru.practicum.explorewithme.event.domain.EventState;
+import ru.practicum.ewm.event.application.validation.ValidDateRange;
+import ru.practicum.ewm.event.domain.EventState;
 
 @Getter
 @Builder
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/PublicEventSearchParams.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/params/PublicEventSearchParams.java
similarity index 76%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/PublicEventSearchParams.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/params/PublicEventSearchParams.java
index b984e4b..e134418 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/PublicEventSearchParams.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/params/PublicEventSearchParams.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.event.application.params;
+package ru.practicum.ewm.event.application.params;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -9,7 +9,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.springframework.format.annotation.DateTimeFormat;
-import ru.practicum.explorewithme.event.application.validation.ValidDateRange;
+import ru.practicum.ewm.event.application.validation.ValidDateRange;
 
 @Getter
 @Builder
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/SearchParamsWithDateRange.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/params/SearchParamsWithDateRange.java
similarity index 70%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/SearchParamsWithDateRange.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/params/SearchParamsWithDateRange.java
index 798eb26..774d646 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/params/SearchParamsWithDateRange.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/params/SearchParamsWithDateRange.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.application.params;
+package ru.practicum.ewm.event.application.params;
 
 import java.time.LocalDateTime;
 
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/validation/DateRangeValidator.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/validation/DateRangeValidator.java
similarity index 77%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/validation/DateRangeValidator.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/validation/DateRangeValidator.java
index faa3ed4..7f1ac7c 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/validation/DateRangeValidator.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/validation/DateRangeValidator.java
@@ -1,8 +1,8 @@
-package ru.practicum.explorewithme.event.application.validation;
+package ru.practicum.ewm.event.application.validation;
 
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorContext;
-import ru.practicum.explorewithme.event.application.params.SearchParamsWithDateRange;
+import ru.practicum.ewm.event.application.params.SearchParamsWithDateRange;
 
 public class DateRangeValidator implements
     ConstraintValidator<ValidDateRange, SearchParamsWithDateRange> {
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/validation/ValidDateRange.java b/core/event-service/src/main/java/ru/practicum/ewm/event/application/validation/ValidDateRange.java
similarity index 93%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/application/validation/ValidDateRange.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/application/validation/ValidDateRange.java
index 1c47102..4c04a7b 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/application/validation/ValidDateRange.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/application/validation/ValidDateRange.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.application.validation;
+package ru.practicum.ewm.event.application.validation;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.Payload;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Category.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Category.java
similarity index 95%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Category.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/Category.java
index 6085f84..9c330ff 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Category.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Category.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/CategoryRepository.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/CategoryRepository.java
similarity index 94%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/CategoryRepository.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/CategoryRepository.java
index 3e228f4..31fc2ca 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/CategoryRepository.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/CategoryRepository.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Compilation.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Compilation.java
similarity index 97%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Compilation.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/Compilation.java
index 71016ca..cf2e301 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Compilation.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Compilation.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/CompilationRepository.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/CompilationRepository.java
similarity index 95%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/CompilationRepository.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/CompilationRepository.java
index 2f75f09..0e2a64f 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/CompilationRepository.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/CompilationRepository.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Event.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Event.java
similarity index 98%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Event.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/Event.java
index 6f38d1f..2d42fed 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Event.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Event.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/EventRepository.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/EventRepository.java
similarity index 90%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/EventRepository.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/EventRepository.java
index 5c8f864..db78fd5 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/EventRepository.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/EventRepository.java
@@ -1,10 +1,10 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import ru.practicum.explorewithme.event.application.params.AdminEventSearchParams;
-import ru.practicum.explorewithme.event.application.params.PublicEventSearchParams;
+import ru.practicum.ewm.event.application.params.AdminEventSearchParams;
+import ru.practicum.ewm.event.application.params.PublicEventSearchParams;
 
 public interface EventRepository {
 
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/EventState.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/EventState.java
similarity index 85%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/EventState.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/EventState.java
index f132543..18276a7 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/EventState.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/EventState.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 /**
  * Состояния жизненного цикла события
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Location.java b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Location.java
similarity index 93%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Location.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/domain/Location.java
index d4ab540..0587391 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/domain/Location.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/domain/Location.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.domain;
+package ru.practicum.ewm.event.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/config/JpaAuditingConfig.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/config/JpaAuditingConfig.java
similarity index 77%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/config/JpaAuditingConfig.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/config/JpaAuditingConfig.java
index bb18f1f..7cf9f6a 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/config/JpaAuditingConfig.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/config/JpaAuditingConfig.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.infrastructure.config;
+package ru.practicum.ewm.event.infrastructure.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/CategoryMapper.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/CategoryMapper.java
similarity index 65%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/CategoryMapper.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/CategoryMapper.java
index fc73149..86dec53 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/CategoryMapper.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/CategoryMapper.java
@@ -1,10 +1,10 @@
-package ru.practicum.explorewithme.event.infrastructure.mapper;
+package ru.practicum.ewm.event.infrastructure.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import ru.practicum.explorewithme.api.client.event.dto.CategoryDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCategoryDto;
-import ru.practicum.explorewithme.event.domain.Category;
+import ru.practicum.ewm.api.client.event.dto.CategoryDto;
+import ru.practicum.ewm.api.client.event.dto.NewCategoryDto;
+import ru.practicum.ewm.event.domain.Category;
 
 @Mapper(componentModel = "spring")
 public interface CategoryMapper {
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/CompilationMapper.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/CompilationMapper.java
similarity index 65%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/CompilationMapper.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/CompilationMapper.java
index 4611b1c..e5db3db 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/CompilationMapper.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/CompilationMapper.java
@@ -1,12 +1,12 @@
-package ru.practicum.explorewithme.event.infrastructure.mapper;
+package ru.practicum.ewm.event.infrastructure.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
-import ru.practicum.explorewithme.api.client.event.dto.CompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateCompilationRequestDto;
-import ru.practicum.explorewithme.event.domain.Compilation;
+import ru.practicum.ewm.api.client.event.dto.CompilationDto;
+import ru.practicum.ewm.api.client.event.dto.NewCompilationDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateCompilationRequestDto;
+import ru.practicum.ewm.event.domain.Compilation;
 
 @Mapper(componentModel = "spring", uses = {EventMapper.class})
 public interface CompilationMapper {
diff --git a/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/EnumMapper.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/EnumMapper.java
new file mode 100644
index 0000000..85ffdba
--- /dev/null
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/EnumMapper.java
@@ -0,0 +1,22 @@
+package ru.practicum.ewm.event.infrastructure.mapper;
+
+import org.mapstruct.Mapper;
+import ru.practicum.ewm.api.client.event.enums.EventState;
+
+@Mapper(componentModel = "spring")
+public class EnumMapper {
+
+    public EventState toApiEventState(ru.practicum.ewm.event.domain.EventState eventState) {
+        if (eventState == null) {
+            return null;
+        }
+        return EventState.valueOf(eventState.name());
+    }
+
+    public ru.practicum.ewm.event.domain.EventState toModelEventState(EventState eventState) {
+        if (eventState == null) {
+            return null;
+        }
+        return ru.practicum.ewm.event.domain.EventState.valueOf(eventState.name());
+    }
+}
\ No newline at end of file
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/EventMapper.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/EventMapper.java
similarity index 68%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/EventMapper.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/EventMapper.java
index a18e67e..9d453b7 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/EventMapper.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/EventMapper.java
@@ -1,21 +1,21 @@
-package ru.practicum.explorewithme.event.infrastructure.mapper;
+package ru.practicum.ewm.event.infrastructure.mapper;
 
 import java.util.List;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
-import ru.practicum.explorewithme.api.client.event.dto.EventFullDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventInternalDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventShortDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewEventDto;
-import ru.practicum.explorewithme.event.domain.Event;
+import ru.practicum.ewm.api.client.event.dto.EventFullDto;
+import ru.practicum.ewm.api.client.event.dto.EventInternalDto;
+import ru.practicum.ewm.api.client.event.dto.EventShortDto;
+import ru.practicum.ewm.api.client.event.dto.NewEventDto;
+import ru.practicum.ewm.event.domain.Event;
 
 @Mapper(componentModel = "spring", uses = {CategoryMapper.class, LocationMapper.class, EnumMapper.class})
 public interface EventMapper {
 
     @Mappings({
         @Mapping(target = "confirmedRequests", ignore = true),
-        @Mapping(target = "views", ignore = true),
+        @Mapping(target = "rating", ignore = true),
         @Mapping(target = "initiator", ignore = true)
     })
     EventFullDto toEventFullDto(Event event);
@@ -27,14 +27,14 @@ public interface EventMapper {
     @Mapping(target = "compilations", ignore = true)
     @Mapping(target = "initiatorId", ignore = true)
     @Mapping(target = "createdOn", ignore = true)
-    @Mapping(target = "state", expression = "java(ru.practicum.explorewithme.event.domain.EventState.PENDING)")
+    @Mapping(target = "state", expression = "java(ru.practicum.ewm.event.domain.EventState.PENDING)")
     Event toEvent(NewEventDto newEventDto);
 
     List<EventFullDto> toEventFullDtoList(List<Event> events);
 
     @Mappings({
         @Mapping(target = "confirmedRequests", ignore = true),
-        @Mapping(target = "views", ignore = true),
+        @Mapping(target = "rating", ignore = true),
         @Mapping(target = "initiator", ignore = true)
     })
     EventShortDto toEventShortDto(Event event);
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/LocationMapper.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/LocationMapper.java
similarity index 51%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/LocationMapper.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/LocationMapper.java
index d3827b6..09c6fb0 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/LocationMapper.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/mapper/LocationMapper.java
@@ -1,8 +1,8 @@
-package ru.practicum.explorewithme.event.infrastructure.mapper;
+package ru.practicum.ewm.event.infrastructure.mapper;
 
 import org.mapstruct.Mapper;
-import ru.practicum.explorewithme.api.client.event.dto.LocationDto;
-import ru.practicum.explorewithme.event.domain.Location;
+import ru.practicum.ewm.api.client.event.dto.LocationDto;
+import ru.practicum.ewm.event.domain.Location;
 
 @Mapper(componentModel = "spring")
 public interface LocationMapper {
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/CategoryRepositoryAdapter.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/CategoryRepositoryAdapter.java
similarity index 87%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/CategoryRepositoryAdapter.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/CategoryRepositoryAdapter.java
index 92deb78..4b3c771 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/CategoryRepositoryAdapter.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/CategoryRepositoryAdapter.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.infrastructure.persistence;
+package ru.practicum.ewm.event.infrastructure.persistence;
 
 import java.util.Comparator;
 import java.util.List;
@@ -8,8 +8,8 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
-import ru.practicum.explorewithme.event.domain.Category;
-import ru.practicum.explorewithme.event.domain.CategoryRepository;
+import ru.practicum.ewm.event.domain.Category;
+import ru.practicum.ewm.event.domain.CategoryRepository;
 
 @Component
 @RequiredArgsConstructor
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/CompilationRepositoryAdapter.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/CompilationRepositoryAdapter.java
similarity index 88%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/CompilationRepositoryAdapter.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/CompilationRepositoryAdapter.java
index 0d1b91d..f2974a7 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/CompilationRepositoryAdapter.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/CompilationRepositoryAdapter.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.infrastructure.persistence;
+package ru.practicum.ewm.event.infrastructure.persistence;
 
 import java.util.List;
 import java.util.Optional;
@@ -6,8 +6,8 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
-import ru.practicum.explorewithme.event.domain.Compilation;
-import ru.practicum.explorewithme.event.domain.CompilationRepository;
+import ru.practicum.ewm.event.domain.Compilation;
+import ru.practicum.ewm.event.domain.CompilationRepository;
 
 @Component
 @RequiredArgsConstructor
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/EventRepositoryAdapter.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/EventRepositoryAdapter.java
similarity index 91%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/EventRepositoryAdapter.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/EventRepositoryAdapter.java
index 5ba5eb4..24116a7 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/EventRepositoryAdapter.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/EventRepositoryAdapter.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.infrastructure.persistence;
+package ru.practicum.ewm.event.infrastructure.persistence;
 
 import com.querydsl.core.BooleanBuilder;
 import java.time.LocalDateTime;
@@ -10,12 +10,12 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Component;
-import ru.practicum.explorewithme.event.application.params.AdminEventSearchParams;
-import ru.practicum.explorewithme.event.application.params.PublicEventSearchParams;
-import ru.practicum.explorewithme.event.domain.Event;
-import ru.practicum.explorewithme.event.domain.EventRepository;
-import ru.practicum.explorewithme.event.domain.EventState;
-import ru.practicum.explorewithme.event.domain.QEvent;
+import ru.practicum.ewm.event.application.params.AdminEventSearchParams;
+import ru.practicum.ewm.event.application.params.PublicEventSearchParams;
+import ru.practicum.ewm.event.domain.Event;
+import ru.practicum.ewm.event.domain.EventRepository;
+import ru.practicum.ewm.event.domain.EventState;
+import ru.practicum.ewm.event.domain.QEvent;
 
 @Component
 @RequiredArgsConstructor
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaCategoryRepository.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaCategoryRepository.java
similarity index 80%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaCategoryRepository.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaCategoryRepository.java
index 85a4e90..a7cbc14 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaCategoryRepository.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaCategoryRepository.java
@@ -1,10 +1,10 @@
-package ru.practicum.explorewithme.event.infrastructure.persistence;
+package ru.practicum.ewm.event.infrastructure.persistence;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import ru.practicum.explorewithme.event.domain.Category;
+import ru.practicum.ewm.event.domain.Category;
 
 @Repository
 public interface JpaCategoryRepository extends JpaRepository<Category, Long> {
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaCompilationRepository.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaCompilationRepository.java
similarity index 88%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaCompilationRepository.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaCompilationRepository.java
index 2dfd013..fa1b45d 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaCompilationRepository.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaCompilationRepository.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.infrastructure.persistence;
+package ru.practicum.ewm.event.infrastructure.persistence;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -7,7 +7,7 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import ru.practicum.explorewithme.event.domain.Compilation;
+import ru.practicum.ewm.event.domain.Compilation;
 
 @Repository
 public interface JpaCompilationRepository extends JpaRepository<Compilation, Long> {
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaEventRepository.java b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaEventRepository.java
similarity index 79%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaEventRepository.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaEventRepository.java
index c332c57..1ce4e3d 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/persistence/JpaEventRepository.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/infrastructure/persistence/JpaEventRepository.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.infrastructure.persistence;
+package ru.practicum.ewm.event.infrastructure.persistence;
 
 import java.util.Optional;
 import org.springframework.data.domain.Page;
@@ -6,8 +6,8 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.stereotype.Repository;
-import ru.practicum.explorewithme.event.domain.Event;
-import ru.practicum.explorewithme.event.domain.EventState;
+import ru.practicum.ewm.event.domain.Event;
+import ru.practicum.ewm.event.domain.EventState;
 
 @Repository
 public interface JpaEventRepository extends JpaRepository<Event, Long>, QuerydslPredicateExecutor<Event> {
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminCategoryController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminCategoryController.java
similarity index 88%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminCategoryController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminCategoryController.java
index f71a50d..d16640e 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminCategoryController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminCategoryController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.admin;
+package ru.practicum.ewm.event.presentation.admin;
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -13,9 +13,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.dto.CategoryDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCategoryDto;
-import ru.practicum.explorewithme.event.application.CategoryService;
+import ru.practicum.ewm.api.client.event.dto.CategoryDto;
+import ru.practicum.ewm.api.client.event.dto.NewCategoryDto;
+import ru.practicum.ewm.event.application.CategoryService;
 
 @RestController
 @RequestMapping("/admin/categories")
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminCompilationController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminCompilationController.java
similarity index 86%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminCompilationController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminCompilationController.java
index 3795c1f..d79eecb 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminCompilationController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminCompilationController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.admin;
+package ru.practicum.ewm.event.presentation.admin;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -14,10 +14,10 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.dto.CompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewCompilationDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateCompilationRequestDto;
-import ru.practicum.explorewithme.event.application.CompilationService;
+import ru.practicum.ewm.api.client.event.dto.CompilationDto;
+import ru.practicum.ewm.api.client.event.dto.NewCompilationDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateCompilationRequestDto;
+import ru.practicum.ewm.event.application.CompilationService;
 
 @RestController
 @RequestMapping("/admin/compilations")
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminEventController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminEventController.java
similarity index 91%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminEventController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminEventController.java
index 0f68872..3cc21c4 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/admin/AdminEventController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/admin/AdminEventController.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.event.presentation.admin;
+package ru.practicum.ewm.event.presentation.admin;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -18,10 +18,10 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.dto.EventFullDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateEventAdminRequestDto;
-import ru.practicum.explorewithme.event.application.params.AdminEventSearchParams;
-import ru.practicum.explorewithme.event.application.EventService;
+import ru.practicum.ewm.api.client.event.dto.EventFullDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateEventAdminRequestDto;
+import ru.practicum.ewm.event.application.params.AdminEventSearchParams;
+import ru.practicum.ewm.event.application.EventService;
 
 @RestController
 @RequestMapping("/admin/events")
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/error/GlobalExceptionHandler.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/error/GlobalExceptionHandler.java
similarity index 78%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/error/GlobalExceptionHandler.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/error/GlobalExceptionHandler.java
index 2e004e3..e612b23 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/error/GlobalExceptionHandler.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/error/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.error;
+package ru.practicum.ewm.event.presentation.error;
 
 import java.time.LocalDateTime;
 import lombok.extern.slf4j.Slf4j;
@@ -7,12 +7,13 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.practicum.explorewithme.api.error.ApiError;
-import ru.practicum.explorewithme.api.error.BaseExceptionHandler;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityAlreadyExistsException;
-import ru.practicum.explorewithme.api.error.EntityDeletedException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.error.ApiError;
+import ru.practicum.ewm.api.error.BaseExceptionHandler;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityAlreadyExistsException;
+import ru.practicum.ewm.api.error.EntityDeletedException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.error.IllegalLikeException;
 
 @RestControllerAdvice
 @Slf4j
@@ -53,7 +54,25 @@ public ApiError handleEntityAlreadyExistsException(EntityAlreadyExistsException
     }
 
     /**
-     * Handles violations of business logic within the event service.
+     * Handles the specific business rule violation of a user trying to like an event
+     * they have not participated in.
+     * <br>
+     * Maps to HTTP 400 Bad Request.
+     */
+    @ExceptionHandler(IllegalLikeException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ApiError handleIllegalLikeException(IllegalLikeException e) {
+        log.warn("Illegal like attempt: {}", e.getMessage());
+        return ApiError.builder()
+            .status(HttpStatus.BAD_REQUEST)
+            .reason("The conditions for liking the event are not met.")
+            .message(e.getMessage())
+            .timestamp(LocalDateTime.now())
+            .build();
+    }
+
+    /**
+     * Handles generic violations of business logic within the event service.
      * <br>
      * Maps to HTTP 409 Conflict.
      */
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/internal/InternalEventController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/internal/InternalEventController.java
similarity index 71%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/internal/InternalEventController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/internal/InternalEventController.java
index eabc354..71611bc 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/internal/InternalEventController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/internal/InternalEventController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.internal;
+package ru.practicum.ewm.event.presentation.internal;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -6,9 +6,9 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.EventClient;
-import ru.practicum.explorewithme.api.client.event.dto.EventInternalDto;
-import ru.practicum.explorewithme.event.application.EventService;
+import ru.practicum.ewm.api.client.event.EventClient;
+import ru.practicum.ewm.api.client.event.dto.EventInternalDto;
+import ru.practicum.ewm.event.application.EventService;
 
 @RestController
 @RequestMapping("/internal/events")
diff --git a/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/priv/LikeController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/priv/LikeController.java
new file mode 100644
index 0000000..38be5d3
--- /dev/null
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/priv/LikeController.java
@@ -0,0 +1,31 @@
+package ru.practicum.ewm.event.presentation.priv;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import ru.practicum.ewm.event.application.EventService;
+import ru.practicum.ewm.stats.client.aop.ActionType;
+import ru.practicum.ewm.stats.client.aop.LogUserAction;
+
+@RestController
+@RequestMapping("/events/{eventId}/like")
+@RequiredArgsConstructor
+@Slf4j
+public class LikeController {
+
+    private final EventService eventService;
+
+    @PutMapping
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    @LogUserAction(ActionType.LIKE)
+    public void likeEvent(@PathVariable Long eventId, @RequestHeader("X-EWM-USER-ID") long userId) {
+        log.info("User id={}: Received request to like event id={}", userId, eventId);
+        eventService.addLike(userId, eventId);
+    }
+}
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/priv/PrivateEventController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/priv/PrivateEventController.java
similarity index 93%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/priv/PrivateEventController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/priv/PrivateEventController.java
index c062d04..5b66ce9 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/priv/PrivateEventController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/priv/PrivateEventController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.priv;
+package ru.practicum.ewm.event.presentation.priv;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -18,11 +18,11 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.dto.EventFullDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventShortDto;
-import ru.practicum.explorewithme.api.client.event.dto.NewEventDto;
-import ru.practicum.explorewithme.api.client.event.dto.UpdateEventUserRequestDto;
-import ru.practicum.explorewithme.event.application.EventService;
+import ru.practicum.ewm.api.client.event.dto.EventFullDto;
+import ru.practicum.ewm.api.client.event.dto.EventShortDto;
+import ru.practicum.ewm.api.client.event.dto.NewEventDto;
+import ru.practicum.ewm.api.client.event.dto.UpdateEventUserRequestDto;
+import ru.practicum.ewm.event.application.EventService;
 
 @RestController
 @RequestMapping("/users/{userId}/events")
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicCategoryController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicCategoryController.java
similarity index 90%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicCategoryController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicCategoryController.java
index d6180c3..b0ba27c 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicCategoryController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicCategoryController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.pub;
+package ru.practicum.ewm.event.presentation.pub;
 
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.PositiveOrZero;
@@ -13,8 +13,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.dto.CategoryDto;
-import ru.practicum.explorewithme.event.application.CategoryService;
+import ru.practicum.ewm.api.client.event.dto.CategoryDto;
+import ru.practicum.ewm.event.application.CategoryService;
 
 @RestController
 @RequestMapping("/categories")
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicCompilationController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicCompilationController.java
similarity index 90%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicCompilationController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicCompilationController.java
index abebeba..7a64a02 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicCompilationController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicCompilationController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.pub;
+package ru.practicum.ewm.event.presentation.pub;
 
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.PositiveOrZero;
@@ -13,8 +13,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.dto.CompilationDto;
-import ru.practicum.explorewithme.event.application.CompilationService;
+import ru.practicum.ewm.api.client.event.dto.CompilationDto;
+import ru.practicum.ewm.event.application.CompilationService;
 
 @RestController
 @RequestMapping("/compilations")
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicEventController.java b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicEventController.java
similarity index 75%
rename from core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicEventController.java
rename to core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicEventController.java
index 402b35b..7fc9202 100644
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/presentation/pub/PublicEventController.java
+++ b/core/event-service/src/main/java/ru/practicum/ewm/event/presentation/pub/PublicEventController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.event.presentation.pub;
+package ru.practicum.ewm.event.presentation.pub;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -15,11 +15,12 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.event.dto.EventFullDto;
-import ru.practicum.explorewithme.api.client.event.dto.EventShortDto;
-import ru.practicum.explorewithme.event.application.EventService;
-import ru.practicum.explorewithme.event.application.params.PublicEventSearchParams;
-import ru.practicum.explorewithme.stats.client.aop.LogStatsHit;
+import ru.practicum.ewm.api.client.event.dto.EventFullDto;
+import ru.practicum.ewm.api.client.event.dto.EventShortDto;
+import ru.practicum.ewm.event.application.EventService;
+import ru.practicum.ewm.event.application.params.PublicEventSearchParams;
+import ru.practicum.ewm.stats.client.aop.ActionType;
+import ru.practicum.ewm.stats.client.aop.LogUserAction;
 
 @RestController
 @RequestMapping("/events")
@@ -32,7 +33,6 @@ public class PublicEventController {
 
     @GetMapping
     @ResponseStatus(HttpStatus.OK)
-    @LogStatsHit
     public List<EventShortDto> getEvents(
             @Valid PublicEventSearchParams params,
             @RequestParam(name = "from", defaultValue = "0") @PositiveOrZero int from,
@@ -52,7 +52,7 @@ public List<EventShortDto> getEvents(
 
     @GetMapping("/{eventId}")
     @ResponseStatus(HttpStatus.OK)
-    @LogStatsHit
+    @LogUserAction(value = ActionType.VIEW)
     public EventFullDto getEventById(
             @PathVariable @Positive Long eventId,
             @RequestHeader(name = "X-Real-IP", required = false) String ipAddress) {
@@ -61,4 +61,11 @@ public EventFullDto getEventById(
         log.info("Public: Found event: {}", event);
         return event;
     }
+
+    @GetMapping("/recommendations")
+    @ResponseStatus(HttpStatus.OK)
+    public List<EventShortDto> getRecommendations(@RequestHeader("X-EWM-USER-ID") long userId,
+        @RequestParam(name = "maxCount", defaultValue = "10") Integer maxCount) {
+        return eventService.getRecommendations(userId, maxCount);
+    }
 }
\ No newline at end of file
diff --git a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/EnumMapper.java b/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/EnumMapper.java
deleted file mode 100644
index 0fe1f13..0000000
--- a/core/event-service/src/main/java/ru/practicum/explorewithme/event/infrastructure/mapper/EnumMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.practicum.explorewithme.event.infrastructure.mapper;
-
-import org.mapstruct.Mapper;
-import ru.practicum.explorewithme.api.client.event.enums.EventState;
-
-@Mapper(componentModel = "spring")
-public class EnumMapper {
-
-    public EventState toApiEventState(ru.practicum.explorewithme.event.domain.EventState eventState) {
-        if (eventState == null) {
-            return null;
-        }
-        return EventState.valueOf(eventState.name());
-    }
-
-    public ru.practicum.explorewithme.event.domain.EventState toModelEventState(EventState eventState) {
-        if (eventState == null) {
-            return null;
-        }
-        return ru.practicum.explorewithme.event.domain.EventState.valueOf(eventState.name());
-    }
-}
\ No newline at end of file
diff --git a/core/event-service/src/main/resources/application.yaml b/core/event-service/src/main/resources/application.yaml
index cfffb6e..cec6870 100644
--- a/core/event-service/src/main/resources/application.yaml
+++ b/core/event-service/src/main/resources/application.yaml
@@ -2,7 +2,7 @@ spring:
   application:
     name: event-service
   profiles:
-    active: postgres
+    active: postgres, grpc-client
   config:
     import: "configserver:"
   cloud:
@@ -21,5 +21,4 @@ eureka:
     serviceUrl:
       defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
   instance:
-    instance-id: "${spring.application.name}:${random.value}"
-    leaseRenewalIntervalInSeconds: 10
\ No newline at end of file
+    instance-id: "${spring.application.name}:${random.value}"
\ No newline at end of file
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/autoconfiguration/DtoMapperAutoConfiguration.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/autoconfiguration/DtoMapperAutoConfiguration.java
similarity index 75%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/autoconfiguration/DtoMapperAutoConfiguration.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/autoconfiguration/DtoMapperAutoConfiguration.java
index c132c83..77208f4 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/autoconfiguration/DtoMapperAutoConfiguration.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/autoconfiguration/DtoMapperAutoConfiguration.java
@@ -1,9 +1,9 @@
-package ru.practicum.explorewithme.api.autoconfiguration;
+package ru.practicum.ewm.api.autoconfiguration;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.ComponentScan;
-import ru.practicum.explorewithme.api.utility.DtoMapper;
+import ru.practicum.ewm.api.utility.DtoMapper;
 
 @AutoConfiguration
 @ConditionalOnClass(DtoMapper.class)
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/AbstractErrorDecoder.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/AbstractErrorDecoder.java
similarity index 89%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/AbstractErrorDecoder.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/AbstractErrorDecoder.java
index 3d8f9cd..ea325d4 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/AbstractErrorDecoder.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/AbstractErrorDecoder.java
@@ -1,12 +1,12 @@
-package ru.practicum.explorewithme.api.client;
+package ru.practicum.ewm.api.client;
 
 import feign.Response;
 import feign.codec.ErrorDecoder;
 import java.util.Map;
 import java.util.function.Function;
-import ru.practicum.explorewithme.api.error.ApiError;
-import ru.practicum.explorewithme.api.error.RemoteServiceException;
-import ru.practicum.explorewithme.api.utility.ErrorParser;
+import ru.practicum.ewm.api.error.ApiError;
+import ru.practicum.ewm.api.error.RemoteServiceException;
+import ru.practicum.ewm.api.utility.ErrorParser;
 
 public abstract class AbstractErrorDecoder implements ErrorDecoder {
     private Map<Integer, Function<String, Exception>> errorHandlers;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentAdminDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentAdminDto.java
similarity index 77%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentAdminDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentAdminDto.java
index 57457a0..61b179a 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentAdminDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentAdminDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.comment.dto;
+package ru.practicum.ewm.api.client.comment.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
@@ -10,7 +10,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
 
 @Data
 @NoArgsConstructor
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentDto.java
similarity index 76%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentDto.java
index 73bba9d..7fa3506 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.comment.dto;
+package ru.practicum.ewm.api.client.comment.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AccessLevel;
@@ -11,7 +11,7 @@
 import lombok.experimental.FieldDefaults;
 
 import java.time.LocalDateTime;
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
 
 @Data
 @NoArgsConstructor
diff --git a/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentDtoWithAuthor.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentDtoWithAuthor.java
new file mode 100644
index 0000000..5f50530
--- /dev/null
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/CommentDtoWithAuthor.java
@@ -0,0 +1,8 @@
+package ru.practicum.ewm.api.client.comment.dto;
+
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
+
+public interface CommentDtoWithAuthor {
+
+    void setAuthor(UserShortDto author);
+}
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/NewCommentDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/NewCommentDto.java
similarity index 90%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/NewCommentDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/NewCommentDto.java
index 96350d9..399dace 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/NewCommentDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/NewCommentDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.comment.dto;
+package ru.practicum.ewm.api.client.comment.dto;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/UpdateCommentDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/UpdateCommentDto.java
similarity index 90%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/UpdateCommentDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/UpdateCommentDto.java
index ab15316..e32f2f2 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/UpdateCommentDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/comment/dto/UpdateCommentDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.comment.dto;
+package ru.practicum.ewm.api.client.comment.dto;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClient.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClient.java
similarity index 82%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClient.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClient.java
index 86861f3..e4c6b2b 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClient.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClient.java
@@ -1,9 +1,9 @@
-package ru.practicum.explorewithme.api.client.event;
+package ru.practicum.ewm.api.client.event;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import ru.practicum.explorewithme.api.client.event.dto.EventInternalDto;
+import ru.practicum.ewm.api.client.event.dto.EventInternalDto;
 
 @FeignClient(name = "event-service", path = "/internal/events", configuration = EventClientConfiguration.class)
 public interface EventClient {
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClientConfiguration.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClientConfiguration.java
similarity index 82%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClientConfiguration.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClientConfiguration.java
index 58ef07d..e3b4e4f 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClientConfiguration.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClientConfiguration.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event;
+package ru.practicum.ewm.api.client.event;
 
 import feign.codec.ErrorDecoder;
 import org.springframework.context.annotation.Bean;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClientErrorDecoder.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClientErrorDecoder.java
similarity index 58%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClientErrorDecoder.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClientErrorDecoder.java
index d033c07..77393d5 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/EventClientErrorDecoder.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/EventClientErrorDecoder.java
@@ -1,10 +1,10 @@
-package ru.practicum.explorewithme.api.client.event;
+package ru.practicum.ewm.api.client.event;
 
 import java.util.Map;
 import java.util.function.Function;
-import ru.practicum.explorewithme.api.client.AbstractErrorDecoder;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.client.AbstractErrorDecoder;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
 
 public class EventClientErrorDecoder extends AbstractErrorDecoder {
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/CategoryDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/CategoryDto.java
similarity index 85%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/CategoryDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/CategoryDto.java
index a9eb383..8b9ce45 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/CategoryDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/CategoryDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/CompilationDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/CompilationDto.java
similarity index 87%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/CompilationDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/CompilationDto.java
index 928a907..4bce1ee 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/CompilationDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/CompilationDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
 import java.util.Set;
 import lombok.AccessLevel;
diff --git a/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventDtoWithRatingAndRequests.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventDtoWithRatingAndRequests.java
new file mode 100644
index 0000000..227afa5
--- /dev/null
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventDtoWithRatingAndRequests.java
@@ -0,0 +1,7 @@
+package ru.practicum.ewm.api.client.event.dto;
+
+public interface EventDtoWithRatingAndRequests {
+    Long getId();
+    void setConfirmedRequests(Long count);
+    void setRating(Double rating);
+}
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventFullDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventFullDto.java
similarity index 73%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventFullDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventFullDto.java
index 6a92bf8..b5d5fd2 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventFullDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventFullDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
@@ -10,15 +10,15 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
-import ru.practicum.explorewithme.api.client.event.enums.EventState;
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
+import ru.practicum.ewm.api.client.event.enums.EventState;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class EventFullDto implements EventDtoWithConfirmedRequests {
+public class EventFullDto implements EventDtoWithRatingAndRequests {
     Long id;
     String annotation;
     CategoryDto category;
@@ -37,6 +37,6 @@ public class EventFullDto implements EventDtoWithConfirmedRequests {
     boolean requestModeration;
     EventState state;
     String title;
-    Long views;
+    Double rating;
     boolean commentsEnabled;
 }
\ No newline at end of file
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventInternalDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventInternalDto.java
similarity index 81%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventInternalDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventInternalDto.java
index 5b8f2ba..5b28d99 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventInternalDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventInternalDto.java
@@ -1,8 +1,8 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import ru.practicum.explorewithme.api.client.event.enums.EventState;
+import ru.practicum.ewm.api.client.event.enums.EventState;
 
 /**
  * A DTO for service-to-service communication.
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventShortDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventShortDto.java
similarity index 67%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventShortDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventShortDto.java
index 6e6e376..ad8bb2d 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventShortDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/EventShortDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
@@ -10,14 +10,14 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class EventShortDto implements EventDtoWithConfirmedRequests {
+public class EventShortDto implements EventDtoWithRatingAndRequests {
     Long id;
     String annotation;
     CategoryDto category;
@@ -27,5 +27,5 @@ public class EventShortDto implements EventDtoWithConfirmedRequests {
     UserShortDto initiator;
     Boolean paid;
     String title;
-    Long views;
+    Double rating;
 }
\ No newline at end of file
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/LocationDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/LocationDto.java
similarity index 87%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/LocationDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/LocationDto.java
index 19da489..0d57c6c 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/LocationDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/LocationDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
 import jakarta.validation.constraints.PositiveOrZero;
 import lombok.AllArgsConstructor;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewCategoryDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewCategoryDto.java
similarity index 90%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewCategoryDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewCategoryDto.java
index 580ab50..bb9e298 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewCategoryDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewCategoryDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewCompilationDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewCompilationDto.java
similarity index 92%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewCompilationDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewCompilationDto.java
index 08ae2a5..b37eb6c 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewCompilationDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewCompilationDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewEventDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewEventDto.java
similarity index 93%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewEventDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewEventDto.java
index c132c52..26b4b1b 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/NewEventDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/NewEventDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateCompilationRequestDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateCompilationRequestDto.java
similarity index 90%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateCompilationRequestDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateCompilationRequestDto.java
index 090c120..bb614b5 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateCompilationRequestDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateCompilationRequestDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
 import jakarta.validation.constraints.Size;
 import java.util.List;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateEventAdminRequestDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateEventAdminRequestDto.java
similarity index 90%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateEventAdminRequestDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateEventAdminRequestDto.java
index 1a53e2f..fffa101 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateEventAdminRequestDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateEventAdminRequestDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Future;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateEventUserRequestDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateEventUserRequestDto.java
similarity index 90%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateEventUserRequestDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateEventUserRequestDto.java
index 7c16e23..48600f9 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/UpdateEventUserRequestDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/dto/UpdateEventUserRequestDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.event.dto;
+package ru.practicum.ewm.api.client.event.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Future;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/enums/EventState.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/enums/EventState.java
similarity index 83%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/enums/EventState.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/enums/EventState.java
index 94332c9..7a83224 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/enums/EventState.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/event/enums/EventState.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.event.enums;
+package ru.practicum.ewm.api.client.event.enums;
 
 /**
  * Состояния жизненного цикла события
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClient.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClient.java
similarity index 68%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClient.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClient.java
index 19d7a0e..b2e6f49 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClient.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClient.java
@@ -1,9 +1,11 @@
-package ru.practicum.explorewithme.api.client.request;
+package ru.practicum.ewm.api.client.request;
 
 import java.util.Map;
 import java.util.Set;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(name = "request-service", path = "/internal/requests", configuration = RequestClientConfiguration.class)
@@ -16,4 +18,7 @@ public interface RequestClient {
      */
     @GetMapping("/confirmed-counts")
     Map<Long, Long> getConfirmedRequestCounts(@RequestParam("eventIds") Set<Long> eventIds);
+
+    @RequestMapping(method = RequestMethod.HEAD, value = "/participation")
+    void checkUserParticipation(@RequestParam("userId") Long userId, @RequestParam("eventId") Long eventId);
 }
\ No newline at end of file
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClientConfiguration.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClientConfiguration.java
similarity index 81%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClientConfiguration.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClientConfiguration.java
index 0e163f5..ffc910a 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClientConfiguration.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClientConfiguration.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.request;
+package ru.practicum.ewm.api.client.request;
 
 import feign.codec.ErrorDecoder;
 import org.springframework.context.annotation.Bean;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClientErrorDecoder.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClientErrorDecoder.java
similarity index 58%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClientErrorDecoder.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClientErrorDecoder.java
index d97cd7c..f355609 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/RequestClientErrorDecoder.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/RequestClientErrorDecoder.java
@@ -1,10 +1,10 @@
-package ru.practicum.explorewithme.api.client.request;
+package ru.practicum.ewm.api.client.request;
 
 import java.util.Map;
 import java.util.function.Function;
-import ru.practicum.explorewithme.api.client.AbstractErrorDecoder;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.client.AbstractErrorDecoder;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
 
 public class RequestClientErrorDecoder extends AbstractErrorDecoder {
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/EventRequestStatusUpdateRequestDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/EventRequestStatusUpdateRequestDto.java
similarity index 80%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/EventRequestStatusUpdateRequestDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/EventRequestStatusUpdateRequestDto.java
index 69fd1dd..ffa35d0 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/EventRequestStatusUpdateRequestDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/EventRequestStatusUpdateRequestDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.request.dto;
+package ru.practicum.ewm.api.client.request.dto;
 
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -9,7 +9,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
-import ru.practicum.explorewithme.api.client.request.enums.RequestStatus;
+import ru.practicum.ewm.api.client.request.enums.RequestStatus;
 
 @Data
 @Builder
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/EventRequestStatusUpdateResultDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/EventRequestStatusUpdateResultDto.java
similarity index 90%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/EventRequestStatusUpdateResultDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/EventRequestStatusUpdateResultDto.java
index 3be2b1c..bd58715 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/EventRequestStatusUpdateResultDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/EventRequestStatusUpdateResultDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.request.dto;
+package ru.practicum.ewm.api.client.request.dto;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/ParticipationRequestDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/ParticipationRequestDto.java
similarity index 75%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/ParticipationRequestDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/ParticipationRequestDto.java
index 5823217..e6bbd00 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/dto/ParticipationRequestDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/dto/ParticipationRequestDto.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.client.request.dto;
+package ru.practicum.ewm.api.client.request.dto;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -11,7 +11,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.FieldDefaults;
-import ru.practicum.explorewithme.api.client.request.enums.RequestStatus;
+import ru.practicum.ewm.api.client.request.enums.RequestStatus;
 
 
 @Data
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/RequestStatus.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/enums/RequestStatus.java
similarity index 87%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/RequestStatus.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/enums/RequestStatus.java
index d82ec22..1769916 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/RequestStatus.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/request/enums/RequestStatus.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.domain;
+package ru.practicum.ewm.api.client.request.enums;
 
 /**
  * Статусы запросов на участие в событии
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClient.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClient.java
similarity index 93%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClient.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClient.java
index f2d1991..f700e52 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClient.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClient.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.user;
+package ru.practicum.ewm.api.client.user;
 
 import java.util.List;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -7,7 +7,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
 
 @FeignClient(name = "user-service", path = "/internal/users", configuration = UserClientConfiguration.class)
 public interface UserClient {
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClientConfiguration.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClientConfiguration.java
similarity index 82%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClientConfiguration.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClientConfiguration.java
index a1ab106..cefc335 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClientConfiguration.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClientConfiguration.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.user;
+package ru.practicum.ewm.api.client.user;
 
 import feign.codec.ErrorDecoder;
 import org.springframework.context.annotation.Bean;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClientErrorDecoder.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClientErrorDecoder.java
similarity index 62%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClientErrorDecoder.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClientErrorDecoder.java
index bee2600..fa6e357 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/UserClientErrorDecoder.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/UserClientErrorDecoder.java
@@ -1,9 +1,9 @@
-package ru.practicum.explorewithme.api.client.user;
+package ru.practicum.ewm.api.client.user;
 
 import java.util.Map;
 import java.util.function.Function;
-import ru.practicum.explorewithme.api.client.AbstractErrorDecoder;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.client.AbstractErrorDecoder;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
 
 public class UserClientErrorDecoder extends AbstractErrorDecoder {
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/NewUserRequestDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/NewUserRequestDto.java
similarity index 93%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/NewUserRequestDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/NewUserRequestDto.java
index 0812df2..9302b93 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/NewUserRequestDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/NewUserRequestDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.user.dto;
+package ru.practicum.ewm.api.client.user.dto;
 
 import jakarta.validation.constraints.Size;
 import lombok.*;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/UserDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/UserDto.java
similarity index 80%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/UserDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/UserDto.java
index 0419355..a2b315d 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/UserDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/UserDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.user.dto;
+package ru.practicum.ewm.api.client.user.dto;
 
 import lombok.*;
 import lombok.experimental.FieldDefaults;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/UserShortDto.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/UserShortDto.java
similarity index 85%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/UserShortDto.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/UserShortDto.java
index 64b5534..ec49335 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/user/dto/UserShortDto.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/client/user/dto/UserShortDto.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.user.dto;
+package ru.practicum.ewm.api.client.user.dto;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/constants/DateTimeConstants.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/constants/DateTimeConstants.java
similarity index 95%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/constants/DateTimeConstants.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/constants/DateTimeConstants.java
index 0ed45d5..565bb7f 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/constants/DateTimeConstants.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/constants/DateTimeConstants.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.constants;
+package ru.practicum.ewm.api.constants;
 
 import java.time.format.DateTimeFormatter;
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/ApiError.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/ApiError.java
similarity index 80%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/ApiError.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/error/ApiError.java
index c29146b..45887cf 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/ApiError.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/ApiError.java
@@ -1,6 +1,6 @@
-package ru.practicum.explorewithme.api.error;
+package ru.practicum.ewm.api.error;
 
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
+import static ru.practicum.ewm.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/BaseExceptionHandler.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/BaseExceptionHandler.java
similarity index 99%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/BaseExceptionHandler.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/error/BaseExceptionHandler.java
index 06ba96b..52746fc 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/BaseExceptionHandler.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/BaseExceptionHandler.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.error;
+package ru.practicum.ewm.api.error;
 
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/BusinessRuleViolationException.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/BusinessRuleViolationException.java
similarity index 78%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/BusinessRuleViolationException.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/error/BusinessRuleViolationException.java
index 9611674..5ca2df7 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/BusinessRuleViolationException.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/BusinessRuleViolationException.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.error;
+package ru.practicum.ewm.api.error;
 
 public class BusinessRuleViolationException extends RuntimeException {
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityAlreadyExistsException.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityAlreadyExistsException.java
similarity index 88%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityAlreadyExistsException.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityAlreadyExistsException.java
index 3a8b656..5b3c991 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityAlreadyExistsException.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityAlreadyExistsException.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.error;
+package ru.practicum.ewm.api.error;
 
 public class EntityAlreadyExistsException extends RuntimeException {
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityDeletedException.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityDeletedException.java
similarity index 88%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityDeletedException.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityDeletedException.java
index 026c6ea..3185d6a 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityDeletedException.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityDeletedException.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.error;
+package ru.practicum.ewm.api.error;
 
 public class EntityDeletedException  extends RuntimeException {
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityNotFoundException.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityNotFoundException.java
similarity index 87%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityNotFoundException.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityNotFoundException.java
index 0e30ef0..4328eba 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/EntityNotFoundException.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/EntityNotFoundException.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.error;
+package ru.practicum.ewm.api.error;
 
 public class EntityNotFoundException extends RuntimeException {
 
diff --git a/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/IllegalLikeException.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/IllegalLikeException.java
new file mode 100644
index 0000000..a92dcb9
--- /dev/null
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/IllegalLikeException.java
@@ -0,0 +1,8 @@
+package ru.practicum.ewm.api.error;
+
+public class IllegalLikeException extends BusinessRuleViolationException {
+
+    public IllegalLikeException(String message) {
+        super(message);
+    }
+}
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/RemoteServiceException.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/RemoteServiceException.java
similarity index 89%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/RemoteServiceException.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/error/RemoteServiceException.java
index 96a954f..fdf67c4 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/error/RemoteServiceException.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/error/RemoteServiceException.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.error;
+package ru.practicum.ewm.api.error;
 
 /**
  * A generic runtime exception used to wrap unexpected errors
diff --git a/core/interaction-api/src/main/java/ru/practicum/ewm/api/utility/DtoMapper.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/utility/DtoMapper.java
new file mode 100644
index 0000000..3b24aa1
--- /dev/null
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/utility/DtoMapper.java
@@ -0,0 +1,13 @@
+package ru.practicum.ewm.api.utility;
+
+
+import org.mapstruct.Mapper;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
+
+@Mapper(componentModel = "spring")
+public interface DtoMapper {
+
+    UserShortDto toUserShortDto(UserDto userDto);
+
+}
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/utility/ErrorParser.java b/core/interaction-api/src/main/java/ru/practicum/ewm/api/utility/ErrorParser.java
similarity index 88%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/utility/ErrorParser.java
rename to core/interaction-api/src/main/java/ru/practicum/ewm/api/utility/ErrorParser.java
index 625a4b3..f087f8e 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/utility/ErrorParser.java
+++ b/core/interaction-api/src/main/java/ru/practicum/ewm/api/utility/ErrorParser.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.utility;
+package ru.practicum.ewm.api.utility;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import feign.Response;
@@ -6,7 +6,7 @@
 import java.io.InputStream;
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
-import ru.practicum.explorewithme.api.error.ApiError;
+import ru.practicum.ewm.api.error.ApiError;
 
 @Slf4j
 public class ErrorParser {
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentDtoWithAuthor.java b/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentDtoWithAuthor.java
deleted file mode 100644
index 2907b3e..0000000
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/comment/dto/CommentDtoWithAuthor.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package ru.practicum.explorewithme.api.client.comment.dto;
-
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
-
-public interface CommentDtoWithAuthor {
-
-    void setAuthor(UserShortDto author);
-}
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventDtoWithConfirmedRequests.java b/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventDtoWithConfirmedRequests.java
deleted file mode 100644
index 9782f2d..0000000
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/event/dto/EventDtoWithConfirmedRequests.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package ru.practicum.explorewithme.api.client.event.dto;
-
-public interface EventDtoWithConfirmedRequests {
-    Long getId();
-    void setConfirmedRequests(Long count);
-}
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/utility/DtoMapper.java b/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/utility/DtoMapper.java
deleted file mode 100644
index 40fae45..0000000
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/utility/DtoMapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ru.practicum.explorewithme.api.utility;
-
-
-import org.mapstruct.Mapper;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
-
-@Mapper(componentModel = "spring")
-public interface DtoMapper {
-
-    UserShortDto toUserShortDto(UserDto userDto);
-
-}
diff --git a/core/interaction-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/core/interaction-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 15a92b1..25575b8 100644
--- a/core/interaction-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/core/interaction-api/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1 @@
-ru.practicum.explorewithme.api.autoconfiguration.DtoMapperAutoConfiguration
\ No newline at end of file
+ru.practicum.ewm.api.autoconfiguration.DtoMapperAutoConfiguration
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index 522e98d..f948edc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,11 +20,15 @@
 
   <modules>
     <module>event-service</module>
-    <module>stats-service</module>
+    <module>stats-client</module>
     <module>user-service</module>
     <module>request-service</module>
     <module>comment-service</module>
     <module>interaction-api</module>
+    <module>collector</module>
+    <module>aggregator</module>
+    <module>analyzer</module>
+    <module>serialization</module>
   </modules>
 
 </project>
\ No newline at end of file
diff --git a/core/request-service/pom.xml b/core/request-service/pom.xml
index ef7dc86..56164de 100644
--- a/core/request-service/pom.xml
+++ b/core/request-service/pom.xml
@@ -20,6 +20,11 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>ru.practicum</groupId>
+      <artifactId>stats-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/RequestServiceApplication.java b/core/request-service/src/main/java/ru/practicum/ewm/request/RequestServiceApplication.java
similarity index 77%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/RequestServiceApplication.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/RequestServiceApplication.java
index 055278b..b7cdf57 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/RequestServiceApplication.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/RequestServiceApplication.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request;
+package ru.practicum.ewm.request;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,8 +8,8 @@
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients(basePackages = {
-    "ru.practicum.explorewithme.api.client.user",
-    "ru.practicum.explorewithme.api.client.event"
+    "ru.practicum.ewm.api.client.user",
+    "ru.practicum.ewm.api.client.event"
 })
 public class RequestServiceApplication {
 
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/application/RequestService.java b/core/request-service/src/main/java/ru/practicum/ewm/request/application/RequestService.java
similarity index 65%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/application/RequestService.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/application/RequestService.java
index 90332f3..2550b8b 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/application/RequestService.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/application/RequestService.java
@@ -1,12 +1,12 @@
-package ru.practicum.explorewithme.request.application;
+package ru.practicum.ewm.request.application;
 
 import jakarta.validation.constraints.Positive;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import ru.practicum.explorewithme.api.client.request.dto.EventRequestStatusUpdateResultDto;
-import ru.practicum.explorewithme.api.client.request.dto.ParticipationRequestDto;
-import ru.practicum.explorewithme.request.application.params.EventRequestStatusUpdateRequestParams;
+import ru.practicum.ewm.api.client.request.dto.EventRequestStatusUpdateResultDto;
+import ru.practicum.ewm.api.client.request.dto.ParticipationRequestDto;
+import ru.practicum.ewm.request.application.params.EventRequestStatusUpdateRequestParams;
 
 public interface RequestService {
 
@@ -23,4 +23,6 @@ EventRequestStatusUpdateResultDto updateRequestsStatus(
 
     Map<Long, Long> getConfirmedRequestCounts(Set<Long> eventIds);
 
+    void checkUserParticipation(long userId, long eventId);
+
 }
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/application/RequestServiceImpl.java b/core/request-service/src/main/java/ru/practicum/ewm/request/application/RequestServiceImpl.java
similarity index 87%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/application/RequestServiceImpl.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/application/RequestServiceImpl.java
index bf163c5..f075129 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/application/RequestServiceImpl.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/application/RequestServiceImpl.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.application;
+package ru.practicum.ewm.request.application;
 
 import java.util.Comparator;
 import java.util.LinkedHashMap;
@@ -11,19 +11,19 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.practicum.explorewithme.api.client.event.EventClient;
-import ru.practicum.explorewithme.api.client.event.dto.EventInternalDto;
-import ru.practicum.explorewithme.api.client.event.enums.EventState;
-import ru.practicum.explorewithme.api.client.request.dto.EventRequestStatusUpdateResultDto;
-import ru.practicum.explorewithme.api.client.request.dto.ParticipationRequestDto;
-import ru.practicum.explorewithme.api.client.user.UserClient;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
-import ru.practicum.explorewithme.request.application.params.EventRequestStatusUpdateRequestParams;
-import ru.practicum.explorewithme.request.domain.ParticipationRequest;
-import ru.practicum.explorewithme.request.domain.RequestRepository;
-import ru.practicum.explorewithme.request.domain.RequestStatus;
-import ru.practicum.explorewithme.request.infrastructure.mapper.RequestMapper;
+import ru.practicum.ewm.api.client.event.EventClient;
+import ru.practicum.ewm.api.client.event.dto.EventInternalDto;
+import ru.practicum.ewm.api.client.event.enums.EventState;
+import ru.practicum.ewm.api.client.request.dto.EventRequestStatusUpdateResultDto;
+import ru.practicum.ewm.api.client.request.dto.ParticipationRequestDto;
+import ru.practicum.ewm.api.client.user.UserClient;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
+import ru.practicum.ewm.request.application.params.EventRequestStatusUpdateRequestParams;
+import ru.practicum.ewm.request.domain.ParticipationRequest;
+import ru.practicum.ewm.request.domain.RequestRepository;
+import ru.practicum.ewm.request.domain.RequestStatus;
+import ru.practicum.ewm.request.infrastructure.mapper.RequestMapper;
 
 @Service
 @RequiredArgsConstructor
@@ -188,4 +188,10 @@ private ParticipationRequest checkRequest(Long userId, Long requestEventId) {
         return newRequest;
     }
 
+    public void checkUserParticipation(long userId, long eventId) {
+        if (!requestRepository.existsByRequesterIdAndEventIdAndStatus(userId, eventId, RequestStatus.CONFIRMED)) {
+            throw new EntityNotFoundException("User " + userId + " has not participated in event " + eventId);
+        }
+    }
+
 }
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/application/params/EventRequestStatusUpdateRequestParams.java b/core/request-service/src/main/java/ru/practicum/ewm/request/application/params/EventRequestStatusUpdateRequestParams.java
similarity index 75%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/application/params/EventRequestStatusUpdateRequestParams.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/application/params/EventRequestStatusUpdateRequestParams.java
index 170c545..c6218bb 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/application/params/EventRequestStatusUpdateRequestParams.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/application/params/EventRequestStatusUpdateRequestParams.java
@@ -1,11 +1,11 @@
-package ru.practicum.explorewithme.request.application.params;
+package ru.practicum.ewm.request.application.params;
 
 import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import ru.practicum.explorewithme.request.domain.RequestStatus;
+import ru.practicum.ewm.request.domain.RequestStatus;
 
 @Getter
 @Builder
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/ParticipationRequest.java b/core/request-service/src/main/java/ru/practicum/ewm/request/domain/ParticipationRequest.java
similarity index 97%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/ParticipationRequest.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/domain/ParticipationRequest.java
index 84e61d6..2ef88d9 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/ParticipationRequest.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/domain/ParticipationRequest.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.domain;
+package ru.practicum.ewm.request.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/RequestRepository.java b/core/request-service/src/main/java/ru/practicum/ewm/request/domain/RequestRepository.java
similarity index 89%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/RequestRepository.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/domain/RequestRepository.java
index 7928369..b4ab972 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/domain/RequestRepository.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/domain/RequestRepository.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.domain;
+package ru.practicum.ewm.request.domain;
 
 import java.util.List;
 import java.util.Map;
@@ -21,6 +21,8 @@ public interface RequestRepository {
 
     boolean existsByEventIdAndRequesterId(Long eventId, Long requesterId);
 
+    boolean existsByRequesterIdAndEventIdAndStatus(Long eventId, Long requesterId, RequestStatus status);
+
     int countByEventIdAndStatus(Long eventId, RequestStatus status);
 
     boolean doAllRequestsBelongToEvent(List<Long> requestIds, Long eventId);
diff --git a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/enums/RequestStatus.java b/core/request-service/src/main/java/ru/practicum/ewm/request/domain/RequestStatus.java
similarity index 85%
rename from core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/enums/RequestStatus.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/domain/RequestStatus.java
index 0c16758..108cd6b 100644
--- a/core/interaction-api/src/main/java/ru/practicum/explorewithme/api/client/request/enums/RequestStatus.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/domain/RequestStatus.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.api.client.request.enums;
+package ru.practicum.ewm.request.domain;
 
 /**
  * Статусы запросов на участие в событии
diff --git a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/config/JpaAuditingConfig.java b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/config/JpaAuditingConfig.java
similarity index 77%
rename from core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/config/JpaAuditingConfig.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/config/JpaAuditingConfig.java
index 6f0c801..d9d182f 100644
--- a/core/comment-service/src/main/java/ru/practicum/explorewithme/comment/infrastructure/config/JpaAuditingConfig.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/config/JpaAuditingConfig.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.comment.infrastructure.config;
+package ru.practicum.ewm.request.infrastructure.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
diff --git a/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/mapper/EnumMapper.java b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/mapper/EnumMapper.java
new file mode 100644
index 0000000..2281834
--- /dev/null
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/mapper/EnumMapper.java
@@ -0,0 +1,23 @@
+package ru.practicum.ewm.request.infrastructure.mapper;
+
+import org.mapstruct.Mapper;
+import ru.practicum.ewm.api.client.request.enums.RequestStatus;
+
+@Mapper(componentModel = "spring")
+public class EnumMapper {
+
+    public RequestStatus toApiRequestStatus(
+        ru.practicum.ewm.request.domain.RequestStatus modelStatus) {
+        if (modelStatus == null) {
+            return null;
+        }
+        return RequestStatus.valueOf(modelStatus.name());
+    }
+
+    public ru.practicum.ewm.request.domain.RequestStatus toModelRequestStatus(RequestStatus apiStatus) {
+        if (apiStatus == null) {
+            return null;
+        }
+        return ru.practicum.ewm.request.domain.RequestStatus.valueOf(apiStatus.name());
+    }
+}
\ No newline at end of file
diff --git a/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/mapper/RequestMapper.java b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/mapper/RequestMapper.java
new file mode 100644
index 0000000..81c796a
--- /dev/null
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/mapper/RequestMapper.java
@@ -0,0 +1,12 @@
+package ru.practicum.ewm.request.infrastructure.mapper;
+
+import org.mapstruct.Mapper;
+import ru.practicum.ewm.api.client.request.dto.ParticipationRequestDto;
+import ru.practicum.ewm.request.domain.ParticipationRequest;
+
+@Mapper(componentModel = "spring", uses = EnumMapper.class)
+public interface RequestMapper {
+
+    ParticipationRequestDto toRequestDto(ParticipationRequest participationRequest);
+
+}
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/persistence/JpaRequestRepository.java b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/persistence/JpaRequestRepository.java
similarity index 85%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/persistence/JpaRequestRepository.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/persistence/JpaRequestRepository.java
index 76603f5..3936799 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/persistence/JpaRequestRepository.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/persistence/JpaRequestRepository.java
@@ -1,12 +1,12 @@
-package ru.practicum.explorewithme.request.infrastructure.persistence;
+package ru.practicum.ewm.request.infrastructure.persistence;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import ru.practicum.explorewithme.request.domain.ParticipationRequest;
-import ru.practicum.explorewithme.request.domain.RequestStatus;
+import ru.practicum.ewm.request.domain.ParticipationRequest;
+import ru.practicum.ewm.request.domain.RequestStatus;
 
 import java.util.List;
 import java.util.Optional;
@@ -17,6 +17,8 @@ public interface JpaRequestRepository extends JpaRepository<ParticipationRequest
 
     boolean existsByEventIdAndRequesterId(Long eventId, Long requesterId);
 
+    boolean existsByRequesterIdAndEventIdAndStatus(long requesterId, long eventId, RequestStatus status);
+
     int countByEventIdAndStatus(Long eventId, RequestStatus status);
 
     List<ParticipationRequest> findByRequesterId(Long requesterId);
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/persistence/RequestRepositoryAdapter.java b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/persistence/RequestRepositoryAdapter.java
similarity index 88%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/persistence/RequestRepositoryAdapter.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/persistence/RequestRepositoryAdapter.java
index 5070dd5..5d59742 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/persistence/RequestRepositoryAdapter.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/infrastructure/persistence/RequestRepositoryAdapter.java
@@ -1,13 +1,13 @@
-package ru.practicum.explorewithme.request.infrastructure.persistence;
+package ru.practicum.ewm.request.infrastructure.persistence;
 
 import java.util.Comparator;
 import java.util.function.Function;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Component;
-import ru.practicum.explorewithme.request.domain.ParticipationRequest;
-import ru.practicum.explorewithme.request.domain.RequestRepository;
-import ru.practicum.explorewithme.request.domain.RequestStatus;
+import ru.practicum.ewm.request.domain.ParticipationRequest;
+import ru.practicum.ewm.request.domain.RequestRepository;
+import ru.practicum.ewm.request.domain.RequestStatus;
 
 import java.util.List;
 import java.util.Map;
@@ -65,6 +65,11 @@ public boolean existsByEventIdAndRequesterId(Long eventId, Long requesterId) {
         return jpaRequestRepository.existsByEventIdAndRequesterId(eventId, requesterId);
     }
 
+    @Override
+    public boolean existsByRequesterIdAndEventIdAndStatus(Long eventId, Long requesterId, RequestStatus status) {
+        return jpaRequestRepository.existsByRequesterIdAndEventIdAndStatus(requesterId, eventId, status);
+    }
+
     @Override
     public int countByEventIdAndStatus(Long eventId, RequestStatus status) {
         return jpaRequestRepository.countByEventIdAndStatus(eventId, status);
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/error/GlobalExceptionHandler.java b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/error/GlobalExceptionHandler.java
similarity index 88%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/error/GlobalExceptionHandler.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/presentation/error/GlobalExceptionHandler.java
index c4d8017..c5028ef 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/error/GlobalExceptionHandler.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/error/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.presentation.error;
+package ru.practicum.ewm.request.presentation.error;
 
 import java.time.LocalDateTime;
 import lombok.extern.slf4j.Slf4j;
@@ -7,11 +7,11 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.practicum.explorewithme.api.error.ApiError;
-import ru.practicum.explorewithme.api.error.BaseExceptionHandler;
-import ru.practicum.explorewithme.api.error.BusinessRuleViolationException;
-import ru.practicum.explorewithme.api.error.EntityAlreadyExistsException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.error.ApiError;
+import ru.practicum.ewm.api.error.BaseExceptionHandler;
+import ru.practicum.ewm.api.error.BusinessRuleViolationException;
+import ru.practicum.ewm.api.error.EntityAlreadyExistsException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
 
 @RestControllerAdvice
 @Slf4j
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/internal/InternalRequestController.java b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/internal/InternalRequestController.java
similarity index 57%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/internal/InternalRequestController.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/presentation/internal/InternalRequestController.java
index 9fdb9f0..e524782 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/internal/InternalRequestController.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/internal/InternalRequestController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.presentation.internal;
+package ru.practicum.ewm.request.presentation.internal;
 
 import java.util.Map;
 import java.util.Set;
@@ -7,9 +7,11 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.request.RequestClient;
-import ru.practicum.explorewithme.request.application.RequestService;
+import ru.practicum.ewm.api.client.request.RequestClient;
+import ru.practicum.ewm.request.application.RequestService;
 
 @RestController
 @RequestMapping("/internal/requests")
@@ -25,4 +27,10 @@ public class InternalRequestController implements RequestClient {
     public Map<Long, Long> getConfirmedRequestCounts(Set<Long> eventIds) {
         return requestService.getConfirmedRequestCounts(eventIds);
     }
+
+    @Override
+    @RequestMapping(method = RequestMethod.HEAD, value = "/participation")
+    public void checkUserParticipation(@RequestParam("userId") Long userId, @RequestParam("eventId") Long eventId) {
+        requestService.checkUserParticipation(userId, eventId);
+    }
 }
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/priv/EventRequestController.java b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/priv/EventRequestController.java
similarity index 81%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/priv/EventRequestController.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/presentation/priv/EventRequestController.java
index 999b0b1..f554841 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/priv/EventRequestController.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/priv/EventRequestController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.presentation.priv;
+package ru.practicum.ewm.request.presentation.priv;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -14,12 +14,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.request.dto.EventRequestStatusUpdateRequestDto;
-import ru.practicum.explorewithme.api.client.request.dto.EventRequestStatusUpdateResultDto;
-import ru.practicum.explorewithme.api.client.request.dto.ParticipationRequestDto;
-import ru.practicum.explorewithme.request.application.params.EventRequestStatusUpdateRequestParams;
-import ru.practicum.explorewithme.request.application.RequestService;
-import ru.practicum.explorewithme.request.infrastructure.mapper.EnumMapper;
+import ru.practicum.ewm.api.client.request.dto.EventRequestStatusUpdateRequestDto;
+import ru.practicum.ewm.api.client.request.dto.EventRequestStatusUpdateResultDto;
+import ru.practicum.ewm.api.client.request.dto.ParticipationRequestDto;
+import ru.practicum.ewm.request.application.params.EventRequestStatusUpdateRequestParams;
+import ru.practicum.ewm.request.application.RequestService;
+import ru.practicum.ewm.request.infrastructure.mapper.EnumMapper;
 
 @RestController
 @RequestMapping("/users/{userId}/events")
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/priv/UserRequestController.java b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/priv/UserRequestController.java
similarity index 87%
rename from core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/priv/UserRequestController.java
rename to core/request-service/src/main/java/ru/practicum/ewm/request/presentation/priv/UserRequestController.java
index 42dafcd..47d6268 100644
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/presentation/priv/UserRequestController.java
+++ b/core/request-service/src/main/java/ru/practicum/ewm/request/presentation/priv/UserRequestController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.request.presentation.priv;
+package ru.practicum.ewm.request.presentation.priv;
 
 import jakarta.validation.constraints.Positive;
 import java.util.List;
@@ -14,8 +14,10 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.request.dto.ParticipationRequestDto;
-import ru.practicum.explorewithme.request.application.RequestService;
+import ru.practicum.ewm.api.client.request.dto.ParticipationRequestDto;
+import ru.practicum.ewm.request.application.RequestService;
+import ru.practicum.ewm.stats.client.aop.ActionType;
+import ru.practicum.ewm.stats.client.aop.LogUserAction;
 
 @RestController
 @RequestMapping("/users/{userId}/requests")
@@ -28,6 +30,7 @@ public class UserRequestController {
 
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
+    @LogUserAction(value = ActionType.REGISTER)
     public ParticipationRequestDto createRequest(
             @PathVariable @Positive Long userId,
             @RequestParam @Positive Long eventId) {
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/mapper/EnumMapper.java b/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/mapper/EnumMapper.java
deleted file mode 100644
index ae83325..0000000
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/mapper/EnumMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ru.practicum.explorewithme.request.infrastructure.mapper;
-
-import org.mapstruct.Mapper;
-import ru.practicum.explorewithme.api.client.request.enums.RequestStatus;
-
-@Mapper(componentModel = "spring")
-public class EnumMapper {
-
-    public RequestStatus toApiRequestStatus(ru.practicum.explorewithme.request.domain.RequestStatus modelStatus) {
-        if (modelStatus == null) {
-            return null;
-        }
-        return RequestStatus.valueOf(modelStatus.name());
-    }
-
-    public ru.practicum.explorewithme.request.domain.RequestStatus toModelRequestStatus(RequestStatus apiStatus) {
-        if (apiStatus == null) {
-            return null;
-        }
-        return ru.practicum.explorewithme.request.domain.RequestStatus.valueOf(apiStatus.name());
-    }
-}
\ No newline at end of file
diff --git a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/mapper/RequestMapper.java b/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/mapper/RequestMapper.java
deleted file mode 100644
index d9dd413..0000000
--- a/core/request-service/src/main/java/ru/practicum/explorewithme/request/infrastructure/mapper/RequestMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package ru.practicum.explorewithme.request.infrastructure.mapper;
-
-import org.mapstruct.Mapper;
-import ru.practicum.explorewithme.api.client.request.dto.ParticipationRequestDto;
-import ru.practicum.explorewithme.request.domain.ParticipationRequest;
-
-@Mapper(componentModel = "spring", uses = EnumMapper.class)
-public interface RequestMapper {
-
-    ParticipationRequestDto toRequestDto(ParticipationRequest participationRequest);
-
-}
diff --git a/core/request-service/src/main/resources/application.yaml b/core/request-service/src/main/resources/application.yaml
index 4d2e7eb..198a86b 100644
--- a/core/request-service/src/main/resources/application.yaml
+++ b/core/request-service/src/main/resources/application.yaml
@@ -2,7 +2,7 @@ spring:
   application:
     name: request-service
   profiles:
-    active: postgres
+    active: postgres, grpc-client
   config:
     import: "configserver:"
   cloud:
@@ -21,5 +21,4 @@ eureka:
     serviceUrl:
       defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
   instance:
-    instance-id: "${spring.application.name}:${random.value}"
-    leaseRenewalIntervalInSeconds: 10
\ No newline at end of file
+    instance-id: "${spring.application.name}:${random.value}"
\ No newline at end of file
diff --git a/core/serialization/pom.xml b/core/serialization/pom.xml
new file mode 100644
index 0000000..481b57b
--- /dev/null
+++ b/core/serialization/pom.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>ru.practicum</groupId>
+    <artifactId>core</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>serialization</artifactId>
+  <packaging>jar</packaging>
+
+  <properties>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-protobuf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.grpc</groupId>
+      <artifactId>grpc-stub</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java-util</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka-clients</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>schema</goal>
+            </goals>
+            <configuration>
+              <sourceDirectory>${project.basedir}/src/main/avro/</sourceDirectory>
+              <outputDirectory>${project.build.directory}/generated-sources/avro</outputDirectory>
+              <stringType>String</stringType>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>io.github.ascopes</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <configuration>
+          <protocVersion>${protobuf.version}</protocVersion>
+          <binaryMavenPlugins>
+            <binaryMavenPlugin>
+              <groupId>io.grpc</groupId>
+              <artifactId>protoc-gen-grpc-java</artifactId>
+              <version>${grpc.version}</version>
+            </binaryMavenPlugin>
+          </binaryMavenPlugins>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>add-protobuf-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/protobuf</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-avro-source</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/avro</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+    </plugin>
+    </plugins>
+  </build>
+
+</project>
\ No newline at end of file
diff --git a/core/serialization/src/main/avro/ActionTypeAvro.avsc b/core/serialization/src/main/avro/ActionTypeAvro.avsc
new file mode 100644
index 0000000..5ddc4db
--- /dev/null
+++ b/core/serialization/src/main/avro/ActionTypeAvro.avsc
@@ -0,0 +1,6 @@
+{
+  "namespace": "ru.practicum.ewm.stats.kafka",
+  "type": "enum",
+  "name": "ActionTypeAvro",
+  "symbols": ["VIEW", "REGISTER", "LIKE"]
+}
\ No newline at end of file
diff --git a/core/serialization/src/main/avro/EventSimilarityAvro.avsc b/core/serialization/src/main/avro/EventSimilarityAvro.avsc
new file mode 100644
index 0000000..3e99049
--- /dev/null
+++ b/core/serialization/src/main/avro/EventSimilarityAvro.avsc
@@ -0,0 +1,30 @@
+{
+  "namespace": "ru.practicum.ewm.stats.kafka",
+  "type": "record",
+  "name": "EventSimilarityAvro",
+  "fields": [
+    {
+      "name": "eventA",
+      "type": "long",
+      "doc": "Identifier for the first event in the pair (always the smaller ID)."
+    },
+    {
+      "name": "eventB",
+      "type": "long",
+      "doc": "Identifier for the second event in the pair (always the larger ID)."
+    },
+    {
+      "name": "score",
+      "type": "double",
+      "doc": "The calculated cosine similarity score between eventA and eventB."
+    },
+    {
+      "name": "timestamp",
+      "type": {
+        "type": "long",
+        "logicalType": "timestamp-millis"
+      },
+      "doc": "The timestamp of the user action that triggered this recalculation."
+    }
+  ]
+}
\ No newline at end of file
diff --git a/core/serialization/src/main/avro/UserActionAvro.avsc b/core/serialization/src/main/avro/UserActionAvro.avsc
new file mode 100644
index 0000000..805448f
--- /dev/null
+++ b/core/serialization/src/main/avro/UserActionAvro.avsc
@@ -0,0 +1,30 @@
+{
+  "namespace": "ru.practicum.ewm.stats.kafka",
+  "type": "record",
+  "name": "UserActionAvro",
+  "fields": [
+    {
+      "name": "userId",
+      "type": "long",
+      "doc": "Identifier of the user who performed the action."
+    },
+    {
+      "name": "eventId",
+      "type": "long",
+      "doc": "Identifier of the event associated with the action."
+    },
+    {
+      "name": "actionType",
+      "type": "ru.practicum.ewm.stats.kafka.ActionTypeAvro",
+      "doc": "The type of action performed."
+    },
+    {
+      "name": "timestamp",
+      "type": {
+        "type": "long",
+        "logicalType": "timestamp-millis"
+      },
+      "doc": "The timestamp of when the action occurred, in milliseconds since the Unix epoch."
+    }
+  ]
+}
\ No newline at end of file
diff --git a/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/AvroSerializer.java b/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/AvroSerializer.java
new file mode 100644
index 0000000..59fa74a
--- /dev/null
+++ b/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/AvroSerializer.java
@@ -0,0 +1,45 @@
+package ru.practicum.ewm.stats.common.kafka;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.io.BinaryEncoder;
+import org.apache.avro.io.EncoderFactory;
+import org.apache.avro.specific.SpecificDatumWriter;
+import org.apache.avro.specific.SpecificRecordBase;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.serialization.Serializer;
+
+@Slf4j
+public class AvroSerializer<T extends SpecificRecordBase> implements Serializer<T> {
+
+    @Override
+    public void configure(Map<String, ?> configs, boolean isKey) {
+        // No-op
+    }
+
+    @Override
+    public byte[] serialize(String topic, T payload) {
+        if (payload == null) {
+            return null;
+        }
+
+        SpecificDatumWriter<GenericRecord> datumWriter = new SpecificDatumWriter<>(payload.getSchema());
+        try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+            BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(outputStream, null);
+            datumWriter.write(payload, encoder);
+            encoder.flush();
+            return outputStream.toByteArray();
+        } catch (IOException e) {
+            log.error("Error serializing Avro message for topic {}: {}", topic, payload, e);
+            throw new SerializationException("Error serializing Avro message", e);
+        }
+    }
+
+    @Override
+    public void close() {
+        // No-op
+    }
+}
\ No newline at end of file
diff --git a/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/EventSimilarityAvroDeserializer.java b/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/EventSimilarityAvroDeserializer.java
new file mode 100644
index 0000000..5661d3b
--- /dev/null
+++ b/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/EventSimilarityAvroDeserializer.java
@@ -0,0 +1,43 @@
+package ru.practicum.ewm.stats.common.kafka;
+
+import java.io.IOException;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.io.BinaryDecoder;
+import org.apache.avro.io.DecoderFactory;
+import org.apache.avro.specific.SpecificDatumReader;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.serialization.Deserializer;
+import ru.practicum.ewm.stats.kafka.EventSimilarityAvro;
+
+@Slf4j
+public class EventSimilarityAvroDeserializer implements Deserializer<EventSimilarityAvro> {
+
+    private final SpecificDatumReader<EventSimilarityAvro> datumReader = new SpecificDatumReader<>(
+        EventSimilarityAvro.getClassSchema());
+
+    @Override
+    public void configure(Map<String, ?> configs, boolean isKey) {
+        // No-op
+    }
+
+    @Override
+    public EventSimilarityAvro deserialize(String topic, byte[] data) {
+        if (data == null) {
+            return null;
+        }
+
+        try {
+            BinaryDecoder decoder = DecoderFactory.get().binaryDecoder(data, null);
+            return datumReader.read(null, decoder);
+        } catch (IOException e) {
+            log.error("Error deserializing Avro message for topic {}", topic, e);
+            throw new SerializationException("Error deserializing Avro message", e);
+        }
+    }
+
+    @Override
+    public void close() {
+        // No-op
+    }
+}
diff --git a/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/UserActionAvroDeserializer.java b/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/UserActionAvroDeserializer.java
new file mode 100644
index 0000000..1f3ff8e
--- /dev/null
+++ b/core/serialization/src/main/java/ru/practicum/ewm/stats/common/kafka/UserActionAvroDeserializer.java
@@ -0,0 +1,43 @@
+package ru.practicum.ewm.stats.common.kafka;
+
+import java.io.IOException;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.avro.io.BinaryDecoder;
+import org.apache.avro.io.DecoderFactory;
+import org.apache.avro.specific.SpecificDatumReader;
+import org.apache.kafka.common.errors.SerializationException;
+import org.apache.kafka.common.serialization.Deserializer;
+import ru.practicum.ewm.stats.kafka.UserActionAvro;
+
+@Slf4j
+public class UserActionAvroDeserializer implements Deserializer<UserActionAvro> {
+
+    private final SpecificDatumReader<UserActionAvro> datumReader = new SpecificDatumReader<>(
+        UserActionAvro.getClassSchema());
+
+    @Override
+    public void configure(Map<String, ?> configs, boolean isKey) {
+        // No-op
+    }
+
+    @Override
+    public UserActionAvro deserialize(String topic, byte[] data) {
+        if (data == null) {
+            return null;
+        }
+
+        try {
+            BinaryDecoder decoder = DecoderFactory.get().binaryDecoder(data, null);
+            return datumReader.read(null, decoder);
+        } catch (IOException e) {
+            log.error("Error deserializing Avro message for topic {}", topic, e);
+            throw new SerializationException("Error deserializing Avro message", e);
+        }
+    }
+
+    @Override
+    public void close() {
+        // No-op
+    }
+}
\ No newline at end of file
diff --git a/core/serialization/src/main/protobuf/analyzer.proto b/core/serialization/src/main/protobuf/analyzer.proto
new file mode 100644
index 0000000..bb757a4
--- /dev/null
+++ b/core/serialization/src/main/protobuf/analyzer.proto
@@ -0,0 +1,34 @@
+syntax = "proto3";
+
+package stats.service.dashboard;
+
+option java_package = "ru.practicum.ewm.stats.grpc";
+option java_multiple_files = true;
+
+service RecommendationsController {
+  rpc GetRecommendationsForUser(UserPredictionsRequestProto) returns (stream RecommendedEventProto);
+
+  rpc GetSimilarEvents(SimilarEventsRequestProto) returns (stream RecommendedEventProto);
+
+  rpc GetInteractionsCount(InteractionsCountRequestProto) returns (stream RecommendedEventProto);
+}
+
+message UserPredictionsRequestProto {
+  int64 user_id = 1;
+  int32 max_results = 2;
+}
+
+message SimilarEventsRequestProto {
+  int64 event_id = 1;
+  int64 user_id = 2;
+  int32 max_results = 3;
+}
+
+message InteractionsCountRequestProto {
+  repeated int64 event_ids = 1;
+}
+
+message RecommendedEventProto {
+  int64 event_id = 1;
+  double score = 2;
+}
\ No newline at end of file
diff --git a/core/serialization/src/main/protobuf/collector.proto b/core/serialization/src/main/protobuf/collector.proto
new file mode 100644
index 0000000..6a5a535
--- /dev/null
+++ b/core/serialization/src/main/protobuf/collector.proto
@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+package stats.service.collector;
+
+option java_package = "ru.practicum.ewm.stats.grpc";
+option java_multiple_files = true;
+
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/empty.proto";
+
+service UserActionController {
+  rpc CollectUserAction(UserActionProto) returns (google.protobuf.Empty);
+}
+
+enum ActionTypeProto {
+  ACTION_VIEW = 0;
+  ACTION_REGISTER = 1;
+  ACTION_LIKE = 2;
+}
+
+message UserActionProto {
+  int64 user_id = 1;
+  int64 event_id = 2;
+  ActionTypeProto action_type = 3;
+  google.protobuf.Timestamp timestamp = 4;
+}
\ No newline at end of file
diff --git a/core/stats-service/stats-client/pom.xml b/core/stats-client/pom.xml
similarity index 51%
rename from core/stats-service/stats-client/pom.xml
rename to core/stats-client/pom.xml
index 278aeb2..bcb768a 100644
--- a/core/stats-service/stats-client/pom.xml
+++ b/core/stats-client/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>ru.practicum</groupId>
-        <artifactId>stats-service</artifactId>
+        <artifactId>core</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -15,51 +15,41 @@
 
     <dependencies>
       <dependency>
-          <groupId>ru.practicum</groupId>
-          <artifactId>stats-dto</artifactId>
-          <version>${project.version}</version>
+        <groupId>ru.practicum</groupId>
+        <artifactId>serialization</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>net.devh</groupId>
+        <artifactId>grpc-client-spring-boot-starter</artifactId>
       </dependency>
+
       <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-web</artifactId>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-services</artifactId>
       </dependency>
+
       <dependency>
           <groupId>org.projectlombok</groupId>
           <artifactId>lombok</artifactId>
           <optional>true</optional>
       </dependency>
+
       <dependency>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-test</artifactId>
-          <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>ru.practicum</groupId>
-        <artifactId>interaction-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-openfeign-core</artifactId>
-      </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>mockwebserver</artifactId>
-      <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
-        <scope>test</scope>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-aop</artifactId>
       </dependency>
+
       <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-commons</artifactId>
-        <scope>test</scope>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
       </dependency>
+
       <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-aop</artifactId>
+        <groupId>jakarta.servlet</groupId>
+        <artifactId>jakarta.servlet-api</artifactId>
+        <scope>provided</scope>
       </dependency>
     </dependencies>
 
diff --git a/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/AnalyzerClient.java b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/AnalyzerClient.java
new file mode 100644
index 0000000..c086147
--- /dev/null
+++ b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/AnalyzerClient.java
@@ -0,0 +1,139 @@
+package ru.practicum.ewm.stats.client;
+
+import io.grpc.stub.StreamObserver;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.client.inject.GrpcClient;
+import org.springframework.stereotype.Component;
+import ru.practicum.ewm.stats.grpc.InteractionsCountRequestProto;
+import ru.practicum.ewm.stats.grpc.RecommendationsControllerGrpc;
+import ru.practicum.ewm.stats.grpc.RecommendedEventProto;
+import ru.practicum.ewm.stats.grpc.SimilarEventsRequestProto;
+import ru.practicum.ewm.stats.grpc.UserPredictionsRequestProto;
+
+@Component
+@Slf4j
+public class AnalyzerClient {
+
+    @GrpcClient("analyzer")
+    private RecommendationsControllerGrpc.RecommendationsControllerStub asyncStub;
+
+    public Map<Long, Double> getInteractionsCount(Collection<Long> eventIds) {
+        log.debug("Requesting interaction counts for {} events", eventIds.size());
+        InteractionsCountRequestProto request = InteractionsCountRequestProto.newBuilder()
+            .addAllEventIds(eventIds)
+            .build();
+
+        CompletableFuture<List<RecommendedEventProto>> future = new CompletableFuture<>();
+        List<RecommendedEventProto> results = new ArrayList<>();
+
+        asyncStub.getInteractionsCount(request, new StreamObserver<>() {
+            @Override
+            public void onNext(RecommendedEventProto value) {
+                results.add(value);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                log.error("gRPC stream for GetInteractionsCount failed", t);
+                future.completeExceptionally(t);
+            }
+
+            @Override
+            public void onCompleted() {
+                future.complete(results);
+            }
+        });
+
+        try {
+            List<RecommendedEventProto> finalResults = future.get(5, TimeUnit.SECONDS);
+            return finalResults.stream()
+                .collect(Collectors.toMap(RecommendedEventProto::getEventId, RecommendedEventProto::getScore));
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            log.error("Failed to get interaction counts from analyzer", e);
+            return Map.of();
+        }
+    }
+
+    public Map<Long, Double> getRecommendationsForUser(Long userId, int maxResults) {
+        log.debug("Requesting recommendations for user {}", userId);
+        UserPredictionsRequestProto request = UserPredictionsRequestProto.newBuilder()
+            .setUserId(userId)
+            .setMaxResults(maxResults)
+            .build();
+
+        CompletableFuture<List<RecommendedEventProto>> future = new CompletableFuture<>();
+        List<RecommendedEventProto> results = new ArrayList<>();
+
+        asyncStub.getRecommendationsForUser(request, new StreamObserver<RecommendedEventProto>() {
+            @Override
+            public void onNext(RecommendedEventProto value) {
+                results.add(value);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                log.error("gRPC stream for GetRecommendationsForUser failed", t);
+                future.completeExceptionally(t);
+            }
+
+            @Override
+            public void onCompleted() {
+                future.complete(results);
+            }
+        });
+
+        try {
+            List<RecommendedEventProto> finalResults = future.get(5, TimeUnit.SECONDS);
+            return finalResults.stream()
+                .collect(Collectors.toMap(RecommendedEventProto::getEventId, RecommendedEventProto::getScore));
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            log.error("Failed to get recommendations from analyzer", e);
+            return Map.of();
+        }
+    }
+
+    public Map<Long, Double> getSimilarEvents(Long eventId, Long userId, int maxResults) {
+        log.debug("Requesting similar events for event {}", eventId);
+        SimilarEventsRequestProto request = SimilarEventsRequestProto.newBuilder()
+            .setEventId(eventId).setUserId(userId).setMaxResults(maxResults).build();
+
+        CompletableFuture<List<RecommendedEventProto>> future = new CompletableFuture<>();
+        List<RecommendedEventProto> results = new ArrayList<>();
+
+        asyncStub.getSimilarEvents(request, new StreamObserver<RecommendedEventProto>() {
+            @Override
+            public void onNext(RecommendedEventProto value) {
+                results.add(value);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                log.error("gRPC stream for GetSimilarEvents failed", t);
+                future.completeExceptionally(t);
+            }
+
+            @Override
+            public void onCompleted() {
+                future.complete(results);
+            }
+        });
+
+        try {
+            List<RecommendedEventProto> finalResults = future.get(5, TimeUnit.SECONDS);
+            return finalResults.stream().collect(Collectors.toMap(RecommendedEventProto::getEventId,
+                RecommendedEventProto::getScore));
+        } catch (InterruptedException | ExecutionException | TimeoutException e) {
+            log.error("Failed to get similar events from analyzer", e);
+            return Map.of();
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/CollectorClient.java b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/CollectorClient.java
new file mode 100644
index 0000000..1b64cfa
--- /dev/null
+++ b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/CollectorClient.java
@@ -0,0 +1,38 @@
+package ru.practicum.ewm.stats.client;
+
+import com.google.protobuf.Empty;
+import io.grpc.stub.StreamObserver;
+import lombok.extern.slf4j.Slf4j;
+import net.devh.boot.grpc.client.inject.GrpcClient;
+import org.springframework.stereotype.Component;
+import ru.practicum.ewm.stats.grpc.UserActionControllerGrpc;
+import ru.practicum.ewm.stats.grpc.UserActionProto;
+
+@Component
+@Slf4j
+public class CollectorClient {
+
+    @GrpcClient("collector")
+    private UserActionControllerGrpc.UserActionControllerStub asyncStub;
+
+    public void collectUserAction(UserActionProto action) {
+        log.debug("Sending async gRPC call to collector: {}", action.getActionType());
+
+        asyncStub.collectUserAction(action, new StreamObserver<>() {
+            @Override
+            public void onNext(Empty value) {
+                log.debug("Collector acknowledged the user action.");
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                log.error("gRPC call to collector failed: {}", t.getMessage());
+            }
+
+            @Override
+            public void onCompleted() {
+                log.debug("gRPC stream to collector completed.");
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/ActionType.java b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/ActionType.java
new file mode 100644
index 0000000..bd5c87f
--- /dev/null
+++ b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/ActionType.java
@@ -0,0 +1,7 @@
+package ru.practicum.ewm.stats.client.aop;
+
+public enum ActionType {
+    VIEW,
+    REGISTER,
+    LIKE
+}
\ No newline at end of file
diff --git a/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/LogUserAction.java b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/LogUserAction.java
new file mode 100644
index 0000000..f7a2836
--- /dev/null
+++ b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/LogUserAction.java
@@ -0,0 +1,42 @@
+package ru.practicum.ewm.stats.client.aop;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * An annotation to automatically log a user action after a method executes successfully.
+ * <p>
+ * This annotation should be placed on a controller method that represents a user
+ * interaction with an event. The aspect {@link UserActionAspect} will intercept the call,
+ * build a {@link ru.practicum.ewm.stats.grpc.UserActionProto}, and send it to the
+ * collector service.
+ * <p>
+ * The method must be in a context of an HTTP request where the 'X-EWM-USER-ID'
+ * header is present.
+ *
+ * <p><b>Usage Example:</b></p>
+ * <pre>
+ * {@code
+ * @GetMapping("/{eventId}")
+ * @LogUserAction(value = ActionType.VIEW, eventId = "#eventId")
+ * public EventFullDto getEvent(@PathVariable Long eventId, @RequestHeader("X-EWM-USER-ID") long userId) {
+ *     // ...
+ * }
+ *
+ * @PostMapping
+ * @LogUserAction(value = ActionType.REGISTER, eventId = "#request.eventId")
+ * public ParticipationRequestDto createRequest(@RequestBody NewRequestDto request, ...) {
+ *     // ...
+ * }
+ * }
+ * </pre>
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LogUserAction {
+
+    ActionType value();
+    String eventId() default "#eventId";
+}
\ No newline at end of file
diff --git a/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/UserActionAspect.java b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/UserActionAspect.java
new file mode 100644
index 0000000..f6af56b
--- /dev/null
+++ b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/aop/UserActionAspect.java
@@ -0,0 +1,100 @@
+package ru.practicum.ewm.stats.client.aop;
+
+import com.google.protobuf.Timestamp;
+import java.lang.reflect.Method;
+import java.time.Instant;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import ru.practicum.ewm.stats.client.CollectorClient;
+import ru.practicum.ewm.stats.grpc.ActionTypeProto;
+import ru.practicum.ewm.stats.grpc.UserActionProto;
+
+@Aspect
+@RequiredArgsConstructor
+@Slf4j
+public class UserActionAspect {
+
+    private final CollectorClient collectorClient;
+    private final ExpressionParser expressionParser = new SpelExpressionParser();
+    private final ParameterNameDiscoverer parameterNameDiscoverer;
+
+    @AfterReturning(pointcut = "@annotation(logUserAction)", argNames = "joinPoint,logUserAction")
+    public void logAction(JoinPoint joinPoint, LogUserAction logUserAction) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes == null) {
+            log.warn("Cannot log user action: not in an HTTP request context.");
+            return;
+        }
+
+        String userIdStr = attributes.getRequest().getHeader("X-EWM-USER-ID");
+        if (userIdStr == null || userIdStr.isBlank()) {
+            log.warn("Cannot log user action: X-EWM-USER-ID header is missing.");
+            return;
+        }
+        long userId = Long.parseLong(userIdStr);
+
+        Long eventId = evaluateSpelExpression(joinPoint, logUserAction.eventId());
+        if (eventId == null) {
+            log.error("Could not evaluate SpEL expression '{}' to find eventId.", logUserAction.eventId());
+            return;
+        }
+
+        ActionTypeProto protoType = mapToActionTypeProto(logUserAction.value());
+
+        Instant now = Instant.now();
+        Timestamp timestamp = Timestamp.newBuilder().setSeconds(now.getEpochSecond()).setNanos(now.getNano()).build();
+
+        UserActionProto userAction = UserActionProto.newBuilder()
+            .setUserId(userId)
+            .setEventId(eventId)
+            .setActionType(protoType)
+            .setTimestamp(timestamp)
+            .build();
+
+        collectorClient.collectUserAction(userAction);
+        log.debug("Successfully logged user action: {}", userAction);
+    }
+
+    private Long evaluateSpelExpression(JoinPoint joinPoint, String spelExpression) {
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Method method = signature.getMethod();
+        String[] parameterNames = parameterNameDiscoverer.getParameterNames(method);
+        Object[] args = joinPoint.getArgs();
+
+        EvaluationContext context = new StandardEvaluationContext();
+        for (int i = 0; i < args.length; i++) {
+            if (parameterNames != null) {
+                context.setVariable(parameterNames[i], args[i]);
+            }
+        }
+
+        try {
+            Expression expression = expressionParser.parseExpression(spelExpression);
+            return expression.getValue(context, Long.class);
+        } catch (Exception e) {
+            log.error("Failed to evaluate SpEL expression '{}'", spelExpression, e);
+            return null;
+        }
+    }
+
+    private ActionTypeProto mapToActionTypeProto(ActionType nativeType) {
+        try {
+            return ActionTypeProto.valueOf("ACTION_" + nativeType.name());
+        } catch (IllegalArgumentException e) {
+            log.error("Unknown ActionType '{}'. Mapping to UNRECOGNIZED.", nativeType);
+            return ActionTypeProto.UNRECOGNIZED;
+        }
+    }
+}
\ No newline at end of file
diff --git a/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/autoconfiguration/CollectorClientAutoconfiguration.java b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/autoconfiguration/CollectorClientAutoconfiguration.java
new file mode 100644
index 0000000..25ea2f7
--- /dev/null
+++ b/core/stats-client/src/main/java/ru/practicum/ewm/stats/client/autoconfiguration/CollectorClientAutoconfiguration.java
@@ -0,0 +1,44 @@
+package ru.practicum.ewm.stats.client.autoconfiguration;
+
+import net.devh.boot.grpc.client.inject.GrpcClient;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.core.ParameterNameDiscoverer;
+import ru.practicum.ewm.stats.client.AnalyzerClient;
+import ru.practicum.ewm.stats.client.CollectorClient;
+import ru.practicum.ewm.stats.client.aop.UserActionAspect;
+
+@AutoConfiguration
+@ConditionalOnClass(GrpcClient.class)
+public class CollectorClientAutoconfiguration {
+
+    @Configuration
+    static class ClientBeans {
+        @Bean
+        public CollectorClient collectorClient() {
+            return new CollectorClient();
+        }
+
+        @Bean
+        public AnalyzerClient analyzerClient() {
+            return new AnalyzerClient();
+        }
+
+        @Bean
+        public ParameterNameDiscoverer parameterNameDiscoverer() {
+            return new DefaultParameterNameDiscoverer();
+        }
+    }
+
+    @Configuration
+    static class AopConfiguration {
+
+        @Bean
+        public UserActionAspect userActionAspect(CollectorClient collectorClient, ParameterNameDiscoverer discoverer) {
+            return new UserActionAspect(collectorClient, discoverer);
+        }
+    }
+}
diff --git a/core/stats-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/core/stats-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..94d2ca4
--- /dev/null
+++ b/core/stats-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+ru.practicum.ewm.stats.client.autoconfiguration.CollectorClientAutoconfiguration
\ No newline at end of file
diff --git a/core/stats-service/pom.xml b/core/stats-service/pom.xml
deleted file mode 100644
index eb35629..0000000
--- a/core/stats-service/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>ru.practicum</groupId>
-    <artifactId>core</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>stats-service</artifactId>
-  <packaging>pom</packaging>
-
-  <modules>
-    <module>stats-client</module>
-    <module>stats-dto</module>
-    <module>stats-server</module>
-  </modules>
-</project>
\ No newline at end of file
diff --git a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/StatsClient.java b/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/StatsClient.java
deleted file mode 100644
index a7fce6a..0000000
--- a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/StatsClient.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package ru.practicum.explorewithme.stats.client;
-
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@FeignClient(name = "stats-server")
-public interface StatsClient {
-
-    @PostMapping("/hit")
-    void saveHit(@RequestBody EndpointHitDto endpointHitDto);
-
-    @GetMapping("/stats")
-    List<ViewStatsDto> getStats(
-        @RequestParam @DateTimeFormat(pattern = DATE_TIME_FORMAT_PATTERN) LocalDateTime start,
-        @RequestParam @DateTimeFormat(pattern = DATE_TIME_FORMAT_PATTERN) LocalDateTime end,
-        @RequestParam(value = "uris", required = false) List<String> uris,
-        @RequestParam(value = "unique", defaultValue = "false") Boolean unique);
-}
diff --git a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/StatsClientImpl.java b/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/StatsClientImpl.java
deleted file mode 100644
index c9fcd9c..0000000
--- a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/StatsClientImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package ru.practicum.explorewithme.stats.client;
-
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMATTER;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestClient;
-import org.springframework.web.client.RestClientException;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-
-@Service
-@Slf4j
-public class StatsClientImpl implements StatsClient {
-
-    private final RestClient restClient;
-
-    @Autowired
-    public StatsClientImpl(@Value("${stats-server.url}") String statsServerUrl) {
-        this.restClient = RestClient.builder()
-                .baseUrl(statsServerUrl)
-                .defaultStatusHandler(HttpStatusCode::isError, (request, response) -> {
-                    String errorMessage = "Ошибка при обращении к сервису статистики: " +
-                            response.getStatusCode() + " " + response.getStatusText();
-                    log.error(errorMessage);
-
-                    // Обработка ошибок по типу
-                    if (response.getStatusCode().is4xxClientError()) {
-                        throw new RestClientException("Ошибка клиентского запроса: " + errorMessage);
-                    } else if (response.getStatusCode().is5xxServerError()) {
-                        throw new RestClientException("Ошибка сервера статистики: " + errorMessage);
-                    } else {
-                        throw new RestClientException(errorMessage);
-                    }
-                })
-                .build();
-    }
-
-    public StatsClientImpl(RestClient restClient) {
-        this.restClient = restClient;
-    }
-
-    @Override
-    public void saveHit(EndpointHitDto endpointHitDto) {
-        log.debug("Отправка данных статистики: {}", endpointHitDto);
-        restClient.post()
-                .uri("/hit")
-                .contentType(MediaType.APPLICATION_JSON)
-                .body(endpointHitDto)
-                .retrieve()
-                .toBodilessEntity();
-        log.debug("Статистика успешно сохранена");
-    }
-
-    @Override
-    public List<ViewStatsDto> getStats(LocalDateTime start, LocalDateTime end, List<String> uris, Boolean unique) {
-        log.debug("Запрос статистики: start={}, end={}, uris={}, unique={}", start, end, uris, unique);
-        List<ViewStatsDto> stats = restClient.get()
-                .uri(uriBuilder -> {
-                    uriBuilder.path("/stats")
-                            .queryParam("start", start
-                                    .format(DATE_TIME_FORMATTER))
-                            .queryParam("end", end
-                                    .format(DATE_TIME_FORMATTER));
-
-                    if (uris != null && !uris.isEmpty()) {
-                        for (String uri : uris) {
-                            uriBuilder.queryParam("uris", uri);
-                        }
-                    }
-
-                    if (unique != null) {
-                        uriBuilder.queryParam("unique", unique);
-                    }
-
-                    return uriBuilder.build();
-                })
-                .retrieve()
-                .body(new ParameterizedTypeReference<>() {});
-
-        log.debug("Получена статистика: {}", stats);
-        return stats;
-    }
-
-
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/aop/LogStatsHit.java b/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/aop/LogStatsHit.java
deleted file mode 100644
index 1cf2a2b..0000000
--- a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/aop/LogStatsHit.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package ru.practicum.explorewithme.stats.client.aop;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface LogStatsHit {
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/aop/StatsHitAspect.java b/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/aop/StatsHitAspect.java
deleted file mode 100644
index 4703bba..0000000
--- a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/aop/StatsHitAspect.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package ru.practicum.explorewithme.stats.client.aop;
-
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-import ru.practicum.explorewithme.stats.client.StatsClient;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-
-import java.time.LocalDateTime;
-
-@Aspect
-@Component
-@RequiredArgsConstructor
-@Slf4j
-public class StatsHitAspect {
-
-    private final StatsClient statsClient;
-
-    @Value("${spring.application.name:ewm-main-service}")
-    private String appName;
-
-    @Pointcut("@annotation(LogStatsHit)")
-    public void methodsToLogHit() {
-    }
-
-    @AfterReturning(pointcut = "methodsToLogHit()")
-    public void logHit(JoinPoint joinPoint) {
-        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        if (attributes == null) {
-            log.warn("Cannot log hit: HttpServletRequest is not available in the current context for method: {}",
-                joinPoint.getSignature().toShortString());
-            return;
-        }
-        HttpServletRequest request = attributes.getRequest();
-
-        String uri = request.getRequestURI();
-
-        String ip;
-        String xRealIp = request.getHeader("X-Real-IP");
-        if (StringUtils.hasText(xRealIp)) { // StringUtils.hasText проверяет на null, "", "   "
-            ip = xRealIp;
-            log.debug("StatsHitAspect: Using IP from X-Real-IP header: {}", ip);
-        } else {
-            ip = request.getRemoteAddr();
-            log.debug("StatsHitAspect: X-Real-IP header not found or empty, using remoteAddr: {}", ip);
-        }
-
-        LocalDateTime timestamp = LocalDateTime.now();
-
-        log.debug("StatsHitAspect: Logging hit for app='{}', uri='{}', ip='{}'", appName, uri, ip);
-
-        EndpointHitDto hitDto = EndpointHitDto.builder()
-            .app(appName)
-            .uri(uri)
-            .ip(ip)
-            .timestamp(timestamp)
-            .build();
-
-        try {
-            statsClient.saveHit(hitDto);
-            log.debug("StatsHitAspect: Hit successfully sent to stats service for URI: {}", uri);
-        } catch (Exception e) {
-            log.error("StatsHitAspect: Failed to send hit to stats service for URI: {}. Error: {}", uri, e.getMessage());
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/autoconfiguration/StatsClientAutoConfiguration.java b/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/autoconfiguration/StatsClientAutoConfiguration.java
deleted file mode 100644
index f850d28..0000000
--- a/core/stats-service/stats-client/src/main/java/ru/practicum/explorewithme/stats/client/autoconfiguration/StatsClientAutoConfiguration.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package ru.practicum.explorewithme.stats.client.autoconfiguration;
-
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.context.annotation.Bean;
-import ru.practicum.explorewithme.stats.client.StatsClient;
-import ru.practicum.explorewithme.stats.client.aop.StatsHitAspect;
-
-@AutoConfiguration
-@ConditionalOnBean(StatsClient.class)
-public class StatsClientAutoConfiguration {
-
-    @Bean
-    public StatsHitAspect statsHitAspect(StatsClient statsClient) {
-        return new StatsHitAspect(statsClient);
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/core/stats-service/stats-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index df76e89..0000000
--- a/core/stats-service/stats-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1 +0,0 @@
-ru.practicum.explorewithme.stats.client.autoconfiguration.StatsClientAutoConfiguration
\ No newline at end of file
diff --git a/core/stats-service/stats-client/src/main/resources/application-local.yaml b/core/stats-service/stats-client/src/main/resources/application-local.yaml
deleted file mode 100644
index c0c5be9..0000000
--- a/core/stats-service/stats-client/src/main/resources/application-local.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-stats-server:
-  url: http://localhost:9090
\ No newline at end of file
diff --git a/core/stats-service/stats-client/src/main/resources/application.yaml b/core/stats-service/stats-client/src/main/resources/application.yaml
deleted file mode 100644
index 5e2c53f..0000000
--- a/core/stats-service/stats-client/src/main/resources/application.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-stats-server:
-  url: http://stats-server:9090
\ No newline at end of file
diff --git a/core/stats-service/stats-dto/pom.xml b/core/stats-service/stats-dto/pom.xml
deleted file mode 100644
index 377cb50..0000000
--- a/core/stats-service/stats-dto/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>ru.practicum</groupId>
-    <artifactId>stats-service</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>stats-dto</artifactId>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>jakarta.validation</groupId>
-      <artifactId>jakarta.validation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate.validator</groupId>
-      <artifactId>hibernate-validator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>jakarta.el</artifactId>
-      <version>4.0.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ru.practicum</groupId>
-      <artifactId>interaction-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/core/stats-service/stats-dto/src/main/java/ru/practicum/explorewithme/stats/dto/EndpointHitDto.java b/core/stats-service/stats-dto/src/main/java/ru/practicum/explorewithme/stats/dto/EndpointHitDto.java
deleted file mode 100644
index 81176c8..0000000
--- a/core/stats-service/stats-dto/src/main/java/ru/practicum/explorewithme/stats/dto/EndpointHitDto.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package ru.practicum.explorewithme.stats.dto;
-
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.PastOrPresent;
-import jakarta.validation.constraints.Size;
-import lombok.*;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.experimental.FieldDefaults;
-
-import java.time.LocalDateTime;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@JsonIgnoreProperties(ignoreUnknown = true)
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class EndpointHitDto {
-
-    @NotBlank(message = "Поле app не может быть пустым")
-    @Size(min = 1, max = 32, message = "Поле app должно быть от 1 до 32 символов")
-    String app;
-
-    @NotBlank(message = "Поле uri не может быть пустым")
-    @Size(min = 1, max = 128, message = "Поле uri должно быть от 1 до 128 символов")
-    String uri;
-
-    @NotBlank(message = "Поле ip не может быть пустым")
-    @Size(min = 7, max = 16, message = "Поле ip должно быть от 7 до 16 символов")
-    String ip;
-
-    @NotNull(message = "Поле timestamp не может быть пустым")
-    @PastOrPresent(message = "Поле timestamp должно быть не позже текущей даты и времени")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DATE_TIME_FORMAT_PATTERN)
-    LocalDateTime timestamp;
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-dto/src/main/java/ru/practicum/explorewithme/stats/dto/ViewStatsDto.java b/core/stats-service/stats-dto/src/main/java/ru/practicum/explorewithme/stats/dto/ViewStatsDto.java
deleted file mode 100644
index 71c28e3..0000000
--- a/core/stats-service/stats-dto/src/main/java/ru/practicum/explorewithme/stats/dto/ViewStatsDto.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ru.practicum.explorewithme.stats.dto;
-
-import lombok.*;
-import lombok.experimental.FieldDefaults;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ViewStatsDto {
-    String app;
-    String uri;
-    Long hits;
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-dto/src/test/java/ru/practicum/explorewithme/stats/dto/EndpointHitDtoTest.java b/core/stats-service/stats-dto/src/test/java/ru/practicum/explorewithme/stats/dto/EndpointHitDtoTest.java
deleted file mode 100644
index 2f63769..0000000
--- a/core/stats-service/stats-dto/src/test/java/ru/practicum/explorewithme/stats/dto/EndpointHitDtoTest.java
+++ /dev/null
@@ -1,400 +0,0 @@
-// CHECKSTYLE:OFF RegexpSinglelineJava
-package ru.practicum.explorewithme.stats.dto;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.Validation;
-import jakarta.validation.Validator;
-import jakarta.validation.ValidatorFactory;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Set;
-import java.util.stream.Stream;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
-
-@DisplayName("Тесты для EndpointHitDto")
-class EndpointHitDtoTest {
-    private ObjectMapper objectMapper;
-    private Validator validator;
-
-    @BeforeEach
-    void setUp() {
-        objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule());
-        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-
-        ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-        validator = factory.getValidator();
-    }
-
-    @Nested
-    @DisplayName("Сериализация и десериализация")
-    class SerializationTests {
-        @Test
-        @DisplayName("Корректная сериализация в JSON")
-        void testSerializationToJson() throws Exception {
-            // Подготовка тестовых данных
-            LocalDateTime timestamp = LocalDateTime.of(2024, 3, 15, 12, 30, 0);
-            EndpointHitDto dto = new EndpointHitDto(
-                    "test-app",
-                    "/test/path",
-                    "192.168.1.1",
-                    timestamp
-            );
-
-            // Сериализация в JSON
-            String json = objectMapper.writeValueAsString(dto);
-
-            // Проверки с информативными сообщениями
-            assertThat(json)
-                    .as("JSON должен содержать поле app с правильным значением")
-                    .contains("\"app\":\"test-app\"");
-
-            assertThat(json)
-                    .as("JSON должен содержать поле uri с правильным значением")
-                    .contains("\"uri\":\"/test/path\"");
-
-            assertThat(json)
-                    .as("JSON должен содержать поле ip с правильным значением")
-                    .contains("\"ip\":\"192.168.1.1\"");
-
-            assertThat(json)
-                    .as("JSON должен содержать поле timestamp в формате " + DATE_TIME_FORMAT_PATTERN)
-                    .contains("\"timestamp\":\"2024-03-15 12:30:00\"");
-        }
-
-        @Test
-        @DisplayName("Корректная десериализация из JSON")
-        void testDeserializationFromJson() throws Exception {
-            // Подготовка JSON
-            String json = """
-                    {
-                        "app": "test-app",
-                        "uri": "/test/path",
-                        "ip": "192.168.1.1",
-                        "timestamp": "2024-03-15 12:30:00"
-                    }""";
-
-            // Десериализация из JSON
-            EndpointHitDto dto = objectMapper.readValue(json, EndpointHitDto.class);
-
-            // Проверки с информативными сообщениями
-            assertThat(dto.getApp())
-                    .as("Поле app должно быть правильно десериализовано")
-                    .isEqualTo("test-app");
-
-            assertThat(dto.getUri())
-                    .as("Поле uri должно быть правильно десериализовано")
-                    .isEqualTo("/test/path");
-
-            assertThat(dto.getIp())
-                    .as("Поле ip должно быть правильно десериализовано")
-                    .isEqualTo("192.168.1.1");
-
-            assertThat(dto.getTimestamp())
-                    .as("Поле timestamp должно быть правильно десериализовано")
-                    .isEqualTo(LocalDateTime.of(2024, 3, 15, 12, 30, 0));
-        }
-
-        @Test
-        @DisplayName("Ошибка при неверном формате даты")
-        void testInvalidTimestampFormat() {
-            // Подготовка JSON с неверным форматом даты
-            String json = """
-                    {
-                        "app": "test-app",
-                        "uri": "/test/path",
-                        "ip": "192.168.1.1",
-                        "timestamp": "2024-03-15T12:30:00"
-                    }""";
-
-            // Проверка исключения при неверном формате
-            Exception exception = assertThrows(
-                    Exception.class,
-                    () -> objectMapper.readValue(json, EndpointHitDto.class),
-                    "Должно быть выброшено исключение при неверном формате даты"
-            );
-
-            assertThat(exception.getMessage())
-                    .as("Сообщение об ошибке должно указывать на проблему с форматом даты")
-                    .contains("timestamp");
-        }
-
-        @Test
-        @DisplayName("Десериализация с дополнительными полями")
-        void testDeserializationWithExtraFields() throws Exception {
-            // JSON с дополнительными полями
-            String json = """
-                    {
-                        "app": "test-app",
-                        "uri": "/test/path",
-                        "ip": "192.168.1.1",
-                        "timestamp": "2024-03-15 12:30:00",
-                        "extraField": "extra value"
-                    }""";
-
-            // Десериализация
-            EndpointHitDto dto = objectMapper.readValue(json, EndpointHitDto.class);
-
-            // Проверки основных полей - должны быть правильно заполнены
-            assertThat(dto.getApp()).isEqualTo("test-app");
-            assertThat(dto.getUri()).isEqualTo("/test/path");
-            assertThat(dto.getIp()).isEqualTo("192.168.1.1");
-            assertThat(dto.getTimestamp()).isEqualTo(LocalDateTime.of(2024, 3, 15, 12, 30, 0));
-        }
-
-        @Test
-        @DisplayName("Обработка null-значений")
-        void testNullValues() throws Exception {
-            // Создание объекта с null-значениями
-            EndpointHitDto dto = new EndpointHitDto(null, null, null, null);
-
-            // Сериализация
-            String json = objectMapper.writeValueAsString(dto);
-
-            // Десериализация
-            EndpointHitDto deserializedDto = objectMapper.readValue(json, EndpointHitDto.class);
-
-            // Проверки
-            assertThat(deserializedDto.getApp()).isNull();
-            assertThat(deserializedDto.getUri()).isNull();
-            assertThat(deserializedDto.getIp()).isNull();
-            assertThat(deserializedDto.getTimestamp()).isNull();
-        }
-    }
-
-    @Nested
-    @DisplayName("Валидация полей")
-    class ValidationTests {
-        @Test
-        @DisplayName("Валидация пустого app")
-        void testEmptyAppValidation() {
-            // Создаем DTO с нарушением валидационных ограничений
-            EndpointHitDto dto = new EndpointHitDto(
-                    "", // пустое app (нарушает @NotBlank)
-                    "/uri",
-                    "192.168.1.1",
-                    LocalDateTime.now()
-            );
-
-            // Проверяем, что валидация выявила ошибки
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Должно быть обнаружено нарушение валидации для поля app")
-                    .isNotEmpty();
-
-            assertThat(violations)
-                    .as("Должно быть сообщение об ошибке для поля app")
-                    .anyMatch(v -> v.getPropertyPath().toString().equals("app"));
-        }
-
-        @Test
-        @DisplayName("Валидация длинного uri (более 128 символов)")
-        void testUriTooLongValidation() {
-            // Создаем URI длиной более 128 символов
-            String longUri = "/".repeat(129);
-
-            EndpointHitDto dto = new EndpointHitDto(
-                    "app",
-                    longUri,
-                    "192.168.1.1",
-                    LocalDateTime.now()
-            );
-
-            // Проверяем, что валидация выявила ошибки
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Должно быть обнаружено нарушение валидации для поля uri")
-                    .isNotEmpty();
-
-            assertThat(violations)
-                    .as("Должно быть сообщение об ошибке для поля uri")
-                    .anyMatch(v -> v.getPropertyPath().toString().equals("uri"));
-        }
-
-        @Test
-        @DisplayName("Валидация IP адреса (слишком короткий)")
-        void testIpTooShortValidation() {
-            // IP адрес короче 7 символов
-            EndpointHitDto dto = new EndpointHitDto(
-                    "app",
-                    "/uri",
-                    "1.1.1", // слишком короткий IP
-                    LocalDateTime.now()
-            );
-
-            // Проверяем, что валидация выявила ошибки
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Должно быть обнаружено нарушение валидации для поля ip")
-                    .isNotEmpty();
-
-            assertThat(violations)
-                    .as("Должно быть сообщение об ошибке для поля ip")
-                    .anyMatch(v -> v.getPropertyPath().toString().equals("ip"));
-        }
-
-        @Test
-        @DisplayName("Валидация даты в будущем")
-        void testFutureTimestampValidation() {
-            // Timestamp в будущем (не соответствует @PastOrPresent)
-            LocalDateTime futureTime = LocalDateTime.now().plus(1, ChronoUnit.DAYS);
-
-            EndpointHitDto dto = new EndpointHitDto(
-                    "app",
-                    "/uri",
-                    "192.168.1.1",
-                    futureTime
-            );
-
-            // Проверяем, что валидация выявила ошибки
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Должно быть обнаружено нарушение валидации для поля timestamp")
-                    .isNotEmpty();
-
-            assertThat(violations)
-                    .as("Должно быть сообщение об ошибке для поля timestamp")
-                    .anyMatch(v -> v.getPropertyPath().toString().equals("timestamp"));
-        }
-
-        @ParameterizedTest
-        @MethodSource("invalidDtoProvider")
-        @DisplayName("Параметризованный тест для различных нарушений валидации")
-        void testValidationConstraints(String app, String uri, String ip, LocalDateTime timestamp, String expectedField) {
-            // Создаем DTO с указанными параметрами
-            EndpointHitDto dto = new EndpointHitDto(app, uri, ip, timestamp);
-
-            // Проверяем валидацию
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Должна быть обнаружена ошибка валидации")
-                    .isNotEmpty();
-
-            assertThat(violations)
-                    .as("Должна быть ошибка для поля " + expectedField)
-                    .anyMatch(v -> v.getPropertyPath().toString().equals(expectedField));
-        }
-
-        static Stream<Arguments> invalidDtoProvider() {
-            return Stream.of(
-                    // app, uri, ip, timestamp, expectedViolationField
-                    Arguments.of(null, "/uri", "192.168.1.1", LocalDateTime.now(), "app"),
-                    Arguments.of("app", null, "192.168.1.1", LocalDateTime.now(), "uri"),
-                    Arguments.of("app", "/uri", null, LocalDateTime.now(), "ip"),
-                    Arguments.of("app", "/uri", "192.168.1.1", null, "timestamp"),
-                    Arguments.of("app", "", "192.168.1.1", LocalDateTime.now(), "uri"),
-                    Arguments.of("app", "/uri", "ip", LocalDateTime.now(), "ip") // слишком короткий IP
-            );
-        }
-    }
-
-    @Nested
-    @DisplayName("Граничные значения")
-    class BoundaryTests {
-        @Test
-        @DisplayName("Максимально допустимая длина app (32 символа)")
-        void testMaxAppLength() throws Exception {
-            // Создаем app длиной ровно 32 символа
-            String maxLengthApp = "a".repeat(32);
-
-            EndpointHitDto dto = new EndpointHitDto(
-                    maxLengthApp,
-                    "/uri",
-                    "192.168.1.1",
-                    LocalDateTime.now()
-            );
-
-            // Валидация должна пройти успешно
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Не должно быть нарушений валидации для app длиной 32 символа")
-                    .isEmpty();
-
-            // Проверяем сериализацию/десериализацию
-            String json = objectMapper.writeValueAsString(dto);
-            EndpointHitDto deserializedDto = objectMapper.readValue(json, EndpointHitDto.class);
-
-            assertThat(deserializedDto.getApp())
-                    .as("App должен быть корректно сериализован и десериализован")
-                    .isEqualTo(maxLengthApp);
-        }
-
-        @Test
-        @DisplayName("Максимально допустимая длина uri (128 символов)")
-        void testMaxUriLength() throws Exception {
-            // Создаем uri длиной ровно 128 символов
-            String maxLengthUri = "/".repeat(128);
-
-            EndpointHitDto dto = new EndpointHitDto(
-                    "app",
-                    maxLengthUri,
-                    "192.168.1.1",
-                    LocalDateTime.now()
-            );
-
-            // Валидация должна пройти успешно
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Не должно быть нарушений валидации для uri длиной 128 символов")
-                    .isEmpty();
-
-            // Проверяем сериализацию/десериализацию
-            String json = objectMapper.writeValueAsString(dto);
-            EndpointHitDto deserializedDto = objectMapper.readValue(json, EndpointHitDto.class);
-
-            assertThat(deserializedDto.getUri())
-                    .as("URI должен быть корректно сериализован и десериализован")
-                    .isEqualTo(maxLengthUri);
-        }
-
-        @Test
-        @DisplayName("Минимально допустимая длина ip (7 символов)")
-        void testMinIpLength() throws Exception {
-            // Создаем ip длиной ровно 7 символов
-            String minLengthIp = "1.1.1.1"; // ровно 7 символов
-
-            EndpointHitDto dto = new EndpointHitDto(
-                    "app",
-                    "/uri",
-                    minLengthIp,
-                    LocalDateTime.now()
-            );
-
-            // Валидация должна пройти успешно
-            Set<ConstraintViolation<EndpointHitDto>> violations = validator.validate(dto);
-
-            assertThat(violations)
-                    .as("Не должно быть нарушений валидации для ip длиной 7 символов")
-                    .isEmpty();
-
-            // Проверяем сериализацию/десериализацию
-            String json = objectMapper.writeValueAsString(dto);
-            EndpointHitDto deserializedDto = objectMapper.readValue(json, EndpointHitDto.class);
-
-            assertThat(deserializedDto.getIp())
-                    .as("IP должен быть корректно сериализован и десериализован")
-                    .isEqualTo(minLengthIp);
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-dto/src/test/java/ru/practicum/explorewithme/stats/dto/ViewStatsDtoTest.java b/core/stats-service/stats-dto/src/test/java/ru/practicum/explorewithme/stats/dto/ViewStatsDtoTest.java
deleted file mode 100644
index 8ccc8fc..0000000
--- a/core/stats-service/stats-dto/src/test/java/ru/practicum/explorewithme/stats/dto/ViewStatsDtoTest.java
+++ /dev/null
@@ -1,217 +0,0 @@
-// CHECKSTYLE:OFF RegexpSinglelineJava
-package ru.practicum.explorewithme.stats.dto;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-
-@DisplayName("Тесты для ViewStatsDto")
-class ViewStatsDtoTest {
-    private ObjectMapper objectMapper;
-
-    @BeforeEach
-    void setUp() {
-        objectMapper = new ObjectMapper();
-    }
-
-    @Nested
-    @DisplayName("Сериализация и десериализация")
-    class SerializationTests {
-        @Test
-        @DisplayName("Корректная сериализация в JSON")
-        void testSerializationToJson() throws Exception {
-            // Подготовка тестовых данных
-            ViewStatsDto dto = new ViewStatsDto("test-service", "/events/1", 100L);
-
-            // Сериализация в JSON
-            String json = objectMapper.writeValueAsString(dto);
-
-            // Проверки с информативными сообщениями
-            assertThat(json)
-                    .as("JSON должен содержать поле app с правильным значением")
-                    .contains("\"app\":\"test-service\"");
-
-            assertThat(json)
-                    .as("JSON должен содержать поле uri с правильным значением")
-                    .contains("\"uri\":\"/events/1\"");
-
-            assertThat(json)
-                    .as("JSON должен содержать поле hits с правильным значением")
-                    .contains("\"hits\":100");
-        }
-
-        @Test
-        @DisplayName("Корректная десериализация из JSON")
-        void testDeserializationFromJson() throws Exception {
-            // Подготовка JSON
-            String json = """
-                    {
-                        "app": "test-service",
-                        "uri": "/events/1",
-                        "hits": 100
-                    }""";
-
-            // Десериализация из JSON
-            ViewStatsDto dto = objectMapper.readValue(json, ViewStatsDto.class);
-
-            // Проверки с информативными сообщениями
-            assertThat(dto.getApp())
-                    .as("Поле app должно быть правильно десериализовано")
-                    .isEqualTo("test-service");
-
-            assertThat(dto.getUri())
-                    .as("Поле uri должно быть правильно десериализовано")
-                    .isEqualTo("/events/1");
-
-            assertThat(dto.getHits())
-                    .as("Поле hits должно быть правильно десериализовано")
-                    .isEqualTo(100L);
-        }
-
-        @Test
-        @DisplayName("Десериализация с отсутствующими полями")
-        void testDeserializationWithMissingFields() throws Exception {
-            // JSON с отсутствующими полями
-            String json = """
-                    {
-                        "app": "test-service"
-                    }""";
-
-            ViewStatsDto dto = objectMapper.readValue(json, ViewStatsDto.class);
-
-            // Проверки
-            assertThat(dto.getApp())
-                    .as("Поле app должно быть правильно десериализовано")
-                    .isEqualTo("test-service");
-
-            assertThat(dto.getUri())
-                    .as("Поле uri должно быть null при отсутствии в JSON")
-                    .isNull();
-
-            assertThat(dto.getHits())
-                    .as("Поле hits должно быть null при отсутствии в JSON")
-                    .isNull();
-        }
-
-        @Test
-        @DisplayName("Обработка null-значений")
-        void testNullValues() throws Exception {
-            // Создание объекта с null-значениями
-            ViewStatsDto dto = new ViewStatsDto(null, null, null);
-
-            // Сериализация
-            String json = objectMapper.writeValueAsString(dto);
-
-            // Десериализация
-            ViewStatsDto deserializedDto = objectMapper.readValue(json, ViewStatsDto.class);
-
-            // Проверки
-            assertThat(deserializedDto.getApp()).isNull();
-            assertThat(deserializedDto.getUri()).isNull();
-            assertThat(deserializedDto.getHits()).isNull();
-        }
-
-        @Test
-        @DisplayName("Ошибка при неверном типе данных (hits не число)")
-        void testInvalidHitsType() {
-            // JSON с неверным типом поля hits
-            String json = """
-                    {
-                        "app": "test-service",
-                        "uri": "/events/1",
-                        "hits": "not-a-number"
-                    }""";
-
-            // Проверка исключения при неверном типе
-            Exception exception = assertThrows(
-                    Exception.class,
-                    () -> objectMapper.readValue(json, ViewStatsDto.class),
-                    "Должно быть выброшено исключение при неверном типе поля hits"
-            );
-
-            assertThat(exception.getMessage())
-                    .as("Сообщение об ошибке должно указывать на проблему с типом hits")
-                    .contains("hits");
-        }
-    }
-
-    @Nested
-    @DisplayName("Тесты конструкторов и методов")
-    class ConstructorTests {
-        @Test
-        @DisplayName("Конструктор со всеми параметрами")
-        void testAllArgsConstructor() {
-            // Создание объекта через конструктор со всеми аргументами
-            ViewStatsDto dto = new ViewStatsDto("app-name", "/uri", 200L);
-
-            // Проверки
-            assertThat(dto.getApp()).isEqualTo("app-name");
-            assertThat(dto.getUri()).isEqualTo("/uri");
-            assertThat(dto.getHits()).isEqualTo(200L);
-        }
-
-        @Test
-        @DisplayName("Конструктор без аргументов")
-        void testNoArgsConstructor() {
-            // Создание объекта через конструктор без аргументов
-            ViewStatsDto dto = new ViewStatsDto();
-
-            // Проверки
-            assertThat(dto.getApp()).isNull();
-            assertThat(dto.getUri()).isNull();
-            assertThat(dto.getHits()).isNull();
-        }
-
-        @Test
-        @DisplayName("Сеттеры")
-        void testSetters() {
-            // Создание объекта через конструктор без аргументов
-            ViewStatsDto dto = new ViewStatsDto();
-
-            // Установка значений через сеттеры
-            dto.setApp("app-from-setter");
-            dto.setUri("/uri-from-setter");
-            dto.setHits(300L);
-
-            // Проверки
-            assertThat(dto.getApp()).isEqualTo("app-from-setter");
-            assertThat(dto.getUri()).isEqualTo("/uri-from-setter");
-            assertThat(dto.getHits()).isEqualTo(300L);
-        }
-
-        @Test
-        @DisplayName("Equals и HashCode")
-        void testEqualsAndHashCode() {
-            // Создание двух одинаковых объектов
-            ViewStatsDto dto1 = new ViewStatsDto("same-app", "/same-uri", 100L);
-            ViewStatsDto dto2 = new ViewStatsDto("same-app", "/same-uri", 100L);
-
-            // Проверка equals
-            assertThat(dto1)
-                    .as("Объекты с одинаковыми полями должны быть равны")
-                    .isEqualTo(dto2);
-
-            // Проверка hashCode
-            assertThat(dto1.hashCode())
-                    .as("Хеш-коды объектов с одинаковыми полями должны совпадать")
-                    .isEqualTo(dto2.hashCode());
-
-            // Изменяем один из объектов
-            dto2.setHits(200L);
-
-            // Проверка, что equals и hashCode различаются
-            assertThat(dto1)
-                    .as("Объекты с разными полями не должны быть равны")
-                    .isNotEqualTo(dto2);
-
-            assertThat(dto1.hashCode())
-                    .as("Хеш-коды объектов с разными полями не должны совпадать")
-                    .isNotEqualTo(dto2.hashCode());
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/StatsServerApplication.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/StatsServerApplication.java
deleted file mode 100644
index 328ea08..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/StatsServerApplication.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ru.practicum.explorewithme.stats.server;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-
-@SpringBootApplication
-@EnableDiscoveryClient
-public class StatsServerApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(StatsServerApplication.class, args);
-    }
-
-}
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/controller/StatsController.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/controller/StatsController.java
deleted file mode 100644
index 1551865..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/controller/StatsController.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package ru.practicum.explorewithme.stats.server.controller;
-
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMAT_PATTERN;
-
-import jakarta.validation.Valid;
-import java.time.LocalDateTime;
-import java.util.List;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.stats.client.StatsClient;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-import ru.practicum.explorewithme.stats.server.service.StatsService;
-
-@RestController
-@RequestMapping
-@RequiredArgsConstructor
-@Slf4j
-@SuppressWarnings("unused")
-public class StatsController implements StatsClient {
-
-    private final StatsService statsService;
-
-    /**
-     * Сохранение информации о том, что к эндпоинту был запрос
-     *
-     * @param endpointHitDto данные запроса
-     */
-    @PostMapping("/hit")
-    @ResponseStatus(HttpStatus.CREATED)
-    public void saveHit(@Valid @RequestBody EndpointHitDto endpointHitDto) {
-        log.info("Controller: request to save new hit received.");
-        log.debug("Saving new hit: {}", endpointHitDto);
-        statsService.saveHit(endpointHitDto);
-    }
-
-    /**
-     * Получение статистики по посещениям.
-     *
-     * @param start  Дата и время начала диапазона (в формате "yyyy-MM-dd HH:mm:ss")
-     * @param end    Дата и время конца диапазона (в формате "yyyy-MM-dd HH:mm:ss")
-     * @param uris   Список uri для которых нужно выгрузить статистику (опционально)
-     * @param unique Нужно ли учитывать только уникальные посещения (опционально, default: false)
-     * @return Список ViewStatsDto со статистикой
-     */
-    @GetMapping("/stats")
-    @ResponseStatus(HttpStatus.OK)
-    public List<ViewStatsDto> getStats(
-        @RequestParam(name = "start")
-        @DateTimeFormat(pattern = DATE_TIME_FORMAT_PATTERN)
-        LocalDateTime start,
-
-        @RequestParam(name = "end")
-        @DateTimeFormat(pattern = DATE_TIME_FORMAT_PATTERN)
-        LocalDateTime end,
-
-        @RequestParam(name = "uris", required = false) List<String> uris,
-        @RequestParam(name = "unique", defaultValue = "false") Boolean unique) {
-
-        log.info("Controller: request to retrieve stats received.");
-        log.debug("Request params: start={}, end={}, uris={}, unique={}",
-            start, end, uris, unique);
-
-        return statsService.getStats(start, end, uris, unique);
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/error/GlobalExceptionHandler.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/error/GlobalExceptionHandler.java
deleted file mode 100644
index 9a215a1..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/error/GlobalExceptionHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package ru.practicum.explorewithme.stats.server.error;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.MissingServletRequestParameterException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.practicum.explorewithme.api.error.ApiError;
-
-@RestControllerAdvice
-@Slf4j
-@SuppressWarnings("unused")
-public class GlobalExceptionHandler {
-
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    public ApiError handleMethodArgumentNotValidException(final MethodArgumentNotValidException e) {
-        List<String> errors = e.getBindingResult()
-            .getFieldErrors()
-            .stream()
-            .map(error -> error.getField() + ": " + error.getDefaultMessage())
-            .collect(Collectors.toList());
-        String errorMessage = "Validation error(s): " + String.join("; ", errors);
-        log.warn(errorMessage, e);
-        return ApiError.builder()
-            .errors(errors)
-            .status(HttpStatus.BAD_REQUEST)
-            .reason("Incorrectly made request due to validation errors.")
-            .message(errorMessage)
-            .timestamp(LocalDateTime.now())
-            .build();
-    }
-
-    @ExceptionHandler(MissingServletRequestParameterException.class)
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    public ApiError handleMissingServletRequestParameter(final MissingServletRequestParameterException e) {
-        String errorMessage = "Required request parameter is not present: " + e.getParameterName();
-        log.warn(errorMessage, e);
-        return ApiError.builder()
-            .status(HttpStatus.BAD_REQUEST)
-            .reason("Incorrectly made request.")
-            .message(errorMessage)
-            .timestamp(LocalDateTime.now())
-            .build();
-    }
-
-    @ExceptionHandler(IllegalArgumentException.class)
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    public ApiError handleIllegalArgumentException(final IllegalArgumentException e) {
-        log.warn("Illegal argument: {}", e.getMessage(), e);
-        return ApiError.builder()
-            .status(HttpStatus.BAD_REQUEST)
-            .reason("Incorrectly made request due to an invalid argument.")
-            .message(e.getMessage())
-            .timestamp(LocalDateTime.now())
-            .build();
-    }
-
-    @ExceptionHandler(Throwable.class)
-    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-    public ApiError handleThrowable(final Throwable e) {
-        log.error("An unexpected error occurred: {}", e.getMessage(), e);
-        return ApiError.builder()
-            .status(HttpStatus.INTERNAL_SERVER_ERROR)
-            .reason("An unexpected error occurred on the server.")
-            .message("An internal server error has occurred: " + e.getMessage())
-            .timestamp(LocalDateTime.now())
-            .build();
-    }
-}
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/mapper/EndpointHitMapper.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/mapper/EndpointHitMapper.java
deleted file mode 100644
index 5e0b19f..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/mapper/EndpointHitMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package ru.practicum.explorewithme.stats.server.mapper;
-
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.server.model.EndpointHit;
-
-public interface EndpointHitMapper {
-
-    /**
-     * Преобразует EndpointHitDto в сущность EndpointHit.
-     *
-     * @param dto объект EndpointHitDto для преобразования.
-     * @return сущность EndpointHit, или null если dto равен null.
-     */
-    EndpointHit toEndpointHit(EndpointHitDto dto);
-
-    /**
-     * Преобразует сущность EndpointHit в EndpointHitDto.
-     *
-     * @param entity сущность EndpointHit для преобразования.
-     * @return объект EndpointHitDto, или null если entity равен null.
-     */
-    EndpointHitDto toEndpointHitDto(EndpointHit entity);
-
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/mapper/EndpointHitMapperImpl.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/mapper/EndpointHitMapperImpl.java
deleted file mode 100644
index 1bee762..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/mapper/EndpointHitMapperImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package ru.practicum.explorewithme.stats.server.mapper;
-
-
-import org.springframework.stereotype.Component;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.server.model.EndpointHit;
-
-@Component
-public class EndpointHitMapperImpl implements EndpointHitMapper {
-
-    @Override
-    public EndpointHit toEndpointHit(EndpointHitDto dto) {
-        if (dto == null) {
-            return null;
-        }
-
-        return EndpointHit.builder().app(dto.getApp()).uri(dto.getUri()).ip(dto.getIp())
-            .timestamp(dto.getTimestamp()).build();
-    }
-
-    @Override
-    public EndpointHitDto toEndpointHitDto(EndpointHit entity) {
-        if (entity == null) {
-            return null;
-        }
-
-        return EndpointHitDto.builder().app(entity.getApp()).uri(entity.getUri()).ip(entity.getIp())
-            .timestamp(entity.getTimestamp()).build();
-
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/model/EndpointHit.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/model/EndpointHit.java
deleted file mode 100644
index a12fa79..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/model/EndpointHit.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package ru.practicum.explorewithme.stats.server.model;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import java.time.LocalDateTime;
-import java.util.Objects;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
-
-@Entity
-@Table(name = "endpoint_hits")
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ToString
-@Builder
-public class EndpointHit {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "app", nullable = false, length = 32)
-    private String app;
-
-    @Column(name = "uri", nullable = false, length = 128)
-    private String uri;
-
-    @Column(name = "ip", nullable = false, length = 16)
-    private String ip;
-
-    @Column(name = "timestamp", nullable = false)
-    private LocalDateTime timestamp;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        return id != null && id.equals(((EndpointHit) o).getId());
-    }
-
-    @Override
-    public int hashCode() {
-        return id != null ? Objects.hash(id) : getClass().hashCode();
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/repository/StatsRepository.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/repository/StatsRepository.java
deleted file mode 100644
index eece591..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/repository/StatsRepository.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package ru.practicum.explorewithme.stats.server.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-import ru.practicum.explorewithme.stats.server.model.EndpointHit;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.List;
-
-@Repository
-public interface StatsRepository extends JpaRepository<EndpointHit, Long> {
-
-    @Query("SELECT new ru.practicum.explorewithme.stats.dto.ViewStatsDto(eh.app, eh.uri, COUNT(eh.ip)) " +
-        "FROM EndpointHit eh " +
-        "WHERE eh.timestamp BETWEEN :start AND :end " +
-        "AND (:uris IS NULL OR eh.uri IN :uris) " +
-        "GROUP BY eh.app, eh.uri " +
-        "ORDER BY COUNT(eh.ip) DESC")
-    List<ViewStatsDto> findStats(
-        @Param("start") LocalDateTime start,
-        @Param("end") LocalDateTime end,
-        @Param("uris") Collection<String> uris);
-
-    @Query("SELECT new ru.practicum.explorewithme.stats.dto.ViewStatsDto(eh.app, eh.uri, COUNT(DISTINCT eh.ip)) " +
-        "FROM EndpointHit eh " +
-        "WHERE eh.timestamp BETWEEN :start AND :end " +
-        "AND (:uris IS NULL OR eh.uri IN :uris) " +
-        "GROUP BY eh.app, eh.uri " +
-        "ORDER BY COUNT(DISTINCT eh.ip) DESC")
-    List<ViewStatsDto> findUniqueStats(
-        @Param("start") LocalDateTime start,
-        @Param("end") LocalDateTime end,
-        @Param("uris") Collection<String> uris);
-
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/service/StatsService.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/service/StatsService.java
deleted file mode 100644
index 5aa78a1..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/service/StatsService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package ru.practicum.explorewithme.stats.server.service;
-
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-public interface StatsService {
-
-    /**
-     * Сохраняет информацию о запросе к эндпоинту.
-     *
-     * @param endpointHitDto DTO с информацией о запросе.
-     */
-    void saveHit(EndpointHitDto endpointHitDto);
-
-    /**
-     * Возвращает статистику по посещениям за указанный период.
-     *
-     * @param start  дата и время начала диапазона для статистики.
-     * @param end    дата и время конца диапазона для статистики.
-     * @param uris   список URI, для которых нужна статистика (может быть null или пустым для всех URI).
-     * @param unique true, если нужны только уникальные по IP посещения, false иначе.
-     * @return список DTO {@link ViewStatsDto} со статистикой.
-     */
-    List<ViewStatsDto> getStats(LocalDateTime start, LocalDateTime end, List<String> uris, boolean unique);
-
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/service/StatsServiceImpl.java b/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/service/StatsServiceImpl.java
deleted file mode 100644
index 87693ad..0000000
--- a/core/stats-service/stats-server/src/main/java/ru/practicum/explorewithme/stats/server/service/StatsServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package ru.practicum.explorewithme.stats.server.service;
-
-import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.List;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-import ru.practicum.explorewithme.stats.server.mapper.EndpointHitMapper;
-import ru.practicum.explorewithme.stats.server.model.EndpointHit;
-import ru.practicum.explorewithme.stats.server.repository.StatsRepository;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-@SuppressWarnings("unused")
-public class StatsServiceImpl implements StatsService {
-
-    private final EndpointHitMapper endpointHitMapper;
-    private final StatsRepository statsRepository;
-
-    @Override
-    @Transactional
-    public void saveHit(EndpointHitDto endpointHitDto) {
-        log.debug("Service: Attempting to save hit: {}", endpointHitDto);
-        if (endpointHitDto == null) {
-            log.warn("Service: Cannot save hit, input EndpointHitDto was null.");
-            throw new IllegalArgumentException("Input EndpointHitDto cannot be null.");
-        }
-        EndpointHit endpointHit = endpointHitMapper.toEndpointHit(endpointHitDto);
-        statsRepository.save(endpointHit);
-        log.info("Service: Hit saved successfully for app: {}, uri: {}", endpointHit.getApp(), endpointHit.getUri());
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public List<ViewStatsDto> getStats(LocalDateTime start, LocalDateTime end, List<String> urisFromController, boolean unique) {
-        log.debug("Service: Requesting stats with params: start={}, end={}, uris={}, unique={}",
-            start, end, urisFromController, unique);
-
-        if (start != null && end != null && start.isAfter(end)) {
-            log.warn("Validation error in getStats: Start date {} is after end date {}", start, end);
-            throw new IllegalArgumentException("Error: Start date cannot be after end date.");
-        }
-
-        // Пустой список URI явно конвертируется в null для обработки репозиторием
-        Collection<String> urisForRepo = (urisFromController == null || urisFromController.isEmpty()) ? null : urisFromController;
-
-        List<ViewStatsDto> stats;
-        if (unique) {
-            stats = statsRepository.findUniqueStats(start, end, urisForRepo);
-        } else {
-            stats = statsRepository.findStats(start, end, urisForRepo);
-        }
-        log.info("Service: Found {} stats entries.", stats.size());
-        return stats;
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/main/resources/schema.sql b/core/stats-service/stats-server/src/main/resources/schema.sql
deleted file mode 100644
index ead75e2..0000000
--- a/core/stats-service/stats-server/src/main/resources/schema.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TABLE IF NOT EXISTS endpoint_hits (
-    id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
-    app VARCHAR(32) NOT NULL,
-    uri VARCHAR(128) NOT NULL,
-    ip VARCHAR(16) NOT NULL,
-    "timestamp" TIMESTAMP WITHOUT TIME ZONE NOT NULL,
-    CONSTRAINT pk_endpoint_hits PRIMARY KEY (id)
-);
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/controller/StatsControllerTest.java b/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/controller/StatsControllerTest.java
deleted file mode 100644
index 116bae5..0000000
--- a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/controller/StatsControllerTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package ru.practicum.explorewithme.stats.server.controller;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import static org.mockito.Mockito.*;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-import ru.practicum.explorewithme.stats.server.service.StatsService;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.List;
-
-@ExtendWith(MockitoExtension.class)
-class StatsControllerTest {
-
-    @InjectMocks
-    private StatsController statsController;
-
-    @Mock
-    private StatsService statsService;
-
-    private MockMvc mvc;
-
-    private EndpointHitDto validHitDto;
-    private LocalDateTime now;
-    private ObjectMapper objectMapper;
-    private DateTimeFormatter dateTimeFormatter;
-
-    @BeforeEach
-    void setUp() {
-        objectMapper = new ObjectMapper();
-        objectMapper.registerModule(new JavaTimeModule());
-        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        mvc = MockMvcBuilders
-                .standaloneSetup(statsController)
-                .build();
-        now = LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
-        validHitDto = EndpointHitDto.builder()
-                .app("test-app")
-                .uri("/test-uri")
-                .ip("127.0.0.1")
-                .timestamp(now.minusHours(1))
-                .build();
-        dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-    }
-
-    @Test
-    void saveHit_whenDtoIsValid_shouldReturnCreated() throws Exception {
-        doNothing().when(statsService).saveHit(any(EndpointHitDto.class));
-
-        mvc.perform(post("/hit")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(validHitDto)))
-                .andExpect(status().isCreated());
-
-        verify(statsService, times(1)).saveHit(any(EndpointHitDto.class));
-
-    }
-
-    @Test
-    void saveHitShouldReturn400WhenAppIsBlank() throws Exception {
-        validHitDto.setApp("");
-
-        mvc.perform(post("/hit")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(validHitDto)))
-                .andExpect(status().isBadRequest());
-
-        verify(statsService, never()).saveHit(any());
-    }
-
-    @Test
-    void saveHitShouldReturn400WhenUriIsBlank() throws Exception {
-        validHitDto.setUri("");
-
-        mvc.perform(post("/hit")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(validHitDto)))
-                .andExpect(status().isBadRequest());
-
-        verify(statsService, never()).saveHit(any());
-    }
-
-    @Test
-    void saveHitShouldReturn400WhenIpIsBlank() throws Exception {
-        validHitDto.setIp("");
-
-        mvc.perform(post("/hit")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(validHitDto)))
-                .andExpect(status().isBadRequest());
-
-        verify(statsService, never()).saveHit(any());
-    }
-
-    @Test
-    void saveHitShouldReturn400WhenTimestampIsNull() throws Exception {
-        validHitDto.setTimestamp(null);
-
-        mvc.perform(post("/hit")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectMapper.writeValueAsString(validHitDto)))
-                .andExpect(status().isBadRequest());
-
-        verify(statsService, never()).saveHit(any());
-    }
-
-    @Test
-    void getStats_whenParamsAreValid_shouldReturn200Ok() throws Exception {
-        LocalDateTime start = now.minusDays(1);
-        LocalDateTime end = now;
-        List<String> uris = List.of("/test-uri");
-        Boolean unique = false;
-
-        when(statsService.getStats(eq(start), eq(end), eq(uris), eq(unique)))
-                .thenReturn(List.of(new ViewStatsDto("test-app", "/test-uri", 10L)));
-
-        mvc.perform(get("/stats")
-                        .param("start", start.format(dateTimeFormatter))
-                        .param("end", end.format(dateTimeFormatter))
-                        .param("uris", "/test-uri")
-                        .param("unique", String.valueOf(unique)))
-                .andExpect(status().isOk())
-                .andExpect(content().json(objectMapper.writeValueAsString(
-                        List.of(new ViewStatsDto("test-app", "/test-uri", 10L)))
-                ));
-
-        verify(statsService, times(1)).getStats(eq(start), eq(end), eq(uris), eq(unique));
-    }
-
-    @Test
-    void getStats_whenNoUris_shouldReturn200Ok() throws Exception {
-        LocalDateTime start = now.minusDays(1);
-        LocalDateTime end = now;
-        Boolean unique = false;
-
-        List<ViewStatsDto> statsList = List.of(new ViewStatsDto("test-app", "/", 5L));
-        when(statsService.getStats(eq(start), eq(end), isNull(), eq(unique))).thenReturn(statsList);
-
-        mvc.perform(get("/stats")
-                        .param("start", start.format(dateTimeFormatter))
-                        .param("end", end.format(dateTimeFormatter))
-                        .param("unique", String.valueOf(unique)))
-                .andExpect(status().isOk())
-                .andExpect(content().json(objectMapper.writeValueAsString(statsList)));
-
-        verify(statsService, times(1)).getStats(eq(start), eq(end), isNull(), eq(unique));
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/controller/StatsServerIntegrationTest.java b/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/controller/StatsServerIntegrationTest.java
deleted file mode 100644
index 2edcb04..0000000
--- a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/controller/StatsServerIntegrationTest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package ru.practicum.explorewithme.stats.server.controller;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static ru.practicum.explorewithme.api.constants.DateTimeConstants.DATE_TIME_FORMATTER;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@Testcontainers
-public class StatsServerIntegrationTest {
-
-    @Container
-    private static final PostgreSQLContainer<?> postgresqlContainer = new PostgreSQLContainer<>("postgres:16.1")
-            .withDatabaseName("testdb")
-            .withUsername("testuser")
-            .withPassword("testpass");
-
-    @DynamicPropertySource
-    static void postgresqlProperties(DynamicPropertyRegistry registry) {
-        registry.add("spring.datasource.url", postgresqlContainer::getJdbcUrl);
-        registry.add("spring.datasource.username", postgresqlContainer::getUsername);
-        registry.add("spring.datasource.password", postgresqlContainer::getPassword);
-        registry.add("spring.jpa.hibernate.ddl-auto", () -> "create");
-    }
-
-    @Autowired
-    private TestRestTemplate restTemplate;
-
-    private static final DateTimeFormatter FORMATTER = DATE_TIME_FORMATTER;
-    private final LocalDateTime now = LocalDateTime.now();
-
-    @Test
-    void shouldRetrieveUniqueStats_whenUniqueFlagIsTrue() {
-        EndpointHitDto hit1 = EndpointHitDto.builder()
-                .app("app1")
-                .uri("/event/1")
-                .ip("192.168.0.1")
-                .timestamp(now.minusHours(1))
-                .build();
-
-        EndpointHitDto hit2 = EndpointHitDto.builder()
-                .app("app1")
-                .uri("/event/1")
-                .ip("192.168.0.1") // Повторный IP
-                .timestamp(now.minusMinutes(30))
-                .build();
-
-        ResponseEntity<Void> response1 = restTemplate.postForEntity("/hit", hit1, Void.class);
-        ResponseEntity<Void> response2 = restTemplate.postForEntity("/hit", hit2, Void.class);
-
-        assertThat(response1.getStatusCode()).isEqualTo(HttpStatus.CREATED);
-        assertThat(response2.getStatusCode()).isEqualTo(HttpStatus.CREATED);
-
-        String start = now.minusHours(2).format(FORMATTER);
-        String end = now.plusHours(1).format(FORMATTER);
-        String uris = "/event/1";
-        String url = "/stats?start={start}&end={end}&uris={uris}&unique=true";
-
-        ResponseEntity<ViewStatsDto[]> statsResponse = restTemplate.getForEntity(url, ViewStatsDto[].class, start, end, uris);
-
-        assertThat(statsResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
-        ViewStatsDto[] stats = statsResponse.getBody();
-        assertThat(stats).isNotNull();
-        assertThat(stats).hasSize(1);
-
-        ViewStatsDto statsEvent1 = stats[0];
-        assertThat(statsEvent1.getApp()).isEqualTo("app1");
-        assertThat(statsEvent1.getUri()).isEqualTo("/event/1");
-        assertThat(statsEvent1.getHits()).isEqualTo(1L);
-    }
-
-    @Test
-    void shouldReturnEmptyStats_whenTimeRangeHasNoHits() {
-        String start = now.minusHours(10).format(FORMATTER);
-        String end = now.minusHours(8).format(FORMATTER);
-        String url = "/stats?start={start}&end={end}";
-
-        ResponseEntity<ViewStatsDto[]> statsResponse = restTemplate.getForEntity(
-                url, ViewStatsDto[].class, start, end);
-
-        assertThat(statsResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
-        ViewStatsDto[] stats = statsResponse.getBody();
-        assertThat(stats).isNotNull();
-        assertThat(stats).isEmpty();
-    }
-
-    @Test
-    void shouldReturnStatsForAllUris_whenUrisParameterIsNotProvided() {
-        EndpointHitDto hit1 = EndpointHitDto.builder()
-                .app("app1")
-                .uri("/event/1")
-                .ip("192.168.0.1")
-                .timestamp(now.minusHours(1))
-                .build();
-
-        EndpointHitDto hit2 = EndpointHitDto.builder()
-                .app("app2")
-                .uri("/event/2")
-                .ip("192.168.0.2")
-                .timestamp(now.minusMinutes(30))
-                .build();
-
-        restTemplate.postForEntity("/hit", hit1, Void.class);
-        restTemplate.postForEntity("/hit", hit2, Void.class);
-
-        String start = now.minusHours(2).format(FORMATTER);
-        String end = now.plusHours(1).format(FORMATTER);
-        String url = "/stats?start={start}&end={end}&unique=false";
-
-        ResponseEntity<ViewStatsDto[]> statsResponse = restTemplate.getForEntity(
-                url, ViewStatsDto[].class, start, end);
-
-        assertThat(statsResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
-        ViewStatsDto[] stats = statsResponse.getBody();
-        assertThat(stats).isNotNull();
-        assertThat(stats).hasSize(2);
-    }
-
-    @Test
-    void shouldReturnBadRequest_whenStartIsAfterEnd() {
-        String start = now.plusHours(1).format(FORMATTER);
-        String end = now.minusHours(1).format(FORMATTER);
-        String url = "/stats?start={start}&end={end}";
-
-        ResponseEntity<String> response = restTemplate.getForEntity(url, String.class, start, end);
-
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).contains("Start date cannot be after end date");
-    }
-
-    @Test
-    void shouldReturnBadRequest_whenHitDtoIsInvalid() {
-        EndpointHitDto invalidHit = EndpointHitDto.builder()
-                .uri("/event/1")
-                .ip("192.168.0.1")
-                .timestamp(now.minusHours(1))
-                .build();
-
-        ResponseEntity<String> response = restTemplate.postForEntity("/hit", invalidHit, String.class);
-
-        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-        assertThat(response.getBody()).contains("Validation error");
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/repository/StatsRepositoryTest.java b/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/repository/StatsRepositoryTest.java
deleted file mode 100644
index 43266ed..0000000
--- a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/repository/StatsRepositoryTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package ru.practicum.explorewithme.stats.server.repository;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
-import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-import ru.practicum.explorewithme.stats.server.model.EndpointHit;
-
-@DataJpaTest
-@Testcontainers
-@DisplayName("Stats Repository DataJpa Tests")
-public class StatsRepositoryTest {
-
-    // Настройка контейнера с тестовой БД
-    @Container
-    private static final PostgreSQLContainer<?> postgresqlContainer = new PostgreSQLContainer<>(
-        DockerImageName.parse("postgres:16.1"));
-
-    @DynamicPropertySource
-    static void postgresqlProperties(DynamicPropertyRegistry registry) {
-        registry.add("spring.datasource.url", postgresqlContainer::getJdbcUrl);
-        registry.add("spring.datasource.username", postgresqlContainer::getUsername);
-        registry.add("spring.datasource.password", postgresqlContainer::getPassword);
-        registry.add("spring.jpa.hibernate.ddl-auto", () -> "create");
-    }
-
-    @Autowired
-    private StatsRepository statsRepository; // Тестируемый репозиторий
-
-    @Autowired
-    private TestEntityManager entityManager;
-
-    // Тестовые данные для EndpointHit
-    private EndpointHit hit1, hit2, hit3, hit4, hit5;
-    private final LocalDateTime now = LocalDateTime.now();
-
-    @BeforeEach
-    void setUp() {
-        hit1 = new EndpointHit(null, "app1", "/uri1", "192.168.0.1", now.minusHours(1));
-        hit2 = new EndpointHit(null, "app1", "/uri1", "192.168.0.2", now.minusMinutes(30));
-        hit3 = new EndpointHit(null, "app1", "/uri1", "192.168.0.1", now.minusMinutes(10)); // Повторный IP для /uri1
-        hit4 = new EndpointHit(null, "app2", "/uri2", "192.168.0.3", now.minusHours(2));
-        hit5 = new EndpointHit(null, "app1", "/uri3", "192.168.0.1", now.minusMinutes(5)); // Другой URI, но IP как у hit1
-
-        statsRepository.saveAll(List.of(hit1, hit2, hit3, hit4, hit5));
-    }
-
-    @AfterEach
-    void tearDown() {
-        statsRepository.deleteAll();
-    }
-
-    @Nested
-    @DisplayName("findStats (статистика по общему количеству хитов)")
-    class FindStatsTest {
-
-        @Test
-        @DisplayName("Должен вернуть корректное общее количество хитов для указанных URI в заданном временном диапазоне")
-        void findStats_whenUrisProvided_shouldReturnCorrectStats() {
-            LocalDateTime start = now.minusHours(3);
-            LocalDateTime end = now.plusHours(1);
-            List<String> uris = List.of("/uri1", "/uri3");
-
-            List<ViewStatsDto> result = statsRepository.findStats(start, end, uris);
-
-            assertThat(result).hasSize(2); // Ожидаем статистику для двух URI: /uri1 и /uri3
-
-            // Проверка статистики для /uri1
-            ViewStatsDto statsUri1 = result.stream().filter(s -> s.getUri().equals("/uri1")).findFirst().orElse(null);
-            assertThat(statsUri1).isNotNull();
-            assertThat(statsUri1.getApp()).isEqualTo("app1");
-            assertThat(statsUri1.getHits()).isEqualTo(3L); // hit1, hit2, hit3 для /uri1
-
-            // Проверка статистики для /uri3
-            ViewStatsDto statsUri3 = result.stream().filter(s -> s.getUri().equals("/uri3")).findFirst().orElse(null);
-            assertThat(statsUri3).isNotNull();
-            assertThat(statsUri3.getApp()).isEqualTo("app1");
-            assertThat(statsUri3.getHits()).isEqualTo(1L); // hit5 для /uri3
-        }
-
-        @Test
-        @DisplayName("Должен вернуть корректное общее количество хитов для всех URI в заданном временном диапазоне, если URI не указаны")
-        void findStats_whenUrisNotProvided_shouldReturnStatsForAllUris() {
-            LocalDateTime start = now.minusHours(3);
-            LocalDateTime end = now.plusHours(1);
-
-            // На уровне сервиса пустой список URI должен быть явно преобразован в null
-            List<ViewStatsDto> result = statsRepository.findStats(start, end, null); // URI не указаны
-
-            assertThat(result).hasSize(3); // Ожидаем статистику для трех уникальных URI: /uri1, /uri2, /uri3
-
-            // Результат отсортирован по app, затем по URI, затем по количеству хитов (здесь /uri1 первый)
-            assertThat(result.getFirst().getUri()).isEqualTo("/uri1"); // /uri1 имеет 3 хита
-            assertThat(result.getFirst().getHits()).isEqualTo(3L);
-
-            // Проверка наличия и корректности данных для /uri2 и /uri3
-            boolean foundUri2 = result.stream().anyMatch(s -> s.getUri().equals("/uri2") && s.getHits() == 1L); // hit4 для /uri2
-            boolean foundUri3 = result.stream().anyMatch(s -> s.getUri().equals("/uri3") && s.getHits() == 1L); // hit5 для /uri3
-            assertThat(foundUri2).isTrue();
-            assertThat(foundUri3).isTrue();
-        }
-
-        @Test
-        @DisplayName("Должен вернуть пустой список, если временной диапазон не содержит хитов")
-        void findStats_whenTimeRangeExcludesData_shouldReturnEmptyList() {
-            // Задаем временной диапазон, который гарантированно не содержит тестовых данных
-            LocalDateTime start = now.plusHours(1);
-            LocalDateTime end = now.plusHours(2);
-
-            List<ViewStatsDto> result = statsRepository.findStats(start, end, null);
-            assertThat(result).isEmpty();
-        }
-    }
-
-    @Nested
-    @DisplayName("findUniqueStats (статистика по уникальным IP)")
-    class FindUniqueStatsTest {
-
-        @Test
-        @DisplayName("Должен вернуть корректное количество уникальных хитов (по IP) для указанных URI в заданном временном диапазоне")
-        void findUniqueStats_whenUrisProvided_shouldReturnCorrectUniqueStats() {
-            LocalDateTime start = now.minusHours(3);
-            LocalDateTime end = now.plusHours(1);
-            List<String> uris = List.of("/uri1"); // Только для /uri1
-
-            List<ViewStatsDto> result = statsRepository.findUniqueStats(start, end, uris);
-
-            assertThat(result).hasSize(1); // Ожидаем статистику только для /uri1
-            ViewStatsDto statsUri1 = result.getFirst();
-            assertThat(statsUri1.getApp()).isEqualTo("app1");
-            assertThat(statsUri1.getUri()).isEqualTo("/uri1");
-            assertThat(statsUri1.getHits()).isEqualTo(2L); // Уникальные IP для /uri1: 192.168.0.1, 192.168.0.2
-        }
-
-        @Test
-        @DisplayName("Должен вернуть корректное количество уникальных хитов (по IP) для всех URI в заданном временном диапазоне, если URI не указаны")
-        void findUniqueStats_whenUrisNotProvided_shouldReturnUniqueStatsForAllUris() {
-            LocalDateTime start = now.minusHours(3);
-            LocalDateTime end = now.plusHours(1);
-
-            // На уровне сервиса пустой список URI должен быть явно преобразован в null
-            List<ViewStatsDto> result = statsRepository.findUniqueStats(start, end, null); // URI не указаны
-
-            assertThat(result).hasSize(3); // Ожидаем статистику для трех уникальных URI
-
-            // Проверка статистики для /uri1
-            ViewStatsDto statsUri1 = result.stream().filter(s -> s.getUri().equals("/uri1")).findFirst().orElse(null);
-            assertThat(statsUri1).isNotNull();
-            assertThat(statsUri1.getApp()).isEqualTo("app1");
-            assertThat(statsUri1.getHits()).isEqualTo(2L); // Уникальные IP для /uri1: 192.168.0.1, 192.168.0.2
-
-            // Проверка статистики для /uri2
-            ViewStatsDto statsUri2 = result.stream().filter(s -> s.getUri().equals("/uri2")).findFirst().orElse(null);
-            assertThat(statsUri2).isNotNull();
-            assertThat(statsUri2.getApp()).isEqualTo("app2");
-            assertThat(statsUri2.getHits()).isEqualTo(1L); // Уникальный IP для /uri2: 192.168.0.3
-
-            // Проверка статистики для /uri3
-            ViewStatsDto statsUri3 = result.stream().filter(s -> s.getUri().equals("/uri3")).findFirst().orElse(null);
-            assertThat(statsUri3).isNotNull();
-            assertThat(statsUri3.getApp()).isEqualTo("app1");
-            assertThat(statsUri3.getHits()).isEqualTo(1L); // Уникальный IP для /uri3: 192.168.0.1
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/service/StatsServiceImplTest.java b/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/service/StatsServiceImplTest.java
deleted file mode 100644
index 909905a..0000000
--- a/core/stats-service/stats-server/src/test/java/ru/practicum/explorewithme/stats/server/service/StatsServiceImplTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package ru.practicum.explorewithme.stats.server.service;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import ru.practicum.explorewithme.stats.dto.EndpointHitDto;
-import ru.practicum.explorewithme.stats.dto.ViewStatsDto;
-import ru.practicum.explorewithme.stats.server.mapper.EndpointHitMapper;
-import ru.practicum.explorewithme.stats.server.model.EndpointHit;
-import ru.practicum.explorewithme.stats.server.repository.StatsRepository;
-
-@ExtendWith(MockitoExtension.class)
-@DisplayName("Тесты реализации сервиса статистики")
-class StatsServiceImplTest {
-
-    @Mock // Мок репозитория статистики
-    private StatsRepository statsRepository;
-
-    @Mock // Мок маппера EndpointHit
-    private EndpointHitMapper endpointHitMapper;
-
-    @InjectMocks // Тестируемый сервис статистики
-    private StatsServiceImpl statsService;
-
-    @Captor // Для захвата аргумента при вызове save
-    private ArgumentCaptor<EndpointHit> endpointHitArgumentCaptor;
-
-    // Тестовые данные и вспомогательные переменные
-    private EndpointHitDto validHitDto;
-    private EndpointHit mappedEndpointHit;
-    private LocalDateTime now;
-
-    @BeforeEach
-    void setUp() {
-        now = LocalDateTime.now();
-        validHitDto = EndpointHitDto.builder()
-            .app("test-app")
-            .uri("/test-uri")
-            .ip("127.0.0.1")
-            .timestamp(now.minusHours(1))
-            .build();
-
-        mappedEndpointHit = EndpointHit.builder()
-            .app(validHitDto.getApp())
-            .uri(validHitDto.getUri())
-            .ip(validHitDto.getIp())
-            .timestamp(validHitDto.getTimestamp())
-            .build();
-    }
-
-    @Nested
-    @DisplayName("Тесты метода saveHit")
-    class SaveHitTests {
-        @Test
-        @DisplayName("Должен успешно сохранить хит при получении валидного DTO")
-        void saveHit_whenDtoIsValid_shouldMapAndSave() {
-            when(endpointHitMapper.toEndpointHit(validHitDto)).thenReturn(mappedEndpointHit);
-
-            statsService.saveHit(validHitDto);
-
-            verify(endpointHitMapper, times(1)).toEndpointHit(validHitDto);
-            verify(statsRepository, times(1)).save(endpointHitArgumentCaptor.capture());
-
-            EndpointHit capturedHit = endpointHitArgumentCaptor.getValue();
-            assertThat(capturedHit.getApp()).isEqualTo(validHitDto.getApp());
-            assertThat(capturedHit.getUri()).isEqualTo(validHitDto.getUri());
-            assertThat(capturedHit.getIp()).isEqualTo(validHitDto.getIp());
-            assertThat(capturedHit.getTimestamp()).isEqualTo(validHitDto.getTimestamp());
-        }
-
-        @Test
-        @DisplayName("Должен выбросить исключение, если DTO равен null")
-        void saveHit_whenDtoIsNull_shouldThrowIllegalArgumentException() {
-            assertThatThrownBy(() -> statsService.saveHit(null))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessageContaining("Input EndpointHitDto cannot be null");
-
-            verify(endpointHitMapper, never()).toEndpointHit(any());
-            verify(statsRepository, never()).save(any());
-        }
-
-        @Test
-        @DisplayName("Должен выбросить исключение, если маппер вернул null для валидного DTO")
-        void saveHit_whenMapperReturnsNull_shouldThrowIllegalStateExceptionOrHandle() {
-            EndpointHitDto nonNullDto = validHitDto;
-            when(endpointHitMapper.toEndpointHit(nonNullDto)).thenReturn(null);
-            // Имитируем, что репозиторий выбросит исключение при попытке сохранить null
-            doThrow(new IllegalArgumentException("Entity must not be null")).when(statsRepository).save(null);
-
-            assertThatThrownBy(() -> statsService.saveHit(nonNullDto))
-                .isInstanceOf(IllegalArgumentException.class) // Исключение выброшено репозиторием
-                .hasMessageContaining("Entity must not be null");
-
-            verify(endpointHitMapper, times(1)).toEndpointHit(nonNullDto);
-            verify(statsRepository, times(1)).save(null); // Проверяем, что была попытка сохранить null
-        }
-    }
-
-    @Nested
-    @DisplayName("Тесты метода getStats")
-    class GetStatsTests {
-        private LocalDateTime start;
-        private LocalDateTime end;
-        private List<ViewStatsDto> expectedStatsList;
-
-        // Вспомогательные данные для getStats
-        @BeforeEach
-        void getStatsSetup() {
-            start = now.minusDays(1);
-            end = now;
-            expectedStatsList = List.of(
-                ViewStatsDto.builder().app("app1").uri("/uri1").hits(10L).build(),
-                ViewStatsDto.builder().app("app2").uri("/uri2").hits(5L).build()
-            );
-        }
-
-        @Test
-        @DisplayName("Должен вызвать findStats, когда unique=false и uris=null")
-        void getStats_whenUniqueFalseAndUrisNull_shouldCallFindStats() {
-            when(statsRepository.findStats(start, end, null)).thenReturn(expectedStatsList);
-
-            List<ViewStatsDto> actualStats = statsService.getStats(start, end, null, false);
-
-            assertThat(actualStats).isEqualTo(expectedStatsList);
-            verify(statsRepository, times(1)).findStats(start, end, null);
-            verify(statsRepository, never()).findUniqueStats(any(), any(), any());
-        }
-
-        @Test
-        @DisplayName("Должен вызвать findStats с uris=null, когда unique=false и uris пустой список")
-        void getStats_whenUniqueFalseAndUrisEmpty_shouldCallFindStatsWithNullUris() {
-            when(statsRepository.findStats(start, end, null)).thenReturn(expectedStatsList);
-
-            List<ViewStatsDto> actualStats = statsService.getStats(start, end, Collections.emptyList(), false);
-
-            assertThat(actualStats).isEqualTo(expectedStatsList);
-            verify(statsRepository, times(1)).findStats(start, end, null); // Сервис преобразует пустой список в null
-            verify(statsRepository, never()).findUniqueStats(any(), any(), any());
-        }
-
-        @Test
-        @DisplayName("Должен вызвать findStats с указанными uris, когда unique=false")
-        void getStats_whenUniqueFalseAndUrisProvided_shouldCallFindStatsWithUris() {
-            List<String> uris = List.of("/uri1", "/uri2");
-            when(statsRepository.findStats(start, end, uris)).thenReturn(expectedStatsList);
-
-            List<ViewStatsDto> actualStats = statsService.getStats(start, end, uris, false);
-
-            assertThat(actualStats).isEqualTo(expectedStatsList);
-            verify(statsRepository, times(1)).findStats(start, end, uris);
-            verify(statsRepository, never()).findUniqueStats(any(), any(), any());
-        }
-
-        @Test
-        @DisplayName("Должен вызвать findUniqueStats, когда unique=true и uris=null")
-        void getStats_whenUniqueTrueAndUrisNull_shouldCallFindUniqueStats() {
-            when(statsRepository.findUniqueStats(start, end, null)).thenReturn(expectedStatsList);
-
-            List<ViewStatsDto> actualStats = statsService.getStats(start, end, null, true);
-
-            assertThat(actualStats).isEqualTo(expectedStatsList);
-            verify(statsRepository, times(1)).findUniqueStats(start, end, null);
-            verify(statsRepository, never()).findStats(any(), any(), any());
-        }
-
-        @Test
-        @DisplayName("Должен вызвать findUniqueStats с uris=null, когда unique=true и uris пустой список")
-        void getStats_whenUniqueTrueAndUrisEmpty_shouldCallFindUniqueStatsWithNullUris() {
-            when(statsRepository.findUniqueStats(start, end, null)).thenReturn(expectedStatsList);
-
-            List<ViewStatsDto> actualStats = statsService.getStats(start, end, Collections.emptyList(), true);
-
-            assertThat(actualStats).isEqualTo(expectedStatsList);
-            verify(statsRepository, times(1)).findUniqueStats(start, end, null); // Сервис преобразует пустой список в null
-            verify(statsRepository, never()).findStats(any(), any(), any());
-        }
-
-        @Test
-        @DisplayName("Должен вызвать findUniqueStats с указанными uris, когда unique=true")
-        void getStats_whenUniqueTrueAndUrisProvided_shouldCallFindUniqueStatsWithUris() {
-            List<String> uris = List.of("/uri1", "/uri2");
-            when(statsRepository.findUniqueStats(start, end, uris)).thenReturn(expectedStatsList);
-
-            List<ViewStatsDto> actualStats = statsService.getStats(start, end, uris, true);
-
-            assertThat(actualStats).isEqualTo(expectedStatsList);
-            verify(statsRepository, times(1)).findUniqueStats(start, end, uris);
-            verify(statsRepository, never()).findStats(any(), any(), any());
-        }
-
-        @Test
-        @DisplayName("Должен выбросить IllegalArgumentException, если дата начала после даты окончания")
-        void getStats_whenStartIsAfterEnd_shouldReturnEmptyList() {
-            LocalDateTime laterStart = now;
-            LocalDateTime earlierEnd = now.minusDays(1);
-
-            assertThatThrownBy(() -> statsService.getStats(laterStart, earlierEnd, null, false))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessageContaining("Error: Start date cannot be after end date.");
-
-            verify(statsRepository, never()).findStats(any(), any(), any());
-            verify(statsRepository, never()).findUniqueStats(any(), any(), any());
-        }
-    }
-}
\ No newline at end of file
diff --git a/core/stats-service/stats-server/src/test/resources/application.yaml b/core/stats-service/stats-server/src/test/resources/application.yaml
deleted file mode 100644
index 689e431..0000000
--- a/core/stats-service/stats-server/src/test/resources/application.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-spring:
-  cloud:
-    config:
-      enabled: false
-    discovery:
-      enabled: false
-eureka:
-  client:
-    enabled: false
\ No newline at end of file
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/UserServiceApplication.java b/core/user-service/src/main/java/ru/practicum/ewm/user/UserServiceApplication.java
similarity index 90%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/UserServiceApplication.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/UserServiceApplication.java
index 8fec97e..9c1d4e2 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/UserServiceApplication.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/UserServiceApplication.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user;
+package ru.practicum.ewm.user;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/application/UserService.java b/core/user-service/src/main/java/ru/practicum/ewm/user/application/UserService.java
similarity index 54%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/application/UserService.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/application/UserService.java
index 78865e7..45b2548 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/application/UserService.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/application/UserService.java
@@ -1,9 +1,9 @@
-package ru.practicum.explorewithme.user.application;
+package ru.practicum.ewm.user.application;
 
 import java.util.List;
-import ru.practicum.explorewithme.api.client.user.dto.NewUserRequestDto;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.user.application.params.GetListUsersParameters;
+import ru.practicum.ewm.api.client.user.dto.NewUserRequestDto;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.user.application.params.GetListUsersParameters;
 
 public interface UserService {
 
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/application/UserServiceImpl.java b/core/user-service/src/main/java/ru/practicum/ewm/user/application/UserServiceImpl.java
similarity index 81%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/application/UserServiceImpl.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/application/UserServiceImpl.java
index aad36aa..3fce599 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/application/UserServiceImpl.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/application/UserServiceImpl.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user.application;
+package ru.practicum.ewm.user.application;
 
 import java.util.List;
 import java.util.Optional;
@@ -6,14 +6,14 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import ru.practicum.explorewithme.api.client.user.dto.NewUserRequestDto;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.api.error.EntityAlreadyExistsException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
-import ru.practicum.explorewithme.user.application.params.GetListUsersParameters;
-import ru.practicum.explorewithme.user.domain.User;
-import ru.practicum.explorewithme.user.domain.UserRepository;
-import ru.practicum.explorewithme.user.infrastructure.mapper.UserMapper;
+import ru.practicum.ewm.api.client.user.dto.NewUserRequestDto;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.api.error.EntityAlreadyExistsException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
+import ru.practicum.ewm.user.application.params.GetListUsersParameters;
+import ru.practicum.ewm.user.domain.User;
+import ru.practicum.ewm.user.domain.UserRepository;
+import ru.practicum.ewm.user.infrastructure.mapper.UserMapper;
 
 @Service
 @RequiredArgsConstructor
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/application/params/GetListUsersParameters.java b/core/user-service/src/main/java/ru/practicum/ewm/user/application/params/GetListUsersParameters.java
similarity index 84%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/application/params/GetListUsersParameters.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/application/params/GetListUsersParameters.java
index 74a572f..1569c48 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/application/params/GetListUsersParameters.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/application/params/GetListUsersParameters.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user.application.params;
+package ru.practicum.ewm.user.application.params;
 
 import java.util.List;
 import lombok.AllArgsConstructor;
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/domain/User.java b/core/user-service/src/main/java/ru/practicum/ewm/user/domain/User.java
similarity index 95%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/domain/User.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/domain/User.java
index 2a0bea1..3f11a9e 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/domain/User.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/domain/User.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user.domain;
+package ru.practicum.ewm.user.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/domain/UserRepository.java b/core/user-service/src/main/java/ru/practicum/ewm/user/domain/UserRepository.java
similarity index 97%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/domain/UserRepository.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/domain/UserRepository.java
index d35f04b..ad44d3b 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/domain/UserRepository.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/domain/UserRepository.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user.domain;
+package ru.practicum.ewm.user.domain;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/mapper/UserMapper.java b/core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/mapper/UserMapper.java
similarity index 50%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/mapper/UserMapper.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/mapper/UserMapper.java
index d6288db..45b7619 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/mapper/UserMapper.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/mapper/UserMapper.java
@@ -1,11 +1,11 @@
-package ru.practicum.explorewithme.user.infrastructure.mapper;
+package ru.practicum.ewm.user.infrastructure.mapper;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import ru.practicum.explorewithme.api.client.user.dto.NewUserRequestDto;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.api.client.user.dto.UserShortDto;
-import ru.practicum.explorewithme.user.domain.User;
+import ru.practicum.ewm.api.client.user.dto.NewUserRequestDto;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.api.client.user.dto.UserShortDto;
+import ru.practicum.ewm.user.domain.User;
 
 @Mapper(componentModel = "spring")
 public interface UserMapper {
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/persistence/JpaUserRepository.java b/core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/persistence/JpaUserRepository.java
similarity index 79%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/persistence/JpaUserRepository.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/persistence/JpaUserRepository.java
index 5608c18..133f344 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/persistence/JpaUserRepository.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/persistence/JpaUserRepository.java
@@ -1,11 +1,11 @@
-package ru.practicum.explorewithme.user.infrastructure.persistence;
+package ru.practicum.ewm.user.infrastructure.persistence;
 
 import java.util.List;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import ru.practicum.explorewithme.user.domain.User;
+import ru.practicum.ewm.user.domain.User;
 
 @Repository
 public interface JpaUserRepository extends JpaRepository<User, Long> {
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/persistence/UserRepositoryAdapter.java b/core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/persistence/UserRepositoryAdapter.java
similarity index 89%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/persistence/UserRepositoryAdapter.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/persistence/UserRepositoryAdapter.java
index 177e6de..b716a4c 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/infrastructure/persistence/UserRepositoryAdapter.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/infrastructure/persistence/UserRepositoryAdapter.java
@@ -1,12 +1,12 @@
-package ru.practicum.explorewithme.user.infrastructure.persistence;
+package ru.practicum.ewm.user.infrastructure.persistence;
 
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
-import ru.practicum.explorewithme.user.domain.User;
-import ru.practicum.explorewithme.user.domain.UserRepository;
+import ru.practicum.ewm.user.domain.User;
+import ru.practicum.ewm.user.domain.UserRepository;
 
 @Component
 @RequiredArgsConstructor
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/admin/AdminUserController.java b/core/user-service/src/main/java/ru/practicum/ewm/user/presentation/admin/AdminUserController.java
similarity index 87%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/admin/AdminUserController.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/presentation/admin/AdminUserController.java
index 6b49f9f..0960344 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/admin/AdminUserController.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/presentation/admin/AdminUserController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user.presentation.admin;
+package ru.practicum.ewm.user.presentation.admin;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Positive;
@@ -17,10 +17,10 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.user.dto.NewUserRequestDto;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.user.application.params.GetListUsersParameters;
-import ru.practicum.explorewithme.user.application.UserService;
+import ru.practicum.ewm.api.client.user.dto.NewUserRequestDto;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.user.application.params.GetListUsersParameters;
+import ru.practicum.ewm.user.application.UserService;
 
 @RestController
 @RequestMapping("/admin/users")
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/error/GlobalExceptionHandler.java b/core/user-service/src/main/java/ru/practicum/ewm/user/presentation/error/GlobalExceptionHandler.java
similarity index 90%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/error/GlobalExceptionHandler.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/presentation/error/GlobalExceptionHandler.java
index 42376c8..7157982 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/error/GlobalExceptionHandler.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/presentation/error/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user.presentation.error;
+package ru.practicum.ewm.user.presentation.error;
 
 import java.time.LocalDateTime;
 import lombok.extern.slf4j.Slf4j;
@@ -7,10 +7,10 @@
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
-import ru.practicum.explorewithme.api.error.BaseExceptionHandler;
-import ru.practicum.explorewithme.api.error.ApiError;
-import ru.practicum.explorewithme.api.error.EntityAlreadyExistsException;
-import ru.practicum.explorewithme.api.error.EntityNotFoundException;
+import ru.practicum.ewm.api.error.BaseExceptionHandler;
+import ru.practicum.ewm.api.error.ApiError;
+import ru.practicum.ewm.api.error.EntityAlreadyExistsException;
+import ru.practicum.ewm.api.error.EntityNotFoundException;
 
 @RestControllerAdvice
 @Slf4j
diff --git a/core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/internal/InternalUserController.java b/core/user-service/src/main/java/ru/practicum/ewm/user/presentation/internal/InternalUserController.java
similarity index 83%
rename from core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/internal/InternalUserController.java
rename to core/user-service/src/main/java/ru/practicum/ewm/user/presentation/internal/InternalUserController.java
index db92fdf..c30701d 100644
--- a/core/user-service/src/main/java/ru/practicum/explorewithme/user/presentation/internal/InternalUserController.java
+++ b/core/user-service/src/main/java/ru/practicum/ewm/user/presentation/internal/InternalUserController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.user.presentation.internal;
+package ru.practicum.ewm.user.presentation.internal;
 
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -10,9 +10,9 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
-import ru.practicum.explorewithme.api.client.user.UserClient;
-import ru.practicum.explorewithme.api.client.user.dto.UserDto;
-import ru.practicum.explorewithme.user.application.UserService;
+import ru.practicum.ewm.api.client.user.UserClient;
+import ru.practicum.ewm.api.client.user.dto.UserDto;
+import ru.practicum.ewm.user.application.UserService;
 
 @RestController
 @RequestMapping("/internal/users")
diff --git a/core/user-service/src/main/resources/application.yaml b/core/user-service/src/main/resources/application.yaml
index e9b0de2..2a0146f 100644
--- a/core/user-service/src/main/resources/application.yaml
+++ b/core/user-service/src/main/resources/application.yaml
@@ -21,5 +21,4 @@ eureka:
     serviceUrl:
       defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
   instance:
-    instance-id: "${spring.application.name}:${random.value}"
-    leaseRenewalIntervalInSeconds: 10
\ No newline at end of file
+    instance-id: "${spring.application.name}:${random.value}"
\ No newline at end of file
diff --git a/infra/config-server/src/main/java/ru/practicum/explorewithme/infra/configserver/ConfigServerApplication.java b/infra/config-server/src/main/java/ru/practicum/ewm/infra/configserver/ConfigServerApplication.java
similarity index 89%
rename from infra/config-server/src/main/java/ru/practicum/explorewithme/infra/configserver/ConfigServerApplication.java
rename to infra/config-server/src/main/java/ru/practicum/ewm/infra/configserver/ConfigServerApplication.java
index 950b013..5543074 100644
--- a/infra/config-server/src/main/java/ru/practicum/explorewithme/infra/configserver/ConfigServerApplication.java
+++ b/infra/config-server/src/main/java/ru/practicum/ewm/infra/configserver/ConfigServerApplication.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.infra.configserver;
+package ru.practicum.ewm.infra.configserver;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/infra/config-server/src/main/resources/config/aggregator/application.yaml b/infra/config-server/src/main/resources/config/aggregator/application.yaml
new file mode 100644
index 0000000..f06b175
--- /dev/null
+++ b/infra/config-server/src/main/resources/config/aggregator/application.yaml
@@ -0,0 +1,16 @@
+spring:
+  kafka:
+    consumer:
+      group-id: aggregator-group
+      auto-offset-reset: earliest
+      value-deserializer: ru.practicum.ewm.stats.common.kafka.UserActionAvroDeserializer
+      key-deserializer: org.apache.kafka.common.serialization.StringDeserializer
+    producer:
+      value-serializer: ru.practicum.ewm.stats.common.kafka.AvroSerializer
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+
+
+kafka:
+  topic:
+    user-actions: stats.user-actions.v1
+    events-similarity: stats.events-similarity.v1
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/analyzer/application.yaml b/infra/config-server/src/main/resources/config/analyzer/application.yaml
new file mode 100644
index 0000000..e54b149
--- /dev/null
+++ b/infra/config-server/src/main/resources/config/analyzer/application.yaml
@@ -0,0 +1,24 @@
+server:
+  port: 0
+
+grpc:
+  server:
+    port: 0
+
+db:
+  name: ewm_stats_db
+
+spring:
+  kafka:
+    consumer:
+      group-id: analyzer-group
+      auto-offset-reset: earliest
+      properties:
+        fetch.min.bytes: 1
+        max.poll.records: 100
+        max.poll.interval.ms: 30000
+
+kafka:
+  topic:
+    user-actions: stats.user-actions.v1
+    events-similarity: stats.events-similarity.v1
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/application-grpc-client.yaml b/infra/config-server/src/main/resources/config/application-grpc-client.yaml
new file mode 100644
index 0000000..e72e133
--- /dev/null
+++ b/infra/config-server/src/main/resources/config/application-grpc-client.yaml
@@ -0,0 +1,8 @@
+grpc:
+  client:
+    collector:
+      address: 'discovery:///collector'
+      negotiation-type: PLAINTEXT
+    analyzer:
+      address: 'discovery:///analyzer'
+      negotiation-type: PLAINTEXT
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/application-kafka.yaml b/infra/config-server/src/main/resources/config/application-kafka.yaml
new file mode 100644
index 0000000..aa28f66
--- /dev/null
+++ b/infra/config-server/src/main/resources/config/application-kafka.yaml
@@ -0,0 +1,3 @@
+spring:
+  kafka:
+    bootstrap-servers: ${KAFKA_BOOTSTRAP_SERVERS:localhost:9092}
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/application-recommendations.yaml b/infra/config-server/src/main/resources/config/application-recommendations.yaml
new file mode 100644
index 0000000..5d47e92
--- /dev/null
+++ b/infra/config-server/src/main/resources/config/application-recommendations.yaml
@@ -0,0 +1,7 @@
+recommendations:
+  action-weights:
+    VIEW: 0.4
+    REGISTER: 0.8
+    LIKE: 1.0
+  max-recent-events-for-prediction: 10
+  max-neighbours-for-prediction: 10
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/application.yaml b/infra/config-server/src/main/resources/config/application.yaml
index c1396a2..2c1abf8 100644
--- a/infra/config-server/src/main/resources/config/application.yaml
+++ b/infra/config-server/src/main/resources/config/application.yaml
@@ -26,13 +26,13 @@ eureka:
   instance:
     health-check-url-path: /actuator/health/readiness
     health-check-url-enabled: true
+    prefer-ip-address: true
+    lease-renewal-interval-in-seconds: 5
+    lease-expiration-duration-in-seconds: 15
 
   client:
     healthcheck:
-      enabled: true
+      enabled: false
     registry-fetch-interval-seconds: 5
-    lease:
-      durationInSeconds: 30
-      renewalIntervalInSeconds: 10
     registration:
-      initialDelayPeriod: 1000
\ No newline at end of file
+      initialDelayPeriod: 500
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/collector/application.yaml b/infra/config-server/src/main/resources/config/collector/application.yaml
new file mode 100644
index 0000000..e06737c
--- /dev/null
+++ b/infra/config-server/src/main/resources/config/collector/application.yaml
@@ -0,0 +1,16 @@
+grpc:
+  server:
+    port: 0
+
+server:
+  port: 0
+
+spring:
+  kafka:
+    producer:
+      value-serializer: ru.practicum.ewm.stats.common.kafka.AvroSerializer
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+
+kafka:
+  topic:
+    user-actions: stats.user-actions.v1
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/event-service/application-local.yaml b/infra/config-server/src/main/resources/config/event-service/application-local.yaml
index 64abe74..fe65627 100644
--- a/infra/config-server/src/main/resources/config/event-service/application-local.yaml
+++ b/infra/config-server/src/main/resources/config/event-service/application-local.yaml
@@ -4,4 +4,4 @@ server:
 logging:
   level:
     root: INFO
-    ru.practicum.explorewithme.main: DEBUG
\ No newline at end of file
+    ru.practicum.ewm.main: DEBUG
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/stats-server/application-local.yaml b/infra/config-server/src/main/resources/config/stats-server/application-local.yaml
deleted file mode 100644
index 20f3ad9..0000000
--- a/infra/config-server/src/main/resources/config/stats-server/application-local.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-server:
-  port: 9090
-
-spring:
-  jpa:
-    hibernate:
-      show-sql: true
-    properties:
-      hibernate.format_sql: true
-  logging:
-    level:
-      org.hibernate.SQL: DEBUG
-      org.hibernate.type.descriptor.sql.BasicBinder: TRACE
\ No newline at end of file
diff --git a/infra/config-server/src/main/resources/config/stats-server/application.yaml b/infra/config-server/src/main/resources/config/stats-server/application.yaml
deleted file mode 100644
index d2fc195..0000000
--- a/infra/config-server/src/main/resources/config/stats-server/application.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-server:
-  port: 0
-db:
-  name: ewm_stats_db
\ No newline at end of file
diff --git a/infra/discovery-server/src/main/java/ru/practicum/explorewithme/infra/discovery/EurekaServerApp.java b/infra/discovery-server/src/main/java/ru/practicum/ewm/infra/discovery/EurekaServerApp.java
similarity index 88%
rename from infra/discovery-server/src/main/java/ru/practicum/explorewithme/infra/discovery/EurekaServerApp.java
rename to infra/discovery-server/src/main/java/ru/practicum/ewm/infra/discovery/EurekaServerApp.java
index 8072d18..e3f1350 100644
--- a/infra/discovery-server/src/main/java/ru/practicum/explorewithme/infra/discovery/EurekaServerApp.java
+++ b/infra/discovery-server/src/main/java/ru/practicum/ewm/infra/discovery/EurekaServerApp.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.infra.discovery;
+package ru.practicum.ewm.infra.discovery;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/infra/discovery-server/src/main/resources/application.yaml b/infra/discovery-server/src/main/resources/application.yaml
index b0bf334..28fe137 100644
--- a/infra/discovery-server/src/main/resources/application.yaml
+++ b/infra/discovery-server/src/main/resources/application.yaml
@@ -10,9 +10,6 @@ eureka:
     fetchRegistry: false
     serviceUrl:
       defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
-    lease:
-      durationInSeconds: 30
-      renewalIntervalInSeconds: 10
 
     server:
       enableSelfPreservation: false
diff --git a/infra/gateway-server/src/main/java/ru/practicum/explorewithme/infra/gateway/GatewayApplication.java b/infra/gateway-server/src/main/java/ru/practicum/ewm/infra/gateway/GatewayApplication.java
similarity index 88%
rename from infra/gateway-server/src/main/java/ru/practicum/explorewithme/infra/gateway/GatewayApplication.java
rename to infra/gateway-server/src/main/java/ru/practicum/ewm/infra/gateway/GatewayApplication.java
index a5cb128..501bf8d 100644
--- a/infra/gateway-server/src/main/java/ru/practicum/explorewithme/infra/gateway/GatewayApplication.java
+++ b/infra/gateway-server/src/main/java/ru/practicum/ewm/infra/gateway/GatewayApplication.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.infra.gateway;
+package ru.practicum.ewm.infra.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/infra/gateway-server/src/main/java/ru/practicum/explorewithme/infra/gateway/controller/FallbackController.java b/infra/gateway-server/src/main/java/ru/practicum/ewm/infra/gateway/controller/FallbackController.java
similarity index 89%
rename from infra/gateway-server/src/main/java/ru/practicum/explorewithme/infra/gateway/controller/FallbackController.java
rename to infra/gateway-server/src/main/java/ru/practicum/ewm/infra/gateway/controller/FallbackController.java
index f5a00a7..f3903fb 100644
--- a/infra/gateway-server/src/main/java/ru/practicum/explorewithme/infra/gateway/controller/FallbackController.java
+++ b/infra/gateway-server/src/main/java/ru/practicum/ewm/infra/gateway/controller/FallbackController.java
@@ -1,4 +1,4 @@
-package ru.practicum.explorewithme.infra.gateway.controller;
+package ru.practicum.ewm.infra.gateway.controller;
 
 import java.time.LocalDateTime;
 import org.springframework.http.HttpStatus;
@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import reactor.core.publisher.Mono;
-import ru.practicum.explorewithme.api.error.ApiError;
+import ru.practicum.ewm.api.error.ApiError;
 
 @RestController
 public class FallbackController {
diff --git a/infra/gateway-server/src/main/resources/application.yaml b/infra/gateway-server/src/main/resources/application.yaml
index bcba139..35e96f7 100644
--- a/infra/gateway-server/src/main/resources/application.yaml
+++ b/infra/gateway-server/src/main/resources/application.yaml
@@ -20,4 +20,3 @@ eureka:
       defaultZone: ${EUREKA_URI:http://localhost:8761/eureka/}
   instance:
     instance-id: "${spring.application.name}:${random.value}"
-    leaseRenewalIntervalInSeconds: 10
diff --git a/pom.xml b/pom.xml
index 6de200d..3732ebd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,11 @@
 		<mockito.version>5.14.2</mockito.version>
 		<querydsl.version>5.1.0</querydsl.version>
 		<org.mapstruct.version>1.6.3</org.mapstruct.version>
+    <avro.version>1.12.0</avro.version>
+    <protobuf.version>4.32.1</protobuf.version>
+    <protobuf-plugin.version>3.9.1</protobuf-plugin.version>
+    <grpc.version>1.75.0</grpc.version>
+    <kafka.version>4.1.0</kafka.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 	</properties>
@@ -36,15 +41,16 @@
     <module>core</module>
   </modules>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>${spring-boot.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
+  <dependencyManagement>
+    <dependencies>
+      <!-- Spring Boot and Spring Cloud BOMs -->
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring-boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
@@ -52,113 +58,136 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-			<dependency>
-				<groupId>org.postgresql</groupId>
-				<artifactId>postgresql</artifactId>
-				<version>42.7.5</version>
-			</dependency>
-			<dependency>
-				<groupId>com.squareup.okhttp3</groupId>
-				<artifactId>mockwebserver</artifactId>
-				<version>${okhttp3.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>testcontainers</artifactId>
-				<version>${testcontainers.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>junit-jupiter</artifactId>
-				<version>${testcontainers.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>postgresql</artifactId>
-				<version>${testcontainers.version}</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok</artifactId>
-				<version>1.18.38</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.datatype</groupId>
-				<artifactId>jackson-datatype-jsr310</artifactId>
-				<version>2.19.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jetbrains</groupId>
-				<artifactId>annotations</artifactId>
-				<version>24.0.1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.google.code.findbugs</groupId>
-				<artifactId>jsr305</artifactId>
-				<version>3.0.2</version>
-			</dependency>
-			<dependency>
-				<groupId>com.fasterxml.jackson.core</groupId>
-				<artifactId>jackson-databind</artifactId>
-				<version>2.15.3</version>
-			</dependency>
-			<dependency>
-				<groupId>org.junit.jupiter</groupId>
-				<artifactId>junit-jupiter</artifactId>
-				<version>5.10.1</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>jakarta.validation</groupId>
-				<artifactId>jakarta.validation-api</artifactId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-inline</artifactId>
-				<version>5.2.0</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>com.querydsl</groupId>
-				<artifactId>querydsl-core</artifactId>
-				<version>${querydsl.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.querydsl</groupId>
-				<artifactId>querydsl-jpa</artifactId>
-				<version>${querydsl.version}</version>
-				<classifier>jakarta</classifier>
-			</dependency>
-			<dependency>
-				<groupId>com.querydsl</groupId>
-				<artifactId>querydsl-sql</artifactId>
-				<version>${querydsl.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.querydsl</groupId>
-				<artifactId>querydsl-sql-spring</artifactId>
-				<version>${querydsl.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.querydsl</groupId>
-				<artifactId>querydsl-apt</artifactId>
-				<version>${querydsl.version}</version>
-				<classifier>jakarta</classifier>
-			</dependency>
-			<dependency>
-				<groupId>org.mapstruct</groupId>
-				<artifactId>mapstruct</artifactId>
-				<version>${org.mapstruct.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+
+      <!-- Persistence Dependencies -->
+      <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>42.7.5</version>
+      </dependency>
+      <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-core</artifactId>
+        <version>${querydsl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-jpa</artifactId>
+        <version>${querydsl.version}</version>
+        <classifier>jakarta</classifier>
+      </dependency>
+      <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-sql</artifactId>
+        <version>${querydsl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-sql-spring</artifactId>
+        <version>${querydsl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-apt</artifactId>
+        <version>${querydsl.version}</version>
+        <classifier>jakarta</classifier>
+      </dependency>
+
+      <!-- gRPC Dependencies -->
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-protobuf</artifactId>
+        <version>${grpc.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-stub</artifactId>
+        <version>${grpc.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-services</artifactId>
+        <version>${grpc.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${protobuf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java-util</artifactId>
+        <version>${protobuf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.devh</groupId>
+        <artifactId>grpc-server-spring-boot-starter</artifactId>
+        <version>3.1.0.RELEASE</version>
+      </dependency>
+      <dependency>
+        <groupId>net.devh</groupId>
+        <artifactId>grpc-client-spring-boot-starter</artifactId>
+        <version>3.1.0.RELEASE</version>
+      </dependency>
+
+      <!-- Messaging and Serialization Dependencies -->
+      <dependency>
+        <groupId>org.apache.kafka</groupId>
+        <artifactId>kafka-clients</artifactId>
+        <version>${kafka.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro</artifactId>
+        <version>${avro.version}</version>
+      </dependency>
+
+      <!-- JSON Processing Dependencies -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>2.15.3</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.datatype</groupId>
+        <artifactId>jackson-datatype-jsr310</artifactId>
+        <version>2.19.0</version>
+      </dependency>
+
+      <!-- Validation Dependencies -->
+      <dependency>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>3.1.0</version>
+      </dependency>
+
+      <!-- Code Generation and Utility Dependencies -->
+      <dependency>
+        <groupId>org.projectlombok</groupId>
+        <artifactId>lombok</artifactId>
+        <version>1.18.38</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.mapstruct</groupId>
+        <artifactId>mapstruct</artifactId>
+        <version>${org.mapstruct.version}</version>
+      </dependency>
+
+      <!-- Development and Static Analysis Annotations -->
+      <dependency>
+        <groupId>org.jetbrains</groupId>
+        <artifactId>annotations</artifactId>
+        <version>24.0.1</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
 	<build>
 		<pluginManagement>
@@ -199,6 +228,21 @@
 						<generatedSourcesDirectory>${project.build.directory}/generated-sources/annotations</generatedSourcesDirectory>
 					</configuration>
 				</plugin>
+        <plugin>
+          <groupId>org.apache.avro</groupId>
+          <artifactId>avro-maven-plugin</artifactId>
+          <version>${avro.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>io.github.ascopes</groupId>
+          <artifactId>protobuf-maven-plugin</artifactId>
+          <version>${protobuf-plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.6.1</version>
+        </plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>