From 22faeb15b1dd122f10793b6bdf7280dd6e772e16 Mon Sep 17 00:00:00 2001
From: Daria Simonenko <dar1asim@yandex.ru>
Date: Fri, 20 Feb 2026 23:40:48 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=20=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=20Event=20=D0=BF=D0=BE=D0=BB=D0=B5=20id=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=D0=B0=20=D0=BD=D0=B0=20eve?=
 =?UTF-8?q?ntId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yandex/practicum/filmorate/dal/database/EventDbStorage.java | 2 +-
 .../practicum/filmorate/dal/rowmappers/EventRowMapper.java      | 2 +-
 src/main/java/ru/yandex/practicum/filmorate/dto/EventDto.java   | 2 +-
 .../java/ru/yandex/practicum/filmorate/mapper/EventMapper.java  | 2 +-
 src/main/java/ru/yandex/practicum/filmorate/model/Event.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/yandex/practicum/filmorate/dal/database/EventDbStorage.java b/src/main/java/ru/yandex/practicum/filmorate/dal/database/EventDbStorage.java
index 757b550..ca56330 100644
--- a/src/main/java/ru/yandex/practicum/filmorate/dal/database/EventDbStorage.java
+++ b/src/main/java/ru/yandex/practicum/filmorate/dal/database/EventDbStorage.java
@@ -43,7 +43,7 @@ public Event addEvent(Event event) {
                 event.getEventType().name(),
                 event.getOperation().name(),
                 event.getEntityId());
-        event.setId(eventId);
+        event.setEventId(eventId);
         return event;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/ru/yandex/practicum/filmorate/dal/rowmappers/EventRowMapper.java b/src/main/java/ru/yandex/practicum/filmorate/dal/rowmappers/EventRowMapper.java
index a339a3b..d22c689 100644
--- a/src/main/java/ru/yandex/practicum/filmorate/dal/rowmappers/EventRowMapper.java
+++ b/src/main/java/ru/yandex/practicum/filmorate/dal/rowmappers/EventRowMapper.java
@@ -16,7 +16,7 @@ public class EventRowMapper implements RowMapper<Event> {
     @Override
     public Event mapRow(ResultSet resultSet, int rowNum) throws SQLException {
         return Event.builder()
-                .id(resultSet.getLong("id"))
+                .eventId(resultSet.getLong("id"))
                 .userId(resultSet.getLong("user_id"))
                 .timestamp(resultSet.getTimestamp("created_at").toInstant())
                 .eventType(EventType.valueOf(resultSet.getString("event_type")))
diff --git a/src/main/java/ru/yandex/practicum/filmorate/dto/EventDto.java b/src/main/java/ru/yandex/practicum/filmorate/dto/EventDto.java
index 25e5021..f6af3d1 100644
--- a/src/main/java/ru/yandex/practicum/filmorate/dto/EventDto.java
+++ b/src/main/java/ru/yandex/practicum/filmorate/dto/EventDto.java
@@ -10,7 +10,7 @@
 @Builder
 public class EventDto {
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
-    private Long id;
+    private Long eventId;
     private Long userId;
     private Long timestamp;
     private EventType eventType;
diff --git a/src/main/java/ru/yandex/practicum/filmorate/mapper/EventMapper.java b/src/main/java/ru/yandex/practicum/filmorate/mapper/EventMapper.java
index 9c91c18..b1458ea 100644
--- a/src/main/java/ru/yandex/practicum/filmorate/mapper/EventMapper.java
+++ b/src/main/java/ru/yandex/practicum/filmorate/mapper/EventMapper.java
@@ -9,7 +9,7 @@
 public class EventMapper {
     public static EventDto mapToEventDto(Event event) {
         return EventDto.builder()
-                .id(event.getId())
+                .eventId(event.getEventId())
                 .userId(event.getUserId())
                 .timestamp(event.getTimestamp().toEpochMilli())
                 .eventType(event.getEventType())
diff --git a/src/main/java/ru/yandex/practicum/filmorate/model/Event.java b/src/main/java/ru/yandex/practicum/filmorate/model/Event.java
index 8064030..0e6b176 100644
--- a/src/main/java/ru/yandex/practicum/filmorate/model/Event.java
+++ b/src/main/java/ru/yandex/practicum/filmorate/model/Event.java
@@ -12,7 +12,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class Event {
-    private Long id;
+    private Long eventId;
     private Long userId;
     private Instant timestamp;
     private EventType eventType;