feat: refactored stats and released recommendations feature

Author: yiqes

stats/analyzer/src/main/java/ru/practicum/model/EventSimilarity.java

@@ -12,15 +12,18 @@
 @NoArgsConstructor
 @Builder
 @Entity
-@Table(name = "events_similarity")
+@Table(name = "similarities")
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class EventSimilarity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     Long id;
-
+    @Column(name = "event_id_a")
     Long eventA;
+    @Column(name = "event_id_b")
     Long eventB;
+    @Column(name = "score")
     Double score;
+    @Column(name = "timestamp")
     Instant timestamp;
 }

stats/analyzer/src/main/java/ru/practicum/model/UserAction.java

@@ -1,11 +1,7 @@
 package ru.practicum.model;
 
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -20,16 +16,17 @@
 @NoArgsConstructor
 @Builder
 @Entity
-@Table(name = "user_actions")
+@Table(name = "actions")
 public class UserAction {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-
+    @Column(name = "user_id")
     private Long userId;
+    @Column(name = "event_id")
     private Long eventId;
-
+    @Column(name = "score")
     private Double score;
-
+    @Column(name = "lastInteraction")
     private Instant lastInteraction;
 }

stats/analyzer/src/main/resources/application.yml

@@ -13,6 +13,12 @@ spring:
       retry:
         useRandomPolicy: true
         max-interval: 6000
+  flyway:
+    flyway:
+      database: postgresql
+      ignore-future-migrations: true
+      postgresql:
+        transactional-lock: false
 eureka:
   client:
     serviceUrl:

stats/analyzer/src/main/resources/schema.sql

@@ -0,0 +1,17 @@
+CREATE TABLE similarities (
+  id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+   event_id_a BIGINT,
+   event_id_b BIGINT,
+   score DOUBLE PRECISION,
+   timestamp TIMESTAMP with time zone,
+   CONSTRAINT pk_similarities PRIMARY KEY (id)
+);
+
+CREATE TABLE actions (
+  id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL,
+   user_id BIGINT,
+   event_id BIGINT,
+   score DOUBLE PRECISION,
+   last_interaction TIMESTAMP with time zone,
+   CONSTRAINT pk_actions PRIMARY KEY (id)
+);

stats/collector/src/main/java/ru/practicum/service/CollectorController.java

@@ -1,6 +1,5 @@
 package ru.practicum.service;
 
-import com.google.protobuf.Empty;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.grpc.stub.StreamObserver;