From e83cce2315aca083ab497caa4f779030c345ab3d Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin>
Date: Sun, 14 Apr 2024 23:26:34 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D0=BC=D0=BE=D1=82=D1=80=D0=B5=D0=BD=D0=BD=D1=8B=D1=85,=20?=
 =?UTF-8?q?=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B7=D0=BE=D1=8C?=
 =?UTF-8?q?=D1=80=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20=D1=81=20=D0=B4=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BC=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/backend/viewed/api/ViewedDto.java  |  1 +
 .../example/backend/viewed/model/ViewedEntity.java | 14 ++++++++++++--
 .../viewed/repository/ViewedRepository.java        | 10 +++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/com/example/backend/viewed/api/ViewedDto.java b/backend/src/main/java/com/example/backend/viewed/api/ViewedDto.java
index e5b848b..99562c3 100644
--- a/backend/src/main/java/com/example/backend/viewed/api/ViewedDto.java
+++ b/backend/src/main/java/com/example/backend/viewed/api/ViewedDto.java
@@ -7,6 +7,7 @@ import jakarta.validation.constraints.NotNull;
 
 public class ViewedDto {
 
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     private Integer id;
 
     @NotNull
diff --git a/backend/src/main/java/com/example/backend/viewed/model/ViewedEntity.java b/backend/src/main/java/com/example/backend/viewed/model/ViewedEntity.java
index 089e432..639d539 100644
--- a/backend/src/main/java/com/example/backend/viewed/model/ViewedEntity.java
+++ b/backend/src/main/java/com/example/backend/viewed/model/ViewedEntity.java
@@ -6,9 +6,21 @@ import com.example.backend.core.model.BaseEntity;
 import com.example.backend.movies.model.MovieEntity;
 import com.example.backend.users.model.UserEntity;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+
+@Entity
+@Table(name = "viewes")
 public class ViewedEntity extends BaseEntity {
 
+    @ManyToOne
+    @JoinColumn(name = "userId", nullable = false)
     private UserEntity user;
+
+    @ManyToOne
+    @JoinColumn(name = "movieId", nullable = false)
     private MovieEntity movie;
 
     public ViewedEntity() {
@@ -16,8 +28,6 @@ public class ViewedEntity extends BaseEntity {
     }
 
     public ViewedEntity(Integer id, UserEntity user, MovieEntity movie) {
-
-        super(id);
         this.user = user;
         this.movie = movie;
     }
diff --git a/backend/src/main/java/com/example/backend/viewed/repository/ViewedRepository.java b/backend/src/main/java/com/example/backend/viewed/repository/ViewedRepository.java
index 9ad6eee..9ab58fc 100644
--- a/backend/src/main/java/com/example/backend/viewed/repository/ViewedRepository.java
+++ b/backend/src/main/java/com/example/backend/viewed/repository/ViewedRepository.java
@@ -1,11 +1,11 @@
 package com.example.backend.viewed.repository;
 
-import org.springframework.stereotype.Repository;
+import java.util.Optional;
+import org.springframework.data.repository.CrudRepository;
 
-import com.example.backend.core.repository.MapRepository;
 import com.example.backend.viewed.model.ViewedEntity;
 
-@Repository
-public class ViewedRepository extends MapRepository<ViewedEntity> {
-
+public interface ViewedRepository extends CrudRepository<ViewedEntity, Integer> {
+    Optional<ViewedEntity> findOneByUserIdAndId(long userId, long id);
+    Optional<ViewedEntity> findOneByMovieIdAndId(long movieId, long id);
 }