Этап 3: Замена сервиса статистики на асинхронную систему рекомендаций

.run/ewm-db.run.xml → .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" />

compose.yaml

@@ -1,4 +1,7 @@
 services:
+  # ===================================================================
+  # INFRASTRUCTURE SERVICES
+  # ===================================================================
   discovery-server:
     build: infra/discovery-server
     container_name: ewm-discovery-server
@@ -49,24 +52,122 @@ 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
       config-server:
         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: {}
+  main_db_data: { }

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>

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);
+    }
+}