From 8baede6bca9a1372dd2fab41e482284c646917bd Mon Sep 17 00:00:00 2001
From: "ityurner02@mail.ru" <ityurner02@mail.ru>
Date: Mon, 3 Apr 2023 16:29:42 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=A03=20=D0=B1=D0=B5=D0=B7=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=BF=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.mv.db                                    | Bin 36864 -> 32768 bytes
 .../is/lab1/DataBase/model/Collection.java    |   6 ++++-
 .../ru/ulstu/is/lab1/DataBase/model/Film.java |  21 ++++++++++++++++--
 .../ulstu/is/lab1/DataBase/model/Genre.java   |   2 --
 .../is/lab1/DataBase/service/FilmService.java |   4 ++++
 .../java/ru/ulstu/is/lab1/JpaFilmTests.java   |   1 +
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/data.mv.db b/data.mv.db
index 8b5e1f9870fe94703b4d54b37478d97eb117ca02..ccb25d8954576990440eb2d795f2f3ec3330e1fa 100644
GIT binary patch
literal 32768
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

delta 3687
zcmeHKU2hdd7~b9XwB=MN<s(I~v`w)HSzu>ozvD%@Ac2q=KN2L6Xm)3JZKd>-(juDZ
zsh8e~lNb^czz{#;2eCOf5H9pj7-ReeCK|8w4)mRw-Pt)U1?56-yxM6`d**rH_j%su
z*_9P*<%TtRJjQl9*P`cQS3X~weJhWV<2W{*S)M-^WB1DB)K2W$#azBbXY$23a$PSB
zaL`;$t`D($Lz|y`+<zV0lwwp~kL|g99>APW7Ge^@<8q7$pqS4uF9EiN<hA@_Ozg#0
zYbg$0z~_*t@UXo!dp?gzkta!!dG@7z@#1U?z6aS$Eedty0b4zCqS-Wz{%88{8rD<n
z?(}=?)x_^yJ9^*h?9R7Xojo(B%^vf#$?iCB50Rh`ARH!PgFn2^G4yk<g&p?t)L#DB
zI<=p@G4<m?5?CZO4D0nLe9P!J21K(Cqr5s4<pKU>dSSHrwJE!aa`x+)18w3yyuct7
z1$t?w3e1u$bg;cVzkD&zpx`VeshgHRA6+_C7LE$l1C)y%6j^AuC|zDi=INWU6MSq^
zw)H}z34bXEAF#0t`xK<4>UmW59Lt^ultXf(FmkG%1Ei!t4~0<3F}M!ZG2mNeJFrt?
zh}b7*C)&hc)0TA2+&Kh?1X)zKMQ=mR1KFm!EpU;d2H+Re@FE>kV4`OSC9zQ9M`3w(
zFom-$o}Y8WFjfr1z6#H2!~BCk4WsA!i>t}ITRs@?+piH?-H0^t08K-hxWLNi*vfb>
z`}0Wu2&k*lAQu6WBFNdOGipboW|VoJEBo%cX@)|iaUDK@f)bxo{bWB-z3*n9$8J0C
z43SKdIqxDfkz^(nnF+}(0)_Q#>!qeKpvbH^j4CqY>OeTFw*i&Jj`%OBbfcn@S|sfE
zGed0<kUckhDSuw<jk2SUy;j!I3DtC}H;qQ89ghE11xzhiwy-!cPZGg#P?KD3UboCb
zp?q!Ju-Z}&=3OhlD1ZR|I@w`dV*+^yMkMTo#hpz|N_u%5!2qEGLCOvv7-@$>*8Dyt
zsjlyj72VeLfYkR9abJ`=S_>RvqCv@CDIzJZZb4Zz>dYM6)nNC>2KH+*P}0$TC&x4_
zl1P`%XkDA|k8;pjh4#i3s!J4nO+Z)*D3t=DT>`>VK)4dnL6Ta8f*YJ|95OXGcz}TZ
z*Ufr|)=0CVZrcB@ZZt@O#~~Iv*_g=E8Kz5TFbwm1aD?v~!V#4GbivedD#Kxz*R=MU
z%Hl&mLY44qFGH#N9+U{-g>EW@4xdOL@ww33SlTIQP_CMwd)4?-`W{6}`dR1)>P8+i
zLO)eMYY1qKAQcD#+GVDM8~hd?9}z7f1+29&v8jZFJT`WAq#X!vb4jSh9KGhhhkyzM
zh`3!4z|RK*krO=#hG601%m?U~XS6RuUghT>!pOkSue<_oK5aDao#wV~^nbczHTh^W
zpCZbXM^}3Tex;^JJ(8q(7V66>t$k4sw`KPG=Rr%|Tc;|x?!*8%{_r=$qekbq<6jQ%
zHow^ZgK6|B7tg9ln)BVW>$A$U>w0+RAZ+l!o;Kn6`*MsqHkr8HGX06}1&NQ!6tadJ
zd{P^v!Mx^5CMJau^>lp|m4zddr{fU|Icy@@t`g}+Zvl@A$r@iZ3=a&&E+>n0-jpC9
z3!Eo`oa@6Mki@XB33BvaeZTYVsh@fpeK&_sTI|kvG~fxhz&`tB{AB0Y#BGah_4isR
z5q^P^&b`Ul;;#<`dlvQ~aUB}{yhlr1Q8lZiI;7Qs!t|bQqNrjams1-YQ@kj7Yb9R3
xDEVS+E;PKBxDPLHS)C?8;*VM~5g*%{peKg9i@$0C$!iq^zDJ!bt5je%{{n_NbEg0R

diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Collection.java b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Collection.java
index 576dabf..e68a352 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Collection.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Collection.java
@@ -42,9 +42,13 @@ public class Collection {
         if (films == null){
             films = new ArrayList<>();
         }
-        this.films.add(film);
+        if (!this.films.contains(film)) {
+            this.films.add(film);
+            film.addCollections(this);
+        }
     }
 
+
     public void removeFilm(Film film){
         if(films != null){
             films.remove(film);
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Film.java b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Film.java
index 20c2a1a..bee65cf 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Film.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Film.java
@@ -1,5 +1,8 @@
 package ru.ulstu.is.lab1.DataBase.model;
 
+import org.hibernate.annotations.LazyCollection;
+import org.hibernate.annotations.LazyCollectionOption;
+
 import javax.persistence.*;
 
 import java.util.List;
@@ -12,12 +15,15 @@ public class Film {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
     private String name;
-    @ManyToMany(fetch = FetchType.EAGER)
+    @ManyToMany
+    @LazyCollection(LazyCollectionOption.FALSE)
     @JoinTable(name="films_genres",
             joinColumns = @JoinColumn(name="film_id"),
             inverseJoinColumns = @JoinColumn(name="genre_id")
     )
     private List<Genre> genres;
+    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "films")
+    private List<Collection> collections;
 
     public Film() {
     }
@@ -42,7 +48,8 @@ public class Film {
         if (genres == null){
             genres = new ArrayList<>();
         }
-        this.genres.add(genre);
+        if (!this.genres.contains(genre))
+            this.genres.add(genre);
     }
 
     public void removeGenre(Genre genre){
@@ -55,6 +62,16 @@ public class Film {
         return genres;
     }
 
+    public List<Collection> getCollections() {
+        return collections;
+    }
+
+    public void addCollections(Collection collection) {
+        if(this.collections==null)
+            collections=new ArrayList<>();
+        collections.add(collection);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java
index 71af0ed..382a835 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/model/Genre.java
@@ -11,8 +11,6 @@ public class Genre {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
     private String name;
-    @ManyToMany(fetch = FetchType.EAGER, mappedBy = "genres")
-    private List<Film> films;
 
     public Genre() {
     }
diff --git a/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java b/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java
index a91c3cd..f0bdd14 100644
--- a/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java
+++ b/src/main/java/ru/ulstu/is/lab1/DataBase/service/FilmService.java
@@ -9,6 +9,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -89,4 +91,6 @@ public class FilmService {
     public void deleteAllFilms() {
         em.createQuery("delete from Film").executeUpdate();
     }
+
+    //сделать запрос отбора фильмов по жанру
 }
diff --git a/src/test/java/ru/ulstu/is/lab1/JpaFilmTests.java b/src/test/java/ru/ulstu/is/lab1/JpaFilmTests.java
index 028d7a0..eaf84e1 100644
--- a/src/test/java/ru/ulstu/is/lab1/JpaFilmTests.java
+++ b/src/test/java/ru/ulstu/is/lab1/JpaFilmTests.java
@@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import java.math.BigInteger;
 import java.util.List;
 
 @SpringBootTest