Index: kreiranje.sql
===================================================================
--- DB/kreiranje.sql (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,210 +1,0 @@
-/*
- * funkcija koja ke bide check_constraint za tip na person vo soodvetnite relacii
- */
-create function check_constraint_person(integer) returns char
- as $$ select type from persons where person_id = $1 $$
- language sql;
-
-
--- dodavanje tabeli
-create table users(
- user_id serial primary key,
- username varchar(50) not null unique,
- name varchar(50) not null,
- surname varchar(50) not null,
- email varchar(100) not null unique,
- password varchar(30) not null,
- constraint ck_password check(length(password) >= 9)
-);
-
-create table persons(
- person_id serial primary key,
- name varchar(100) not null,
- surname varchar(100) not null,
- type char(1) not null,
- date_of_birth date not null,
- image_url varchar(300) not null,
- description varchar(300) not null,
- constraint ck_type check (type ='A' or type='D')
-);
-
-create table movies(
- movie_id serial primary key,
- title varchar(150) not null unique,
- description varchar(1000) not null,
- image_url varchar(300) not null,
- airing_date date not null,
- imdb_rating float,
- director_id integer,
- constraint fk_movie_director foreign key (director_id) references persons(person_id)
- on delete cascade on update cascade,
- constraint ck_person_is_director check( check_constraint_person(director_id) = 'D')
- /*
- * dodaden uslov za foreing key
- */
-);
-
-create table genres(
- genre_id serial primary key,
- genre_type varchar(100) not null unique
-);
-
-create table movie_rates(
- movie_id integer,
- user_id integer,
- reason varchar(300) not null,
- stars_rated integer not null,
- constraint pk_movie_rates primary key (movie_id,user_id),
- constraint fk_rated_movie foreign key (movie_id) references movies(movie_id)
- on delete cascade on update cascade,
- constraint fk_user_rate foreign key (user_id) references users(user_id)
- on delete cascade on update cascade,
- constraint ck_movie_stars check (stars_rated >= 1 and stars_rated <= 10)
-);
-
-create table movie_likes(
- movie_id integer,
- user_id integer,
- constraint pk_movie_likes primary key (movie_id,user_id),
- constraint fk_liked_movie foreign key (movie_id) references movies(movie_id)
- on delete cascade on update cascade,
- constraint fk_user_like foreign key (user_id) references users(user_id)
- on delete cascade on update cascade
-);
-
-create table movie_genres(
- movie_id integer,
- genre_id integer,
- constraint pk_movie_genres primary key (movie_id,genre_id),
- constraint fk_movie_genre foreign key (movie_id) references movies(movie_id)
- on delete cascade on update cascade,
- constraint fk_genre_type_movie foreign key (genre_id) references genres(genre_id)
- on delete cascade on update cascade
-);
-
-create table user_genres(
- user_id integer,
- genre_id integer,
- constraint pk_user_genres primary key (user_id,genre_id),
- constraint fk_user_genre foreign key (user_id) references users(user_id)
- on delete cascade on update cascade,
- constraint fk_genre_like_user foreign key (genre_id) references genres(genre_id)
- on delete cascade on update cascade
-);
-
-create table movie_actors(
- movie_id integer,
- actor_id integer,
- constraint pk_movie_actors primary key (movie_id,actor_id),
- constraint fk_actors_in_movie foreign key (movie_id) references movies(movie_id)
- on delete cascade on update cascade,
- constraint fk_actor_acts_movie foreign key (actor_id) references persons(person_id)
- on delete cascade on update cascade,
- constraint ck_person_is_actor check(check_constraint_person(actor_id) = 'A')
-/*
- * dodaeno
- * potrebno e i ovde ogranicuvanje na actor_id, negovoto svojstvo type = 'A'
- */
-);
-
-create table person_rates(
- person_id integer,
- user_id integer,
- reason varchar(300) not null,
- stars_rated integer not null,
- constraint pk_person_rates primary key (person_id,user_id),
- constraint fk_rated_person foreign key (person_id) references persons(person_id)
- on delete cascade on update cascade,
- constraint fk_user_rate_person foreign key (user_id) references users(user_id)
- on delete cascade on update cascade,
- constraint ck_person_stars check (stars_rated >= 1 and stars_rated <= 10)
-);
-
-create table discussions(
- discussion_id serial primary key,
- type char(1) not null,
- text varchar(1000) not null,
- title varchar(250) not null,
- date date not null,
- user_id integer not null,
- movie_id integer,
- person_id integer,
- constraint fk_user_created foreign key (user_id) references users(user_id)
- on delete cascade on update cascade,
- constraint ck_type_discussion check( (type = 'M' and movie_id notnull and person_id isnull)
- or (type='P' and person_id notnull and movie_id isnull)),
- constraint fk_discussion_movie foreign key (movie_id) references movies(movie_id)
- on delete cascade on update cascade,
- constraint fk_discussion_person foreign key (person_id) references persons(person_id)
- on delete cascade on update cascade
-);
-
-
-
-create table replies(
- discussion_id integer,
- reply_id serial,
- text varchar(1000) not null,
- date date not null,
- user_id integer not null,
- constraint pk_replies primary key(discussion_id,reply_id),
- constraint fk_user_create_reply foreign key (user_id) references users(user_id)
- on delete cascade on update cascade,
- constraint fk_reply_discussion foreign key (discussion_id) references discussions(discussion_id)
- on delete cascade on update cascade
-
-
-);
-
-
-create table reply_likes(
- reply_id integer,
- discussion_id integer,
- user_id integer,
- constraint pk_reply_likes primary key (reply_id, discussion_id,user_id),
- constraint fk_user_like foreign key (user_id) references users(user_id)
- on delete cascade on update cascade,
- constraint fk_reply_like foreign key (reply_id, discussion_id) references replies(reply_id, discussion_id)
- on delete cascade on update cascade
-);
-
-
-
-create table discussion_likes(
- discussion_id integer,
- user_id integer,
- constraint pk_discussion_likes primary key (discussion_id,user_id),
- constraint fk_liked_discussion foreign key (discussion_id) references discussions(discussion_id)
- on delete cascade on update cascade,
- constraint fk_user_like foreign key (user_id) references users(user_id)
- on delete cascade on update cascade
-);
-
-
-
-
--- brisenje tabeli
-drop table if exists reply_likes;
-drop table if exists discussion_likes;
-drop table if exists replies;
-drop table if exists discussions;
-drop table if exists person_rates;
-drop table if exists movie_actors;
-drop table if exists user_genres;
-drop table if exists movie_genres;
-drop table if exists movie_likes;
-drop table if exists movie_rates;
-drop table if exists genres;
-drop table if exists movies;
-drop table if exists persons;
-drop table if exists users;
-
-
-
-
-
-
-
-
-
-
Index: polnenje.sql
===================================================================
--- DB/polnenje.sql (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,132 +1,0 @@
-insert into persons (name, surname, type, date_of_birth, image_url, description) VALUES
- ('Quentin', 'Tarantino', 'D', to_date('27-04-1963','DD-MM-YYYY'),'https://upload.wikimedia.org/wikipedia/commons/0/0b/Quentin_Tarantino_by_Gage_Skidmore.jpg', 'Quentin Jerome Tarantino is an American film director, screenwriter, producer, film critic, and actor. His films are characterized by nonlinear storylines, dark humor, stylized violence, extended dialogue, ensemble casts, references to popular culture, alternate history, and neo-noir.' ),
- ('Steven', 'Spielberg', 'D', to_date('18-12-1946','DD-MM-YYYY'),'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRHVS2ee6usybjD-SvuXSvnWU2E3qf7-5g5YOTbUK71OHqtPVTY','Steven Allan Spielberg is an American film director, producer, and screenwriter. He began his career in the New Hollywood era and is currently the most commercially successful director.'),
- ('Christopher', 'Nolan', 'D', to_date('30-07-1970','DD-MM-YYYY'),'https://upload.wikimedia.org/wikipedia/commons/9/95/Christopher_Nolan_Cannes_2018.jpg','Christopher Edward Nolan CBE is a British-American film director, producer, and screenwriter. His films have grossed more than US$5 billion worldwide, and have garnered 11 Academy Awards from 36 nominations. Born and raised in London, Nolan developed an interest in filmmaking from a young age.'),
- ('Tom', 'Hanks', 'A', to_date('09-07-1956','DD-MM-YYYY'),'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS-bt7_ZKFMU8UOOjlq-GYF5P0iNJVuqz9HuDI3GkLmLXDfifpy','Thomas Jeffrey Hanks is an American actor and filmmaker. Known for both his comedic and dramatic roles, he is one of the most popular and recognizable film stars worldwide, and is regarded as an American cultural icon.'),
- ('Morgan', 'Freeman', 'A', to_date('01-06-1937','DD-MM-YYYY'),'https://i.pinimg.com/originals/91/c1/61/91c161020022edecc008eb83d248cafb.jpg','Morgan Freeman is an American actor, director, and narrator. Noted for his distinctive deep voice, Freeman is known for his various roles in a wide variety of film genres'),
- ('Will', 'Smith', 'A', to_date('25-09-1968','DD-MM-YYYY'),'https://static.wikia.nocookie.net/id4/images/7/79/Will_Smith.jpg/revision/latest/top-crop/width/360/height/450?cb=20210129212321','Willard Carroll Smith Jr. is an American actor, rapper, and film producer. Smith has been nominated for five Golden Globe Awards and two Academy Awards, and has won four Grammy Awards.'),
- ('Harrison', 'Ford', 'A', to_date('13-07-1942','DD-MM-YYYY'),'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS77p6ogwyz9a8J2BkxfXhuFN9HZ2cMQOQsUZbJL02Q2oWxRO6z','Harrison Ford is an American actor. As of 2020, the U.S. domestic box-office grosses of his films total over $5.4 billion with worldwide grosses surpassing $9.3 billion, placing him at No. 7 on the list of highest-grossing domestic box office stars of all time.'),
- ('Robert', 'Downey Jr.', 'A', to_date('04-04-1965','DD-MM-YYYY'),'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT8NG8tRjukxvrSbGk2CfWU_aw9yUjpnFqbAoORbc7lZityM2nl','Robert John Downey Jr. is an American actor and producer. His career has been characterized by critical and popular success in his youth, followed by a period of substance abuse and legal troubles, before a resurgence of commercial success later in his career. '),
- ('Scarlett', 'Johansson','A', to_date('22-11-1984','DD-MM-YYYY'),'https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcT3k7WTbWsb6Kn6NRCuUHUsnA3eIaL0yxcwTYN6s0NU663-gvym','Scarlett Ingrid Johansson is an American actress. She was the world''s highest-paid actress in 2018 and 2019, and has featured multiple times on the Forbes Celebrity 100 list. ');
-
-
-insert into users(name,surname,email,username,password) values
- ('Petar','Partaloski','partaloski@wedm.com','partaloski','Petar123!'),
- ('Martin','Nikolov','nikolov@wedm.com','nikolov','Martin456#'),
- ('John','Doe','doeJohn@wedm.com','doeJohn','John1234$'),
- ('Gorgi','Gorgiev','gorgiev@yahoo.com','gorgi','Gorgi121!'),
- ('Sime','Stefanovski','simce@google.com','simjon','Sim121312!');
-
-
-
-insert into movies(title, description, image_url, airing_date, imdb_rating, director_id) values
- ('Iron Man',
- 'After being held captive in an Afghan cave, billionaire engineer Tony Stark creates a unique weaponized suit of armor to fight evil.',
- 'https://m.media-amazon.com/images/M/MV5BMTczNTI2ODUwOF5BMl5BanBnXkFtZTcwMTU0NTIzMw@@._V1_.jpg',
- to_date('02-05-2008','DD-MM-YYYY'),
- 7.9,
- 1),
- ('Inferno',
- 'When Robert Langdon wakes up in an Italian hospital with amnesia, he teams up with Dr. Sienna Brooks, and together they must race across Europe against the clock to foil a deadly global plot.',
- 'https://m.media-amazon.com/images/M/MV5BMTUzNTE2NTkzMV5BMl5BanBnXkFtZTgwMDAzOTUyMDI@._V1_.jpg',
- to_date('20-10-2016','DD-MM-YYYY'),
- 6.2,
- 2),
- ('I Am Legend',
- 'Robert Neville, a scientist, is the last human survivor of a plague in the whole of New York. He attempts to find a way to reverse the effects of the man-made virus by using his own immune blood.',
- 'https://encrypted-tbn3.gstatic.com/images?q=tbn:ANd9GcQHox76WNKeFcPGLKO6189r3pgqYCl8diSVwcUZgGXdYmaU9oCU',
- to_date('14-12-2007','DD-MM-YYYY'),
- 7.2,
- 3);
-
-
-insert into genres (genre_type) values
- ('Action'),
- ('Adventure'),
- ('Romance'),
- ('Sci-Fi'),
- ('Horror'),
- ('Animated'),
- ('Drama'),
- ('Comedy'),
- ('Crime'),
- ('Documentary'),
- ('Fantasy');
-
-insert into movie_rates (movie_id, user_id, reason, stars_rated) values
- (1,1,'Movie was very good, a very good cinema experience with good audio spatial effects and very good story telling, one of the best movies from 2008!',10),
- (2,2,'Inferno, where Tom Hanks acts, was very unpredictable, a very good movie with many twists and turns!',9),
- (3,1,'I am a legend is such a great movie, especially for someone like me who loves post-apocalyptic scenarios, a clear 10 from me!',10),
- (3,3,'This movie had me on the edge of my seat for the whole duration of it! I loved it!',10);
-
-insert into movie_likes(movie_id, user_id) values
- (1,5),
- (3,2),
- (3,1);
-
-insert into movie_genres(movie_id, genre_id) values
- (1,1),(1,4),(1,11),
- (2,1),(2,2),(2,7),
- (3,1),(3,2),(3,4),(3,5);
-
-insert into user_genres(user_id, genre_id) values
- (1,1),
- (1,2),
- (3,4),
- (3,6),
- (2,8),
- (4,1),
- (2,2),
- (4,5),
- (4,8);
-
-insert into movie_actors(movie_id, actor_id) values
- (1,8),
- (2,4),
- (3,6);
-
-
-
-insert into person_rates(person_id, user_id,reason, stars_rated) values
- (1,2,'You cannot hate this guy, he is one of the best directors the movie industry has ever seen, he can do wonders on every set he is at', 10),
- (4,3,'Tom Hanks is one of those classic movie actors, comes in on a set and does a great job, I actually met him and he seemed so kind, love all of his movies!', 9),
- (6,2,'I love comedies, and when I see Will Smith in one of them, I just know that it''s going to be a good one! Love this guy!', 10);
-
-
-
-insert into discussions(type, text, title, date, user_id,movie_id,person_id) values
- ('M', 'Do you guys think that there is a possibility of there ever being a sequel to this movie come out in the future? I loved the movie since it always had me on the edge of my seat and I love good post-apocalyptic movies, and I loved this one so I was thinking how it would be if a second one were to come out...',
- 'Is there a possibility of us seeing "I Am Legend 2"?',
- current_date - interval '3 days',
- 3,3,null),
- ('P', 'I saw an article saying that Tom Hanks''s next movie would be the last one he''ll make and then he will just be gone, retired... Is this true, I cannot imagine the movie screens without him being on there...',
- 'Is Tom Hanks retiring?',
- current_date - interval '2 days',
- 4,null,4),
- ('M', 'When you look at it, the 2008''s Iron Man is the best movie from the franchise that has ever came out, the thrill I get when watching that specific movie is just crazy, I don''t think we will ever get to see a movie that great once again, do you guys think the same too?',
- 'Best movie of the Iron Man franchise?',
- current_date - interval '1 day',
- 5,1,null),
- ('P', 'Tarantino''s early films have made him a hero of 21st Century filmmaking. His unapologetic repetition of themes, skilled use of the camera to create highly tense moments, and his preference for morally ambiguous characters allows fans to instantly recognise the man in his films. This guy is awesome, he walks in on a set and basically does wonders!',
- 'This guy is one of the best directors ever!',
- current_date - interval '4 days',
- 2,null,1),
- ('M', 'Why don''t people like this movie? I loved watching it and so did my family, we were watching it and we were all so intrigued by what came next, the suspense and all of that, the twists and turns this movie has, why is it rated that low?',
- 'Inferno is a great movie and I don''t understand why people don''t like it, or that''s what IMDB is telling us by the visible rating',
- current_date - interval '5 days',
- 3,2,null),
- ('P', 'I want to watch some movies where Morgan Freeman acts in, which ones are the classics that you guys would recommend?',
- 'Morgan Freeman - movie recommendations?',
- current_date,
- 4,null,5);
-
-
-
-
-
-insert into replies(discussion_id, text, date, user_id) values
- (6, 'I would suggest watching Bruce Almighty, he has such an important and funny role in that movie, I was having so much fun with it, as someone who loves comedies', current_date,4),
- (6, 'Going In Style is a good movie, if you like comedies, where Morgan has a bigger role and is one of the main characters, very fun movie overall! I also like the previous user''s suggestion, that movie he suggested is very cool too!', current_date,2),
- (1, 'If they decided to do one I don''t think it would match our expecations and my expectations for a movie of that kind if it comes out in the current year are pretty low, I still don''t think it would live up to my expectations, that movie was very good for its time, but not in the current day sadly :(', current_date,3);
-
-
Index: README.md
===================================================================
--- README.md (revision 6e7b4721e1c9f389c67f55f48aab976c7eb4e7a9)
+++ README.md (revision 6e7b4721e1c9f389c67f55f48aab976c7eb4e7a9)
@@ -0,0 +1,27 @@
+
+
WeDiscussMovies
+
+
+
Предмет: Бази на податоци 2021/2022/Зимски
+
Под менторство на вонр. проф. д-р Вангел Ајановски и демонстр. м-р Ненад Анчев
+
Започнат: Ноември 2021
+
+
+
+
+
Краток опис на проектот
+
+Овој форум ќе овозможува на корисниците лесен и брз начин за дискутирање на филмови, споделување на мислење за филмови, како и останатите корисници да можат да возвратат на аргументите и контрааргументите поставени во отворените дискусии на некој корисник. Форумот има цел да помогне во изборот на корисниците кои следни филмови да ги гледаат врз база на дискусиите за филмовите и актерите.
+
+За секој филм би се чувало општи податоци како ID, наслов, жанр, рејтинг( формирана врз база на сите дискусии), насловна слика и слично. Исто така, филмот ќе содржи податочна структура составена од дискусии од страна на корисниците за дадениот филм. Дискусиите ќе содржат ID, текстови и оцени од корисниците вклучени во дискусијата.
+
+Дејствија на корисникот би биле прегледување на дискусиите на соодветен филм, актер, како и вклучување или креирање на нови дискусии. Даден корисник ќе може да прегледа профил на друг корисник, да ги разгледа неговите дискусии и интереси. Доколку не постои запис за даден актер, филм или режисер, ќе постои функционалност за додавање на нови записи.
+
+Дополнителна функционалност во иднина е и можно ширење на форумот во некој тип на мрежа каде што и корисниците може да разменуваат пораки меѓу себе.
+
Под менторство на вонр. проф. д-р Вангел Ајановски и демонстр. м-р Ненад Анчев
-
Започнат: Ноември 2021
-
Краток опис на проектот
-
-Овој форум ќе овозможува на корисниците лесен и брз начин за дискутирање на филмови, споделување на мислење за филмови, како и останатите корисници да можат да возвратат на аргументите и контрааргументите поставени во отворените дискусии на некој корисник. Форумот има цел да помогне во изборот на корисниците кои следни филмови да ги гледаат врз база на дискусиите за филмовите и актерите.
-
-За секој филм би се чувало општи податоци како ID, наслов, жанр, рејтинг( формирана врз база на сите дискусии), насловна слика и слично. Исто така, филмот ќе содржи податочна структура составена од дискусии од страна на корисниците за дадениот филм. Дискусиите ќе содржат ID, текстови и оцени од корисниците вклучени во дискусијата.
-
-Дејствија на корисникот би биле прегледување на дискусиите на соодветен филм, актер, како и вклучување или креирање на нови дискусии. Даден корисник ќе може да прегледа профил на друг корисник, да ги разгледа неговите дискусии и интереси. Доколку не постои запис за даден актер, филм или режисер, ќе постои функционалност за додавање на нови записи.
-
-Дополнителна функционалност во иднина е и можно ширење на форумот во некој тип на мрежа каде што и корисниците може да разменуваат пораки меѓу себе.
-
-
-
Членови на проектот
-
-
Петар Парталоски - Координатор (193181)
-
Мартин Николов (193113)
-
-
Index: urces/mvnw
===================================================================
--- Sources/mvnw (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,316 +1,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Maven Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-# JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-# M2_HOME - location of maven2's installed home dir
-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
- if [ -f /usr/local/etc/mavenrc ] ; then
- . /usr/local/etc/mavenrc
- fi
-
- if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
- fi
-
- if [ -f "$HOME/.mavenrc" ] ; then
- . "$HOME/.mavenrc"
- fi
-
-fi
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- MINGW*) mingw=true;;
- Darwin*) darwin=true
- # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
- # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
- if [ -z "$JAVA_HOME" ]; then
- if [ -x "/usr/libexec/java_home" ]; then
- export JAVA_HOME="`/usr/libexec/java_home`"
- else
- export JAVA_HOME="/Library/Java/Home"
- fi
- fi
- ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=`java-config --jre-home`
- fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
- ## resolve links - $0 may be a link to maven's home
- PRG="$0"
-
- # need this for relative symlinks
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
- done
-
- saveddir=`pwd`
-
- M2_HOME=`dirname "$PRG"`/..
-
- # make it fully qualified
- M2_HOME=`cd "$M2_HOME" && pwd`
-
- cd "$saveddir"
- # echo Using m2 at $M2_HOME
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --unix "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME="`(cd "$M2_HOME"; pwd)`"
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
- javaExecutable="`which javac`"
- if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
- # readlink(1) is not available as standard on Solaris 10.
- readLink=`which readlink`
- if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
- if $darwin ; then
- javaHome="`dirname \"$javaExecutable\"`"
- javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
- else
- javaExecutable="`readlink -f \"$javaExecutable\"`"
- fi
- javaHome="`dirname \"$javaExecutable\"`"
- javaHome=`expr "$javaHome" : '\(.*\)/bin'`
- JAVA_HOME="$javaHome"
- export JAVA_HOME
- fi
- fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD="`\\unset -f command; \\command -v java`"
- fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly." >&2
- echo " We cannot execute $JAVACMD" >&2
- exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
- echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-
- if [ -z "$1" ]
- then
- echo "Path not specified to find_maven_basedir"
- return 1
- fi
-
- basedir="$1"
- wdir="$1"
- while [ "$wdir" != '/' ] ; do
- if [ -d "$wdir"/.mvn ] ; then
- basedir=$wdir
- break
- fi
- # workaround for JBEAP-8937 (on Solaris 10/Sparc)
- if [ -d "${wdir}" ]; then
- wdir=`cd "$wdir/.."; pwd`
- fi
- # end of workaround
- done
- echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
- if [ -f "$1" ]; then
- echo "$(tr -s '\n' ' ' < "$1")"
- fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
- exit 1;
-fi
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found .mvn/wrapper/maven-wrapper.jar"
- fi
-else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
- fi
- if [ -n "$MVNW_REPOURL" ]; then
- jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
- else
- jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
- fi
- while IFS="=" read key value; do
- case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
- esac
- done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Downloading from: $jarUrl"
- fi
- wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
- if $cygwin; then
- wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
- fi
-
- if command -v wget > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found wget ... using wget"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
- else
- wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
- fi
- elif command -v curl > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found curl ... using curl"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- curl -o "$wrapperJarPath" "$jarUrl" -f
- else
- curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
- fi
-
- else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Falling back to using Java to download"
- fi
- javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaClass=`cygpath --path --windows "$javaClass"`
- fi
- if [ -e "$javaClass" ]; then
- if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Compiling MavenWrapperDownloader.java ..."
- fi
- # Compiling the Java class
- ("$JAVA_HOME/bin/javac" "$javaClass")
- fi
- if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- # Running the downloader
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Running MavenWrapperDownloader.java ..."
- fi
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
- fi
- fi
- fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
- echo $MAVEN_PROJECTBASEDIR
-fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --path --windows "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- [ -n "$MAVEN_PROJECTBASEDIR" ] &&
- MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
-fi
-
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
-
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-exec "$JAVACMD" \
- $MAVEN_OPTS \
- $MAVEN_DEBUG_OPTS \
- -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
- "-Dmaven.home=${M2_HOME}" \
- "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
- ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
Index: urces/mvnw.cmd
===================================================================
--- Sources/mvnw.cmd (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,188 +1,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM https://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
- if "%MVNW_VERBOSE%" == "true" (
- echo Found %WRAPPER_JAR%
- )
-) else (
- if not "%MVNW_REPOURL%" == "" (
- SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar"
- )
- if "%MVNW_VERBOSE%" == "true" (
- echo Couldn't find %WRAPPER_JAR%, downloading it ...
- echo Downloading from: %DOWNLOAD_URL%
- )
-
- powershell -Command "&{"^
- "$webclient = new-object System.Net.WebClient;"^
- "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
- "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
- "}"^
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
- "}"
- if "%MVNW_VERBOSE%" == "true" (
- echo Finished downloading %WRAPPER_JAR%
- )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% ^
- %JVM_CONFIG_MAVEN_PROPS% ^
- %MAVEN_OPTS% ^
- %MAVEN_DEBUG_OPTS% ^
- -classpath %WRAPPER_JAR% ^
- "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
- %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
-
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-
-cmd /C exit /B %ERROR_CODE%
Index: urces/pom.xml
===================================================================
--- Sources/pom.xml (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,98 +1,0 @@
-
-
- 4.0.0
-
- org.springframework.boot
- spring-boot-starter-parent
- 2.6.2
-
-
- com.wediscussmovies
- project
- 0.0.1-SNAPSHOT
- WeDiscussMovies
- WeDiscussMovies
-
- 11
-
-
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
-
- org.springframework.boot
- spring-boot-starter-security
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.thymeleaf.extras
- thymeleaf-extras-springsecurity5
-
-
-
- org.postgresql
- postgresql
-
-
- org.projectlombok
- lombok
- true
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.springframework.security
- spring-security-test
- test
-
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa
-
-
- org.springframework.boot
- spring-boot-actuator
-
-
- com.h2database
- h2
-
-
- com.jcraft
- jsch
- 0.1.55
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
- org.projectlombok
- lombok
-
-
-
-
-
-
-
-
Index: urces/project.iml
===================================================================
--- Sources/project.iml (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,143 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: urces/src/.idea/dataSources.local.xml
===================================================================
--- Sources/src/.idea/dataSources.local.xml (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,29 +1,0 @@
-
-
-
-
-
- "
-
-
- master_key
- db_202122z_va_prj_wediscussmovies_owner
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
- 9931abea-7a3c-42f6-b05b-a3687248664f
-
-
-
-
Index: urces/src/.idea/workspace.xml
===================================================================
--- Sources/src/.idea/workspace.xml (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,313 +1,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1642329643351
-
-
- 1642329643351
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1642522697517
-
-
-
- 1642522697517
-
-
- 1644013333740
-
-
-
- 1644013333740
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar!/com/zaxxer/hikari/HikariDataSource.class
- 31
-
-
-
- jar://$MAVEN_REPOSITORY$/com/zaxxer/HikariCP/4.0.3/HikariCP-4.0.3.jar!/com/zaxxer/hikari/HikariDataSource.class
- 111
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java
- 58
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java
- 63
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java
- 94
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java
- 163
-
-
-
- file://$PROJECT_DIR$/src/main/java/com/wediscussmovies/project/configuration/PasswordEncoder.java
- 11
-
-
-
-
-
-
-
-
-
-
-
- file://$PROJECT_DIR$/src/main/resources/static/js/sharedScript.js
- 2
-
-
-
- file://$PROJECT_DIR$/src/main/resources/static/js/graphqlmovie.js
- 321
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: urces/src/main/java/com/wediscussmovies/project/LoggedUser.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/LoggedUser.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,21 +1,0 @@
-package com.wediscussmovies.project;
-
-import com.wediscussmovies.project.model.User;
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-
-public class LoggedUser {
-
- static public User getLoggedUser(){
-
- Authentication auth = SecurityContextHolder.getContext().getAuthentication();
- if (!(auth instanceof AnonymousAuthenticationToken)) {
- UserDetails userDetails = (UserDetails) auth.getPrincipal();
- return (User) userDetails;
- }
- return null;
- }
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/WeDiscussMoviesApplication.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/WeDiscussMoviesApplication.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,23 +1,0 @@
-package com.wediscussmovies.project;
-
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-@SpringBootApplication
-public class WeDiscussMoviesApplication {
-
- public static void main(String[] args) {
-
- SpringApplication.run(WeDiscussMoviesApplication.class, args);
- }
- @Bean
- PasswordEncoder getPasswordEncoder(){
- return new BCryptPasswordEncoder(10);
- }
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/ajaxmodels/Grade.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/ajaxmodels/Grade.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,14 +1,0 @@
-package com.wediscussmovies.project.ajaxmodels;
-
-import lombok.Data;
-
-@Data
-public class Grade {
- private Integer rating;
- private String reason;
-
- public Grade(String rating, String reason) {
- this.rating = Integer.parseInt(rating);
- this.reason = reason;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/configuration/CustomUsernamePasswordAuthenticationProvider.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/configuration/CustomUsernamePasswordAuthenticationProvider.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,48 +1,0 @@
-package com.wediscussmovies.project.configuration;
-
-import com.wediscussmovies.project.service.UserService;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-
-import javax.naming.AuthenticationException;
-
-@Component
-public class CustomUsernamePasswordAuthenticationProvider implements AuthenticationProvider {
-
- private final UserService userService;
- private final PasswordEncoder passwordEncoder;
-
- public CustomUsernamePasswordAuthenticationProvider(UserService userService, PasswordEncoder passwordEncoder) {
- this.userService = userService;
- this.passwordEncoder = passwordEncoder;
- }
-
- @Override
- public Authentication authenticate(Authentication authentication){
- String username = authentication.getName();
- String password = authentication.getCredentials().toString();
-
- if ("".equals(username) || "".equals(password)) {
- throw new BadCredentialsException("Invalid Credentials");
- }
-
- UserDetails userDetails = this.userService.loadUserByUsername(username);
-
- if (!passwordEncoder.matches(password, userDetails.getPassword())) {
- throw new BadCredentialsException("Password is incorrect!");
- }
- return new UsernamePasswordAuthenticationToken(userDetails, userDetails.getPassword(), userDetails.getAuthorities());
-
- }
-
- @Override
- public boolean supports(Class aClass) {
- return aClass.equals(UsernamePasswordAuthenticationToken.class);
- }
-}
-
Index: urces/src/main/java/com/wediscussmovies/project/configuration/SecurityConfig.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/configuration/SecurityConfig.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,54 +1,0 @@
-package com.wediscussmovies.project.configuration;
-
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
- private final CustomUsernamePasswordAuthenticationProvider authenticationProvider;
-
- public SecurityConfig(CustomUsernamePasswordAuthenticationProvider authenticationProvider) {
- this.authenticationProvider = authenticationProvider;
- }
-
- @Override
- public void configure(WebSecurity web) throws Exception {
- web.ignoring().antMatchers("/*.jpg");
- web.ignoring().antMatchers("/*.png");
- web.ignoring().antMatchers("/*.css");
- web.ignoring().antMatchers("/*.js");
- }
-
- @Override
- public void configure(HttpSecurity http) throws Exception {
- // TODO: If you are implementing the security requirements, remove this following line
- http.csrf().disable()
- .authorizeRequests()
- .antMatchers("/movies","/movies/**/","/actors","/persons/**/","/directors","/discussions","/profiles/**","/discussions/**/","/discussions/all/**/","/replies","/register","/genres", "/css/**","/img/**", "/js/**").permitAll()
- .anyRequest()
- .authenticated()
- .and()
- .formLogin()
- .loginPage("/login")
- .permitAll()
- .failureUrl("/login?error=BadCredentials")
- .defaultSuccessUrl("/movies", true)
- .and()
- .logout()
- .logoutUrl("/logout")
- .clearAuthentication(true)
- .invalidateHttpSession(true)
- .deleteCookies("JSESSIONID")
- .logoutSuccessUrl("/movies");
-
- }
-
- @Override
- protected void configure(AuthenticationManagerBuilder auth) throws Exception {
- auth.authenticationProvider(authenticationProvider);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/Discussion.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/Discussion.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,77 +1,0 @@
-package com.wediscussmovies.project.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-
-import javax.persistence.*;
-import java.time.LocalDate;
-import java.util.Objects;
-
-@Entity
-@Table(name = "discussions", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class Discussion {
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Id
- @Column(name = "discussion_id")
- private int discussionId;
- @Basic
- @Column(name = "type")
- private Character type;
- @Basic
- @Column(name = "text")
- private String text;
- @Basic
- @Column(name = "title")
- private String title;
- @Basic
- @Column(name = "date")
- private LocalDate date;
-
-
-
-
-
- @ManyToOne
- @JoinColumn(name = "movie_id")
- private Movie movie;
-
- @ManyToOne
- @JoinColumn(name = "user_id")
- private User user;
-
- @ManyToOne
- @JoinColumn(name = "person_id")
- private Person person;
-
- @Transient
- private long likes;
-
- public Discussion(Character type, String text, String title, LocalDate date, User user) {
- this.type = type;
- this.text = text;
- this.title = title;
- this.date = date;
- this.user = user;
- }
-
-
-
- public Discussion() {
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Discussion that = (Discussion) o;
- return discussionId == that.discussionId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(discussionId);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/Genre.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/Genre.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,45 +1,0 @@
-package com.wediscussmovies.project.model;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Objects;
-
-@Entity
-@Table(name = "genres", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class Genre {
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Id
- @Column(name = "genre_id")
- private int genreId;
- @Basic
- @Column(name = "genre_type")
- private String genreType;
-
- public Genre() {
-
- }
-
- public Genre(int genreId, String genreType) {
- this.genreId = genreId;
- this.genreType = genreType;
- }
-
- public Genre(String genreType) {
- this.genreType = genreType;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Genre genre = (Genre) o;
- return genreId == genre.genreId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(genreId);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/Movie.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/Movie.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,110 +1,0 @@
-package com.wediscussmovies.project.model;
-
-import com.wediscussmovies.project.model.relation.MovieLikes;
-import com.wediscussmovies.project.model.relation.MovieActors;
-import com.wediscussmovies.project.model.relation.MovieGenres;
-import com.wediscussmovies.project.model.relation.MovieRates;
-import lombok.Data;
-import org.hibernate.annotations.Fetch;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.sql.Date;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Objects;
-
-@Entity
-@Table(name = "movies", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class Movie {
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Id
- @Column(name = "movie_id")
- private int movieId;
- @Basic
- @Column(name = "title")
- private String title;
- @Basic
- @Column(name = "description")
- private String description;
- @Basic
- @Column(name = "image_url")
- private String imageUrl;
- @Basic
- @Column(name = "airing_date")
- private Date airingDate;
- @Basic
- @Column(name = "imdb_rating")
- private Double imdbRating;
-
- @OneToMany(mappedBy = "movie", fetch = FetchType.LAZY)
- private Collection actors;
- @OneToMany(mappedBy = "movie", fetch = FetchType.LAZY)
- private Collection genres;
- @OneToMany(mappedBy = "movie")
- private Collection likes;
- @OneToMany(mappedBy = "movie")
- private Collection rates;
-
- @ManyToOne
- @JoinColumn(name = "director_id")
- private Person director;
-
- public Movie() {
-
- }
-
- public Movie(String title, String description, String imageUrl, Date airingDate,
- Double imdbRating, Person director) {
- this.title = title;
- this.description = description;
- this.imageUrl = imageUrl;
- this.airingDate = airingDate;
- this.imdbRating = imdbRating;
- this.director = director;
-
- }
-
- public Movie(int movieId, String title, Double imdbRating, String imageUrl) {
- this.movieId = movieId;
- this.title = title;
- this.imdbRating = imdbRating;
- this.imageUrl = imageUrl;
- }
-
- public String getDateFormatted(){
- String dob = airingDate.toString();
- String [] parts = dob.split("-");
- return parts[2]+"/"+parts[1]+"/"+parts[0];
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Movie movie = (Movie) o;
- return movieId == movie.movieId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(movieId);
- }
-
- public static Comparator comparatorTitle = Comparator.comparing(Movie::getTitle);
-
-
- public String getShortTitle(){
- int to = 20;
- if (title.length() < to)
- to = title.length();
- if(to<20)
- return title;
- return title.substring(0, to) + "...";
- }
-
-
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/PasswordEncoder.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/PasswordEncoder.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,36 +1,0 @@
-package com.wediscussmovies.project.model;
-
-
-import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public class PasswordEncoder {
- public static byte[] getSHA(String input) throws NoSuchAlgorithmException
- {
- MessageDigest md = MessageDigest.getInstance("SHA-512");
-
- return md.digest(input.getBytes(StandardCharsets.UTF_8));
- }
-
- public static String toHexString(byte[] hash)
- {
- BigInteger number = new BigInteger(1, hash);
-
- StringBuilder hexString = new StringBuilder(number.toString(16));
-
- while (hexString.length() < 32)
- {
- hexString.insert(0, '0');
- }
-
- return hexString.toString();
- }
-
- public static String getEncodedPasswordString(String password) throws NoSuchAlgorithmException {
- return toHexString(getSHA(password));
- }
-
-}
-
Index: urces/src/main/java/com/wediscussmovies/project/model/Person.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/Person.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,103 +1,0 @@
-package com.wediscussmovies.project.model;
-
-import com.wediscussmovies.project.model.relation.MovieActors;
-import com.wediscussmovies.project.model.relation.PersonRates;
-import lombok.Data;
-
-import javax.persistence.*;
-import javax.swing.text.DateFormatter;
-import java.io.Serializable;
-import java.sql.Date;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.Collection;
-
-@Entity
-@Table(name = "persons", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class Person {
-
- /*
- ni fale tabela za person koj zanrovi gi ima - ako e potrebno
- */
-
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Id
- @Column(name = "person_id")
- private int personId;
- @Basic
- @Column(name = "name")
- private String name;
- @Basic
- @Column(name = "surname")
- private String surname;
- @Basic
- @Column(name = "type")
- private Character type;
- @Basic
- @Column(name = "date_of_birth")
- private Date dateOfBirth;
- @Basic
- @Column(name = "image_url")
- private String imageUrl;
- @Basic
- @Column(name = "description")
- private String description;
- @OneToMany(mappedBy = "person")
- private Collection discussions;
- @OneToMany(mappedBy = "person")
- private Collection movieActors;
- @OneToMany(mappedBy = "director")
- private Collection movies;
- @OneToMany(mappedBy = "person")
- private Collection personRates;
-
-
-
- public Person() {
-
- }
-
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Person that = (Person) o;
-
- return personId == that.getPersonId();
- }
-
- @Override
- public int hashCode() {
-
- return personId * 31;
- }
-
-
- public String getDateFormatted(){
- String dob = dateOfBirth.toString();
- String [] parts = dob.split("-");
- return parts[2]+"/"+parts[1]+"/"+parts[0];
- }
-
-
- public Person(String name, String surname, Character type, Date dateOfBirth, String imageUrl, String description) {
- this.name = name;
- this.surname = surname;
- this.type = type;
- this.dateOfBirth = dateOfBirth;
- this.imageUrl = imageUrl;
- this.description = description;
- }
-
- public boolean hasGradeFromUser(User user){
- for(PersonRates p: personRates){
- if(p.getUser().getUserId() == user.getUserId())
- return true;
- }
- return false;
- }
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/Reply.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/Reply.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,57 +1,0 @@
-package com.wediscussmovies.project.model;
-
-import com.wediscussmovies.project.model.primarykeys.ReplyPK;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.sql.Date;
-import java.util.Objects;
-
-@Entity
-@Table(name = "replies", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-@IdClass(ReplyPK.class)
-public class Reply implements Serializable {
-
- @Column(name = "discussion_id")
- @Id
- private int discussionId;
-
- @Column(name = "reply_id")
- @Id
- private int replyId;
-
- @Basic
- @Column(name = "text")
- private String text;
-
- @Basic
- @Column(name = "date")
- private Date date;
-
-
-
- @ManyToOne
- @MapsId("discussion_id")
- @JoinColumn(name = "discussion_id")
- private Discussion discussion;
-
-
- @ManyToOne
- @JoinColumn(name = "user_id")
- private User user;
-
- public Reply() {
- }
-
- public Reply(Discussion discussion, String text, Date date, User user) {
- this.discussion = discussion;
- this.discussionId = discussion.getDiscussionId();
- this.text = text;
- this.date = date;
- this.user = user;
- }
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/User.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/User.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,105 +1,0 @@
-package com.wediscussmovies.project.model;
-
-import com.wediscussmovies.project.model.relation.MovieLikes;
-import com.wediscussmovies.project.model.relation.UserGenres;
-import com.wediscussmovies.project.model.relation.MovieRates;
-import com.wediscussmovies.project.model.relation.PersonRates;
-import lombok.Data;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Objects;
-
-@Entity
-@Table(name = "users", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class User implements UserDetails {
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- @Id
- @Column(name = "user_id")
- private int userId;
- @Basic
- @Column(name = "username")
- private String username;
- @Basic
- @Column(name = "name")
- private String name;
- @Basic
- @Column(name = "surname")
- private String surname;
- @Basic
- @Column(name = "email")
- private String email;
- @Basic
- @Column(name = "password")
- private String password;
- @OneToMany(mappedBy = "user")
- private Collection discussions;
- @OneToMany(mappedBy = "user")
- private Collection movieLikes;
- @OneToMany(mappedBy = "user")
- private Collection movieRates;
- @OneToMany(mappedBy = "user")
- private Collection personRates;
- @OneToMany(mappedBy = "user")
- private Collection replies;
- @OneToMany(mappedBy = "user")
- private Collection userGenres;
-
- public User() {
-
- }
-
-
-
- @Override
- public boolean isAccountNonExpired() {
- return true;
- }
-
- @Override
- public boolean isAccountNonLocked() {
- return true;
- }
-
- @Override
- public boolean isCredentialsNonExpired() {
- return true;
- }
-
- @Override
- public boolean isEnabled() {
- return true;
- }
-
-
- @Override
- public Collection getAuthorities() {
- return new ArrayList<>();
- }
-
- public User( String email,String username , String password, String name,String surname) {
- this.username = username;
- this.name = name;
- this.surname = surname;
- this.email = email;
- this.password = password;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- User user = (User) o;
- return userId == user.userId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(userId);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/enumerations/DiscussionType.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/enumerations/DiscussionType.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,5 +1,0 @@
-package com.wediscussmovies.project.model.enumerations;
-
-public enum DiscussionType {
- M,P
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/enumerations/PersonType.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/enumerations/PersonType.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,5 +1,0 @@
-package com.wediscussmovies.project.model.enumerations;
-
-public enum PersonType {
- A, D
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/DiscussionNotExistException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/DiscussionNotExistException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class DiscussionNotExistException extends RuntimeException{
- public DiscussionNotExistException(Integer id){
- super("Дискусијата со број " + id +" не постои!");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/GenreNotExistException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/GenreNotExistException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class GenreNotExistException extends RuntimeException {
- public GenreNotExistException(Integer id){
- super("Жанрот со дадениот идентификатор " + id + " не постои!");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/InvalidArgumentsException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/InvalidArgumentsException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class InvalidArgumentsException extends RuntimeException{
- public InvalidArgumentsException(){
- super("Невалидна најава!");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/InvalidUserCredentialsException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/InvalidUserCredentialsException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class InvalidUserCredentialsException extends RuntimeException{
- public InvalidUserCredentialsException(String username) {
- super("The user with the username {" + username +"} cannot be authenticated.");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/MovieHasAlreadyDirector.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/MovieHasAlreadyDirector.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,8 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class MovieHasAlreadyDirector extends RuntimeException{
-
- public MovieHasAlreadyDirector(String title,String name, String surname){
- super("За режисер на филмот " + title + " е поставен " + name + " " + surname);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/MovieIdNotFoundException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/MovieIdNotFoundException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class MovieIdNotFoundException extends RuntimeException{
- public MovieIdNotFoundException(Integer id) {
- super("Movie with id {"+id+"} was not found.");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/NotEnoughArgumentsException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/NotEnoughArgumentsException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,4 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class NotEnoughArgumentsException {
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/PasswordsDoNotMatchException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/PasswordsDoNotMatchException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class PasswordsDoNotMatchException extends RuntimeException{
- public PasswordsDoNotMatchException(){
- super("Лозинките не се совпаѓаат!");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/PasswordsDontMatchException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/PasswordsDontMatchException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class PasswordsDontMatchException extends RuntimeException{
- public PasswordsDontMatchException() {
- super("The passwords you provided did not match.");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/PersonNotExistException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/PersonNotExistException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class PersonNotExistException extends RuntimeException{
- public PersonNotExistException(Integer id){
- super("Личност со број " + id + " не постои!");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/ReplyNotExistException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/ReplyNotExistException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,9 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-import com.wediscussmovies.project.model.primarykeys.ReplyPK;
-
-public class ReplyNotExistException extends RuntimeException{
- public ReplyNotExistException(ReplyPK id){
- super("Репликата со број " + id + " не постои!");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/UserNotExistException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/UserNotExistException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class UserNotExistException extends RuntimeException{
- public UserNotExistException(String username){
- super("Корисник со корисничко име " + username + " не постои!");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/UserWithEmailAlreadyExists.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/UserWithEmailAlreadyExists.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class UserWithEmailAlreadyExists extends RuntimeException{
- public UserWithEmailAlreadyExists(String email) {
- super("User with the email {" + email +"} is already registered");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/UserWithUsernameAlreadyExists.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/UserWithUsernameAlreadyExists.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class UserWithUsernameAlreadyExists extends RuntimeException{
- public UserWithUsernameAlreadyExists(String username) {
- super("User with the username " + username + " is already registered");
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/exception/UsernameAlreadyExistsException.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/exception/UsernameAlreadyExistsException.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.model.exception;
-
-public class UsernameAlreadyExistsException extends RuntimeException{
- public UsernameAlreadyExistsException(String username){
- super("Корисничкото име е зафатено " + username);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/DiscussionLikesPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/DiscussionLikesPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,40 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import java.io.Serializable;
-import java.util.Objects;
-
-@Embeddable
-@Data
-public class DiscussionLikesPK implements Serializable {
- @Column(name = "discussion_id")
- private int discussionId;
-
- @Column(name = "user_id")
- private int userId;
-
- public DiscussionLikesPK(int discussionId, int userId) {
- this.discussionId = discussionId;
- this.userId = userId;
- }
-
- public DiscussionLikesPK() {
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- DiscussionLikesPK that = (DiscussionLikesPK) o;
- return discussionId == that.discussionId && userId == that.userId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(discussionId, userId);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/GenreLikesPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/GenreLikesPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,43 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import java.io.Serializable;
-
-@Embeddable
-@Data
-public class GenreLikesPK implements Serializable {
-
- @Column(name = "genre_id")
- private int genreId;
-
- @Column(name = "user_id")
- private int userId;
-
- public GenreLikesPK() {
- }
-
- public GenreLikesPK(int genreId, int userId) {
- this.genreId = genreId;
- this.userId = userId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- GenreLikesPK that = (GenreLikesPK) o;
-
- return userId == that.userId && genreId == that.genreId;
- }
-
- @Override
- public int hashCode() {
- int result = genreId;
- result = 31 * result + userId;
- return result;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieActorsPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieActorsPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,43 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-
-@Data
-@Embeddable
-public class MovieActorsPK implements Serializable {
-
- @Column(name = "movie_id")
- private int movieId;
-
- @Column(name = "actor_id")
- private int actorId;
-
- public MovieActorsPK(int movieId, int actorId) {
- this.movieId = movieId;
- this.actorId = actorId;
- }
-
- public MovieActorsPK() {
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- MovieActorsPK that = (MovieActorsPK) o;
-
- return actorId == that.actorId && movieId == that.movieId;
- }
-
- @Override
- public int hashCode() {
- int result = movieId;
- result = 31 * result + actorId;
- return result;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieGenresPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieGenresPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,44 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Id;
-import java.io.Serializable;
-
-@Embeddable
-@Data
-public class MovieGenresPK implements Serializable {
-
- @Column(name = "movie_id")
- private int movieId;
-
- @Column(name = "genre_id")
- private int genreId;
-
- public MovieGenresPK(int movieId, int genreId) {
- this.movieId = movieId;
- this.genreId = genreId;
- }
-
- public MovieGenresPK() {
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- MovieGenresPK that = (MovieGenresPK) o;
-
- return genreId == that.genreId && movieId == that.movieId;
- }
-
- @Override
- public int hashCode() {
- int result = movieId;
- result = 31 * result + genreId;
- return result;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieLikesPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieLikesPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,44 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Id;
-import java.io.Serializable;
-
-@Embeddable
-@Data
-public class MovieLikesPK implements Serializable {
-
- @Column(name = "movie_id")
- private int movieId;
-
- @Column(name = "user_id")
- private int userId;
-
- public MovieLikesPK() {
- }
-
- public MovieLikesPK(int movieId, int userId) {
- this.movieId = movieId;
- this.userId = userId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- MovieLikesPK that = (MovieLikesPK) o;
-
- return userId == that.userId && movieId == that.movieId;
- }
-
- @Override
- public int hashCode() {
- int result = movieId;
- result = 31 * result + userId;
- return result;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieRatesPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/MovieRatesPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,47 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Id;
-import java.io.Serializable;
-
-@Embeddable
-@Data
-public class MovieRatesPK implements Serializable {
-
- @Column(name = "movie_id")
- private int movieId;
-
- @Column(name = "user_id")
- private int userId;
-
-
- public MovieRatesPK() {
- }
-
- public MovieRatesPK(int movieId, int userId) {
- this.movieId = movieId;
- this.userId = userId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- MovieRatesPK that = (MovieRatesPK) o;
-
-
-
- return movieId == that.movieId && userId == that.userId;
- }
-
- @Override
- public int hashCode() {
- int result = movieId;
- result = 31 * result + userId;
- return result;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/PersonRatesPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/PersonRatesPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,45 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Id;
-import java.io.Serializable;
-
-@Embeddable
-@Data
-public class PersonRatesPK implements Serializable {
-
- @Column(name = "person_id")
- private int personId;
-
- @Column(name = "user_id")
- private int userId;
-
- public PersonRatesPK() {
- }
-
- public PersonRatesPK(int personId, int userId) {
- this.personId = personId;
- this.userId = userId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- PersonRatesPK that = (PersonRatesPK) o;
-
-
- return personId == that.personId && userId == that.userId;
- }
-
- @Override
- public int hashCode() {
- int result = personId;
- result = 31 * result + userId;
- return result;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/ReplyPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/ReplyPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,45 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Objects;
-
-@Data
-public class ReplyPK implements Serializable {
-
- @Column(name = "discussion_id")
- private int discussionId;
-
- @Column(name = "reply_id")
- @GeneratedValue(strategy = GenerationType.IDENTITY)
- private int replyId;
-
- public ReplyPK(int discussionId) {
- this.discussionId = discussionId;
- }
-
- public ReplyPK(int discussionId, int replyId) {
- this.discussionId = discussionId;
- this.replyId = replyId;
- }
-
- public ReplyPK() {
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- ReplyPK replyPK = (ReplyPK) o;
- return discussionId == replyPK.discussionId && replyId == replyPK.replyId;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(discussionId, replyId);
- }
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/primarykeys/UserGenresPK.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/primarykeys/UserGenresPK.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,44 +1,0 @@
-package com.wediscussmovies.project.model.primarykeys;
-
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.Id;
-import java.io.Serializable;
-
-@Data
-@Embeddable
-public class UserGenresPK implements Serializable {
-
- @Column(name = "user_id")
- private int userId;
-
- @Column(name = "genre_id")
- private int genreId;
-
- public UserGenresPK() {
- }
-
- public UserGenresPK(int userId, int genreId) {
- this.userId = userId;
- this.genreId = genreId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- UserGenresPK that = (UserGenresPK) o;
-
- return userId == that.userId && genreId == that.genreId;
- }
-
- @Override
- public int hashCode() {
- int result = userId;
- result = 31 * result + genreId;
- return result;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/relation/DiscussionLikes.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/relation/DiscussionLikes.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,39 +1,0 @@
-package com.wediscussmovies.project.model.relation;
-
-
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.DiscussionLikesPK;
-import com.wediscussmovies.project.model.primarykeys.MovieLikesPK;
-import lombok.Data;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "discussion_likes", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class DiscussionLikes {
- @EmbeddedId
- private DiscussionLikesPK id;
-
- @ManyToOne
- @MapsId("discussion_id")
- @JoinColumn(name = "discussion_id")
- private Discussion discussion;
-
-
- @ManyToOne
- @MapsId("user_id")
- @JoinColumn(name = "user_id")
- private User user;
-
- public DiscussionLikes(Discussion discussion, User user) {
- this.id = new DiscussionLikesPK(discussion.getDiscussionId(), user.getUserId());
- this.discussion = discussion;
- this.user = user;
- }
-
- public DiscussionLikes() {
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/relation/MovieActors.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/relation/MovieActors.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,52 +1,0 @@
-package com.wediscussmovies.project.model.relation;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.primarykeys.MovieActorsPK;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Objects;
-
-@Entity
-@Table(name = "movie_actors", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class MovieActors {
-
- @EmbeddedId
- private MovieActorsPK id;
-
-
- @ManyToOne
- @MapsId("movie_id")
- @JoinColumn(name = "movie_id")
- private Movie movie;
-
-
- @ManyToOne
- @MapsId("actor_id")
- @JoinColumn(name = "actor_id")
- private Person person;
-
- public MovieActors(Movie movie, Person person) {
- this.id = new MovieActorsPK(movie.getMovieId(),person.getPersonId());
- this.movie = movie;
- this.person = person;
- }
-
- public MovieActors() {
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- MovieActors that = (MovieActors) o;
- return Objects.equals(id, that.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/relation/MovieGenres.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/relation/MovieGenres.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,41 +1,0 @@
-package com.wediscussmovies.project.model.relation;
-
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.primarykeys.MovieGenresPK;
-import lombok.Data;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "movie_genres", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class MovieGenres {
-
- @EmbeddedId
- private MovieGenresPK id;
-
- @ManyToOne
- @MapsId(value = "genre_id")
- @JoinColumn(name = "genre_id")
- private Genre genre;
-
- @ManyToOne
- @MapsId("movie_id")
- @JoinColumn(name = "movie_id")
- private Movie movie;
-
- public MovieGenres() {
- }
-
- public MovieGenres(Movie movie, Genre genre) {
- this.id = new MovieGenresPK(movie.getMovieId(),genre.getGenreId());
- this.genre = genre;
- this.movie = movie;
- }
-
-
-
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/relation/MovieLikes.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/relation/MovieLikes.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,50 +1,0 @@
-package com.wediscussmovies.project.model.relation;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.MovieLikesPK;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Objects;
-
-@Entity
-@Table(name = "movie_likes", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class MovieLikes {
- @EmbeddedId
- private MovieLikesPK id;
-
- @ManyToOne
- @MapsId("movie_id")
- @JoinColumn(name = "movie_id")
- private Movie movie;
-
-
- @ManyToOne
- @MapsId("user_id")
- @JoinColumn(name = "user_id")
- private User user;
-
- public MovieLikes(Movie movie, User user) {
- this.id = new MovieLikesPK(movie.getMovieId(), user.getUserId());
- this.movie = movie;
- this.user = user;
- }
-
- public MovieLikes() {
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- MovieLikes that = (MovieLikes) o;
- return Objects.equals(id, that.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/relation/MovieRates.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/relation/MovieRates.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,47 +1,0 @@
-package com.wediscussmovies.project.model.relation;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.MovieRatesPK;
-import lombok.Data;
-
-import javax.persistence.*;
-
-@Entity
-@Table(name = "movie_rates", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class MovieRates {
-
- @EmbeddedId
- private MovieRatesPK id;
-
- @Basic
- @Column(name = "reason")
- private String reason;
- @Basic
- @Column(name = "stars_rated")
- private int starsRated;
-
-
- @ManyToOne
- @MapsId("movie_id")
- @JoinColumn(name = "movie_id")
- private Movie movie;
-
-
- @ManyToOne
- @MapsId("user_id")
- @JoinColumn(name = "user_id")
- private User user;
-
- public MovieRates() {
- }
-
- public MovieRates(User user,Movie movie,String reason,Integer starsRated) {
- this.id = new MovieRatesPK(movie.getMovieId(), user.getUserId());
- this.reason = reason;
- this.starsRated = starsRated;
- this.movie = movie;
- this.user = user;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/relation/PersonRates.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/relation/PersonRates.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,62 +1,0 @@
-package com.wediscussmovies.project.model.relation;
-
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.PersonRatesPK;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Objects;
-
-@Entity
-@Table(name = "person_rates", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class PersonRates {
-
- @EmbeddedId
- private PersonRatesPK id;
-
- @Basic
- @Column(name = "reason")
- private String reason;
- @Basic
- @Column(name = "stars_rated")
- private int starsRated;
-
-
- @ManyToOne
- @JoinColumn(name = "person_id")
- @MapsId("person_id")
- private Person person;
-
-
- @ManyToOne
- @JoinColumn(name = "user_id")
- @MapsId("user_id")
- private User user;
-
-
- public PersonRates() {
- }
-
- public PersonRates(User user, Person person, String reason, Integer starsRated) {
- this.id = new PersonRatesPK(person.getPersonId(), user.getUserId());
- this.reason = reason;
- this.starsRated = starsRated;
- this.person = person;
- this.user = user;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- PersonRates that = (PersonRates) o;
- return Objects.equals(id, that.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/model/relation/UserGenres.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/model/relation/UserGenres.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,50 +1,0 @@
-package com.wediscussmovies.project.model.relation;
-
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.UserGenresPK;
-import lombok.Data;
-
-import javax.persistence.*;
-import java.util.Objects;
-
-@Entity
-@Table(name = "user_genres", schema = "project", catalog = "db_202122z_va_prj_wediscussmovies")
-@Data
-public class UserGenres {
-
- @EmbeddedId
- private UserGenresPK id;
-
- @ManyToOne
- @MapsId("genre_id")
- @JoinColumn(name = "genre_id")
- private Genre genre;
-
- @ManyToOne
- @MapsId("user_id")
- @JoinColumn(name = "user_id")
- private User user;
-
- public UserGenres() {
- }
-
- public UserGenres(Genre genre, User user) {
- this.id = new UserGenresPK(user.getUserId(), genre.getGenreId());
- this.genre = genre;
- this.user = user;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- UserGenres that = (UserGenres) o;
- return Objects.equals(id, that.id);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(id);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/querymodels/DiscussionLikesQM.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/querymodels/DiscussionLikesQM.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,34 +1,0 @@
-package com.wediscussmovies.project.querymodels;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.User;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDate;
-import java.util.Date;
-import java.util.Objects;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class DiscussionLikesQM {
-
- private Integer discussionId;
- private Long likes;
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- DiscussionLikesQM that = (DiscussionLikesQM) o;
- return Objects.equals(discussionId, that.discussionId) && Objects.equals(likes, that.likes);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(discussionId, likes);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/querymodels/GenreLikesQM.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/querymodels/GenreLikesQM.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,34 +1,0 @@
-package com.wediscussmovies.project.querymodels;
-
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-public class GenreLikesQM {
- private Integer genreId;
- private String name;
- private Long likes;
-
- //public static Comparator sorter = Comparator.comparing(GenreLikes::getLikes).thenComparing(GenreLikes::getName).reversed();
-
- public GenreLikesQM(Integer genreId, String name, Long likes) {
- this.genreId = genreId;
- this.name = name;
- this.likes = likes;
-
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- GenreLikesQM that = (GenreLikesQM) o;
- return Objects.equals(genreId, that.genreId);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(genreId);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/querymodels/MovieLikesQM.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/querymodels/MovieLikesQM.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,29 +1,0 @@
-package com.wediscussmovies.project.querymodels;
-
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-public class MovieLikesQM {
- private Integer movieId;
- private Long likes;
-
- public MovieLikesQM(Integer movieId, Long likes) {
- this.movieId = movieId;
- this.likes = likes;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- MovieLikesQM that = (MovieLikesQM) o;
- return Objects.equals(movieId, that.movieId) && Objects.equals(likes, that.likes);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(movieId, likes);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/DiscussionLikesRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/DiscussionLikesRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,19 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.DiscussionLikesPK;
-import com.wediscussmovies.project.model.primarykeys.UserGenresPK;
-import com.wediscussmovies.project.model.relation.DiscussionLikes;
-import com.wediscussmovies.project.model.relation.MovieLikes;
-import com.wediscussmovies.project.model.relation.UserGenres;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface DiscussionLikesRepository extends JpaRepository {
- List findAllByUser(User user);
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/DiscussionRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/DiscussionRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,35 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import javax.transaction.Transactional;
-import java.util.List;
-
-@Repository
-public interface DiscussionRepository extends JpaRepository {
- List findAllByTitleLike(String title);
- List findAllByMovie(Movie movie);
- List findAllByPerson (Person person);
-
- @Query(value = "select new com.wediscussmovies.project.querymodels.DiscussionLikesQM(d.discussionId, count (dl.user) ) from Discussion d" +
- " left join DiscussionLikes dl on dl.id.discussionId = d.discussionId" +
- " where :id = d.discussionId" +
- " group by d.discussionId")
- @Transactional
- DiscussionLikesQM findDiscussionWithLikes(@Param("id") Integer discussionId);
-
- @Query(value = "select new com.wediscussmovies.project.querymodels.DiscussionLikesQM (d.discussionId, count(dl.user)) from Discussion d" +
- " left join DiscussionLikes dl on dl.id.discussionId = d.discussionId" +
- " group by d.discussionId"+
- " order by d.discussionId asc")
- @Transactional
- List findAllDiscussionsWithLikes();
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/GenreLikesRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/GenreLikesRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,14 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.UserGenresPK;
-import com.wediscussmovies.project.model.relation.UserGenres;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface GenreLikesRepository extends JpaRepository {
- List findAllByUser(User user);
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/GenreRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/GenreRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,33 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.querymodels.GenreLikesQM;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import javax.transaction.Transactional;
-import java.util.List;
-
-@Repository
-public interface GenreRepository extends JpaRepository {
- List findAllByGenreType(String genre);
-
- @Query(value = "select new com.wediscussmovies.project.querymodels.GenreLikesQM(g.genreId, g.genreType, count(ug.id.userId)) from Genre g" +
- " left join UserGenres ug on ug.id.genreId = g.genreId" +
- " group by g.genreId, g.genreType" +
- " order by count(ug.id.userId) desc, g.genreType asc")
- @Transactional
- List findAllWithLikes();
-
- @Modifying
- @Query(value = "insert into project.user_genres (user_id,genre_id) values(:user_id,:genre_id)",nativeQuery = true)
- @Transactional
- void insertInto(@Param("user_id")Integer userId, @Param("genre_id")Integer genreId);
-
- @Query(value = "select new com.wediscussmovies.project.model.Genre (g.genreId, g.genreType) from Genre g" +
- " ORDER BY g.genreType DESC")
- List findAllSorted();
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/MovieActorsRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/MovieActorsRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,19 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.relation.MovieActors;
-import com.wediscussmovies.project.model.primarykeys.MovieActorsPK;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface MovieActorsRepository extends JpaRepository {
-
- List deleteAllByMovie(Movie movie);
- List findAllByMovie(Movie movie);
- List findAllByPerson(Person person);
- void deleteAllByPerson(Person person);
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/MovieGenresRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/MovieGenresRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,15 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.relation.MovieGenres;
-import com.wediscussmovies.project.model.primarykeys.MovieGenresPK;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface MovieGenresRepository extends JpaRepository {
- List deleteAllByMovie(Movie movie);
- List findAllByMovie(Movie movie);
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/MovieLikesRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/MovieLikesRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,14 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.MovieLikesPK;
-import com.wediscussmovies.project.model.relation.MovieLikes;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface MovieLikesRepository extends JpaRepository {
- List findAllByUser(User user);
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/MovieRatesRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/MovieRatesRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,10 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.primarykeys.MovieRatesPK;
-import com.wediscussmovies.project.model.relation.MovieRates;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface MovieRatesRepository extends JpaRepository {
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/MovieRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/MovieRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,43 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.querymodels.MovieLikesQM;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import javax.transaction.Transactional;
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-public interface MovieRepository extends JpaRepository {
- List findAllByTitleLike(String Title);
- List findAllByDirector(Person director);
- List findAllByDirectorIsNull();
- @Query(value="select m.movieId from Movie m")
- List findAllMovieIds();
-
- @Query(value="select new com.wediscussmovies.project.model.Movie(m.movieId, m.title, m.imdbRating, m.imageUrl) from Movie m" +
- " where m.movieId = :index")
- Optional findBasicById(@Param("index")Integer index);
-
-
- @Query(value = "select new com.wediscussmovies.project.querymodels.MovieLikesQM(m.movieId, count(ml.id.userId)) from Movie m" +
- " left join MovieLikes ml on ml.id.movieId = m.movieId" +
- " group by m.movieId" +
- " order by count(ml.id.userId) desc")
- @Transactional
- List findAllWithLikes();
-
- @Query(value = "select new com.wediscussmovies.project.querymodels.MovieLikesQM(m.movieId, count(ml.id.userId)) from Movie m" +
- " left join MovieLikes ml on ml.id.movieId = m.movieId" +
- " group by m.movieId" +
- " having m.movieId = :id")
- @Transactional
- List findLikesForMovie(@Param("id") Integer movie_id);
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/PersonRatesRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/PersonRatesRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,10 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.primarykeys.PersonRatesPK;
-import com.wediscussmovies.project.model.relation.PersonRates;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PersonRatesRepository extends JpaRepository {
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/PersonRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/PersonRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,16 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.Person;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PersonRepository extends JpaRepository {
- List findAllByType(Character type);
- List findAllByTypeAndNameLike(Character type, String name);
- List findAllByTypeAndSurnameLike(Character type, String surname);
- // Optional findPersonByPersonIdAndType(Integer id, Character type);
- List findAllByTypeAndNameLikeOrSurnameLike(Character type,String name, String surname);
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/ReplyRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/ReplyRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,26 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.Reply;
-import com.wediscussmovies.project.model.primarykeys.ReplyPK;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
-
-import javax.transaction.Transactional;
-import java.sql.Date;
-import java.util.List;
-
-
-@Repository
-public interface ReplyRepository extends JpaRepository {
- List findAllByDiscussion(Discussion discussion);
-
- @Modifying
- @Query(value = "insert into project.replies (text,date,user_id,discussion_id) values(:text,:date,:user_id,:discussion_id)",nativeQuery = true)
- @Transactional
- void insertInto(@Param("text") String text, @Param("date")Date date,
- @Param("user_id")Integer userId,@Param("discussion_id")Integer discussionId);
-}
Index: urces/src/main/java/com/wediscussmovies/project/repository/UserRepository.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/repository/UserRepository.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,12 +1,0 @@
-package com.wediscussmovies.project.repository;
-
-import com.wediscussmovies.project.model.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.Optional;
-
-@Repository
-public interface UserRepository extends JpaRepository {
- Optional findByUsername(String username);
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/DiscussionService.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/DiscussionService.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,26 +1,0 @@
-package com.wediscussmovies.project.service;
-
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
-
-import java.util.List;
-
-public interface DiscussionService {
- List listAll();
- List listAllByTitle(String title);
- Discussion findById(Integer id);
- void save(Character type,Integer id, String title, String text, User user);
- void edit(Integer discussionId,Character type,Integer id, String title, String text);
- void deleteById(Integer discussionId);
- void likeDiscussion(Integer discussionId,Integer userId);
- void unlikeDiscussion(Integer discussionId,Integer userId);
- List findAllForPersonOrMovie(Integer id,Character type);
-
- List findLikedDiscussionsByUser(User user);
-
- DiscussionLikesQM findLikesForDiscussionWithId(Integer discussionId);
-
- List findLikesForAllDiscussions();
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/GenreService.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/GenreService.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,19 +1,0 @@
-package com.wediscussmovies.project.service;
-
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.querymodels.GenreLikesQM;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public interface GenreService {
- List findAll();
- Genre findById(Integer id);
- List findAllByType(String genre);
- Genre save(String genreName);
- List findAllWithLikes();
- void likeGenre(Integer genreId,Integer userId);
- void unlikeGenre(Integer genreId,Integer userId);
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/MovieService.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/MovieService.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,41 +1,0 @@
-package com.wediscussmovies.project.service;
-
-import com.wediscussmovies.project.ajaxmodels.Grade;
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.querymodels.MovieLikesQM;
-import org.springframework.data.jpa.repository.Query;
-
-import java.sql.Date;
-import java.util.List;
-
-public interface MovieService {
- List listAll();
- List listAllByType(Character type);
- List listAllWithoutDirector();
- List searchByTitle(String title);
- Movie findById(Integer id);
- Movie findBasicById(Integer id);
- List listAllIds();
- Movie save(String title, String description, String imageUrl, Date airingDate,Double rating,
- Integer directorId,List actorIds,List genreIds);
-
- Movie edit(Integer movieId,String title, String description, String imageUrl, Date airingDate,Double rating,
- Integer directorId,List actorIds, List genreIds);
-
- List findAllActorsForMovie(Movie movie);
- List findAllGenresForMovie(Movie movie);
-
- void likeMovie(Integer movieId, Integer userId);
- void unlikeMovie(Integer movieId,Integer userId);
-
- List findLikedMoviesByUser(User user);
-
- void deleteById(Integer id);
-
- void addGradeMovie(Integer movieId, User user, Grade grade);
-
- MovieLikesQM findLikesForMovieById(int movieId);
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/PersonService.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/PersonService.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,31 +1,0 @@
-package com.wediscussmovies.project.service;
-
-import com.wediscussmovies.project.ajaxmodels.Grade;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.relation.MovieLikes;
-
-import java.sql.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public interface PersonService {
- List findAll();
- List findAllDirectors();
- List findAllActors();
- Person findById(Integer person_id);
-
- Person save(String name, String surname, Character type,
- Date birthDate, String image_url, String description, List movieIds);
-
- Person edit(Integer personId, String name, String surname, Character type,
- Date birthDate, String image_url, String description, List movieIds);
-
- List findPersonsByNameOrSurname(Character type,String searchQuery);
-
- List findAllMoviesByPerson(Person person);
-
- void deleteById(Integer id);
- void addGradePerson(Integer personId, User user, Grade grade);
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/ReplyService.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/ReplyService.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,21 +1,0 @@
-package com.wediscussmovies.project.service;
-
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.Reply;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.ReplyPK;
-
-import java.util.List;
-
-public interface ReplyService {
- Reply edit(Integer replyId, Integer discussionId, String text);
- void delete(Integer discussionId,Integer replyId);
- Reply findById(Integer discussionId, Integer replyId);
- void save(Integer discussionId, String text, User user);
- void likeReply(Integer replyId,Integer userId);
- void unlikeReply(Integer replyId,Integer userId);
- List findAllByDiscussion(Discussion discussion);
-
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/UserService.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/UserService.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,14 +1,0 @@
-package com.wediscussmovies.project.service;
-
-import com.wediscussmovies.project.model.User;
-import org.springframework.security.core.userdetails.UserDetailsService;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Optional;
-
-public interface UserService extends UserDetailsService {
- User findByUsername(String username);
- User register(String email, String username, String password, String confirmPassword, String name, String surname);
-
- User findById(Integer id);
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,179 +1,0 @@
-package com.wediscussmovies.project.service.impl;
-
-import com.wediscussmovies.project.model.exception.DiscussionNotExistException;
-import com.wediscussmovies.project.model.exception.MovieIdNotFoundException;
-import com.wediscussmovies.project.model.exception.PersonNotExistException;
-import com.wediscussmovies.project.model.exception.UserNotExistException;
-import com.wediscussmovies.project.model.primarykeys.DiscussionLikesPK;
-import com.wediscussmovies.project.model.relation.DiscussionLikes;
-import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
-import com.wediscussmovies.project.repository.*;
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.service.DiscussionService;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-@Service
-public class DiscussionServiceImpl implements DiscussionService {
-
- private final DiscussionRepository discussionRepository;
- private final DiscussionLikesRepository discussionLikesRepository;
- private final UserRepository userRepository;
-
- private final MovieRepository movieRepository;
- private final PersonRepository personRepository;
-
- public DiscussionServiceImpl(DiscussionRepository discussionRepository, DiscussionLikesRepository discussionLikesRepository, UserRepository userRepository,
- MovieRepository movieRepository, PersonRepository personRepository) {
- this.discussionRepository = discussionRepository;
- this.discussionLikesRepository = discussionLikesRepository;
- this.userRepository = userRepository;
- this.movieRepository = movieRepository;
- this.personRepository = personRepository;
- }
-
-
-
-
- @Override
- public List listAll() {
- List discussions = this.discussionRepository.findAll();
- List discussionLikes = this.discussionRepository.findAllDiscussionsWithLikes();
- for (int i = 0; i < discussionLikes.size(); i++){
- discussions.get(i).setLikes(discussionLikes.get(i).getLikes());
- }
- return discussions;
- }
-
- @Override
- public void save(Character type,Integer id,String title, String text,User user) {
- LocalDate date = LocalDate.now();
- Discussion discussion;
-
- if (type.equals('M')) {
- discussion = new Discussion('M',text,title,date,user);
- this.addMovieForDiscussion(id,discussion);
- }
- else{
- discussion = new Discussion('P',text,title,date,user);
- this.addPersonForDiscussion(id,discussion);
- }
-
-
-
- discussionRepository.save(discussion);
- }
-
- @Override
- public void edit(Integer discussionId, Character type, Integer id, String title, String text) {
- Discussion discussion = this.findById(discussionId);
-
- discussion.setText(text);
- discussion.setTitle(title);
- discussion.setType(type);
- discussion.setMovie(null);
- discussion.setPerson(null);
-
- if (type.equals('M')) {
- this.addMovieForDiscussion(id,discussion);
- }
- else{
- this.addPersonForDiscussion(id,discussion);
- }
- this.discussionRepository.save(discussion);
-
- }
-
- @Override
- public void deleteById(Integer discussionId) {
- this.discussionRepository.deleteById(discussionId);
- }
-
- @Override
- public void likeDiscussion(Integer discussionId, Integer userId) {
- Discussion discussion = discussionRepository.findById(discussionId).orElseThrow(() -> new DiscussionNotExistException(discussionId));
- User user = userRepository.findById(userId).orElseThrow(() -> new UserNotExistException(userId.toString()));
- this.discussionLikesRepository.save(new DiscussionLikes(discussion, user));
- }
-
- @Override
- public List findLikedDiscussionsByUser(User user) {
- List likes = discussionLikesRepository.findAllByUser(user);
- List discussions = new ArrayList<>();
- for(DiscussionLikes dl: likes){
- discussions.add(dl.getDiscussion());
- }
- return discussions;
- }
-
- @Override
- public void unlikeDiscussion(Integer discussionId, Integer userId) {
- DiscussionLikesPK pk = new DiscussionLikesPK(discussionId, userId);
- this.discussionLikesRepository.deleteById(pk);
- }
-
- @Override
- public DiscussionLikesQM findLikesForDiscussionWithId(Integer discussionId) {
-// return discussionRepository.findAllWithLikes().stream().filter(d -> d.getDiscussionId().equals(discussionId)).findFirst().get();
- return this.discussionRepository.findDiscussionWithLikes(discussionId);
-
- }
-
- @Override
- public List findLikesForAllDiscussions() {
- // return this.discussionRepository.findAllDiscussionsWithLikes();
- return this.discussionRepository.findAllDiscussionsWithLikes();
- }
-
-
- @Override
- public List findAllForPersonOrMovie(Integer id,Character type) {
- if (type.equals('M'))
- {
- Movie movie = this.findMovieById(id);
- return this.discussionRepository.findAllByMovie(movie);
- }
- Person person = this.findPersonById(id);
- return this.discussionRepository.findAllByPerson(person);
-
- }
-
- @Override
- public Discussion findById(Integer id) {
- Discussion disc = discussionRepository.findById(id).orElseThrow(() -> new DiscussionNotExistException(id));
- disc.setLikes(this.discussionRepository.findDiscussionWithLikes(id).getLikes());
- return disc;
- }
-
- @Override
- public List listAllByTitle(String title) {
- if(title == null || title.isEmpty())
- return this.listAll();
- return discussionRepository.findAllByTitleLike("%"+title+"%");
- }
- private void addMovieForDiscussion(Integer id,Discussion discussion){
- Movie movie = findMovieById(id);
- discussion.setMovie(movie);
-
- }
-
- private void addPersonForDiscussion(Integer id, Discussion discussion){
- Person person = findPersonById(id);
- discussion.setPerson(person);
-
- }
- private Movie findMovieById(Integer id){
- return this.movieRepository.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id));
- }
- private Person findPersonById(Integer id){
- return this.personRepository.findById(id).orElseThrow(() -> new PersonNotExistException(id));
-
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,71 +1,0 @@
-package com.wediscussmovies.project.service.impl;
-
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.exception.GenreNotExistException;
-import com.wediscussmovies.project.model.exception.UserNotExistException;
-import com.wediscussmovies.project.model.primarykeys.UserGenresPK;
-import com.wediscussmovies.project.model.relation.UserGenres;
-import com.wediscussmovies.project.querymodels.GenreLikesQM;
-import com.wediscussmovies.project.repository.GenreLikesRepository;
-import com.wediscussmovies.project.repository.GenreRepository;
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.repository.UserRepository;
-import com.wediscussmovies.project.service.GenreService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class GenreServiceImpl implements GenreService {
- private final GenreRepository genreRepository;
- private final UserRepository userRepository;
- private final GenreLikesRepository genreLikesRepository;
-
-
- public GenreServiceImpl(GenreRepository genreRepository, UserRepository userRepository, GenreLikesRepository genreLikesRepository) {
- this.genreRepository = genreRepository;
- this.userRepository = userRepository;
- this.genreLikesRepository = genreLikesRepository;
- }
-
- @Override
- public Genre findById(Integer id) {
- return this.genreRepository.findById(id).orElseThrow(() -> new GenreNotExistException(id));
- }
-
- @Override
- public List findAllByType(String genre) {
- return this.genreRepository.findAllByGenreType(genre);
- }
-
- @Override
- public Genre save(String genreName) {
- Genre genre = new Genre(genreName);
- return this.genreRepository.save(genre);
- }
-
- @Override
- public List findAllWithLikes() {
- // List genreLikesList = this.genreRepository.findAllWithLikes();
- // genreLikesList.sort(GenreLikes.sorter);
- return this.genreRepository.findAllWithLikes();
- }
-
- @Override
- public List findAll() {
- return this.genreRepository.findAllSorted();
- }
-
- @Override
- public void likeGenre(Integer genreId, Integer userId) {
- User user = this.userRepository.findById(userId).orElseThrow(() -> new UserNotExistException(userId.toString()));
- Genre genre = this.genreRepository.findById(genreId).orElseThrow(() -> new GenreNotExistException(genreId));
- this.genreLikesRepository.save(new UserGenres(genre, user));
- }
-
- @Override
- public void unlikeGenre(Integer genreId, Integer userId) {
- UserGenresPK movieLikesPK = new UserGenresPK(userId, genreId);
- this.genreLikesRepository.deleteById(movieLikesPK);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,229 +1,0 @@
-package com.wediscussmovies.project.service.impl;
-
-
-import com.wediscussmovies.project.ajaxmodels.Grade;
-import com.wediscussmovies.project.model.*;
-import com.wediscussmovies.project.model.exception.GenreNotExistException;
-import com.wediscussmovies.project.model.exception.PersonNotExistException;
-import com.wediscussmovies.project.model.exception.UserNotExistException;
-import com.wediscussmovies.project.model.primarykeys.MovieLikesPK;
-import com.wediscussmovies.project.model.primarykeys.MovieRatesPK;
-import com.wediscussmovies.project.model.relation.MovieActors;
-import com.wediscussmovies.project.model.relation.MovieGenres;
-import com.wediscussmovies.project.model.relation.MovieLikes;
-import com.wediscussmovies.project.model.relation.MovieRates;
-import com.wediscussmovies.project.querymodels.MovieLikesQM;
-import com.wediscussmovies.project.repository.*;
-import com.wediscussmovies.project.model.exception.MovieIdNotFoundException;
-import com.wediscussmovies.project.service.MovieService;
-import org.springframework.stereotype.Service;
-
-import javax.swing.text.html.Option;
-import javax.transaction.Transactional;
-import java.sql.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Service
-public class MovieServiceImpl implements MovieService {
-
- private final MovieRepository movieRepository;
- private final PersonRepository personRepository;
- private final GenreRepository genreRepository;
- private final MovieActorsRepository movieActorsRepository;
- private final MovieGenresRepository movieGenresRepository;
- private final UserRepository userRepository;
- private final MovieLikesRepository movieLikesRepository;
- private final MovieRatesRepository movieRatesRepository;
-
- public MovieServiceImpl(MovieRepository movieRepository, PersonRepository personRepository,
- GenreRepository genreRepository, MovieActorsRepository movieActorsRepository,
- MovieGenresRepository movieGenresRepository,
- UserRepository userRepository, MovieLikesRepository movieLikesRepository,
- MovieRatesRepository movieRatesRepository) {
-
- this.movieRepository = movieRepository;
- this.personRepository = personRepository;
- this.genreRepository = genreRepository;
- this.movieActorsRepository = movieActorsRepository;
- this.movieGenresRepository = movieGenresRepository;
- this.userRepository = userRepository;
- this.movieLikesRepository = movieLikesRepository;
- this.movieRatesRepository = movieRatesRepository;
- }
-
- @Override
- public List listAll() {
- return this.movieRepository.findAll();
- }
-
- @Override
- public List listAllByType(Character type) {
- if (type.equals('A'))
- return this.listAll();
- return this.listAllWithoutDirector();
- }
-
- @Override
- public List listAllWithoutDirector() {
- return this.movieRepository.findAllByDirectorIsNull();
- }
-
- @Override
- public Movie findById(Integer id) {
- return this.movieRepository.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id));
- }
-
- @Override
- public Movie findBasicById(Integer id) {
- return this.movieRepository.findBasicById(id).orElseThrow(() -> new MovieIdNotFoundException(id));
- }
-
- @Override
- public MovieLikesQM findLikesForMovieById(int movieId) {
- return this.movieRepository.findLikesForMovie(movieId).get(0);
- }
-
- @Override
- public List listAllIds() {
- return this.movieRepository.findAllMovieIds();
- }
-
- @Override
- @Transactional
- public Movie save(String title, String description, String imageUrl,
- Date airingDate, Double rating, Integer directorId,List actorIds,List genreIds) {
-
-
- Person director =getDirector(directorId);
- Movie movie = new Movie(title,description,imageUrl,airingDate,rating,director);
- movie = this.movieRepository.saveAndFlush(movie);
- addActorsAndGenresForMovie(movie,actorIds,genreIds);
- return movie;
- }
-
-
- @Transactional
- @Override
- public Movie edit(Integer movieId, String title, String description,
- String imageUrl, Date airingDate, Double rating,
- Integer directorId, List actorIds,List genreIds) {
-
-
- Person director =getDirector(directorId);
- Movie movie = this.findById(movieId);
-
- movie.setTitle(title);
- movie.setDescription(description);
- movie.setImageUrl(imageUrl);
- movie.setAiringDate(airingDate);
- movie.setImdbRating(rating);
- movie.setDirector(director);
-
- this.movieActorsRepository.deleteAllByMovie(movie);
- this.movieGenresRepository.deleteAllByMovie(movie);
-
- movie = this.movieRepository.save(movie);
- this.addActorsAndGenresForMovie(movie,actorIds,genreIds);
-
- return movie;
- }
-
- @Override
- public List findAllActorsForMovie(Movie movie) {
- return this.movieActorsRepository.findAllByMovie(movie)
- .stream()
- .map(MovieActors::getPerson)
- .collect(Collectors.toList());
- }
-
- @Override
- public List findAllGenresForMovie(Movie movie) {
- return this.movieGenresRepository.findAllByMovie(movie)
- .stream()
- .map(MovieGenres::getGenre)
- .collect(Collectors.toList());
- }
-
- @Override
- public void likeMovie(Integer movieId, Integer userId) {
- User user = this.userRepository.findById(userId).orElseThrow(() -> new UserNotExistException(userId.toString()));
- Movie movie = this.findById(movieId);
-
- this.movieLikesRepository.save(new MovieLikes(movie, user));
- }
-
- @Override
- public void unlikeMovie(Integer movieId, Integer userId) {
- MovieLikesPK movieLikesPK = new MovieLikesPK(movieId,userId);
- this.movieLikesRepository.deleteById(movieLikesPK);
- }
-
- @Override
- public List findLikedMoviesByUser(User user) {
- return
- this.movieLikesRepository
- .findAllByUser(user)
- .stream()
- .map(MovieLikes::getMovie)
- .collect(Collectors.toList());
- }
-
-
- @Override
- public void deleteById(Integer id) {
- this.movieRepository.deleteById(id);
- }
-
- @Override
- public void addGradeMovie(Integer movieId, User user, Grade grade) {
- MovieRatesPK key = new MovieRatesPK(movieId, user.getUserId());
- Optional movieRates = this.movieRatesRepository.findById(key);
- if (movieRates.isPresent()){
- MovieRates rates = movieRates.get();
- rates.setReason(grade.getReason());
- rates.setStarsRated(grade.getRating());
- this.movieRatesRepository.save(rates);
- }
- else{
- Movie movie = this.findById(movieId);
- MovieRates rates = new MovieRates(user,movie,grade.getReason(),grade.getRating());
- this.movieRatesRepository.save(rates);
- }
- }
-
- @Override
- public List searchByTitle(String title) {
- return this.movieRepository.findAllByTitleLike("%"+title+"%");
- }
-
- @Transactional
- void addActorsAndGenresForMovie(Movie movie, List actorIds, List genreIds)
- {
-
- actorIds.stream()
- .map(this::findPersonById)
- .forEach(actor -> this.movieActorsRepository.save(new MovieActors(movie,actor)));
-
- genreIds.stream()
- .map(this::findGenreById)
- .forEach(genre -> this.movieGenresRepository.save(new MovieGenres(movie,genre)));
-
- }
- private Person getDirector(Integer directorId){
-
- if (directorId != null)
- return this.findPersonById(directorId);
- return null;
-
- }
- private Person findPersonById(Integer id){
- return this.personRepository.findById(id).orElseThrow(() -> new PersonNotExistException(id));
- }
- private Genre findGenreById(Integer id){
- return this.genreRepository.findById(id).orElseThrow(() -> new GenreNotExistException(id));
- }
-}
-
-
Index: urces/src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,183 +1,0 @@
-package com.wediscussmovies.project.service.impl;
-
-import com.wediscussmovies.project.ajaxmodels.Grade;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.exception.MovieHasAlreadyDirector;
-import com.wediscussmovies.project.model.exception.MovieIdNotFoundException;
-import com.wediscussmovies.project.model.exception.PersonNotExistException;
-import com.wediscussmovies.project.model.primarykeys.PersonRatesPK;
-import com.wediscussmovies.project.model.relation.MovieActors;
-import com.wediscussmovies.project.model.relation.MovieLikes;
-import com.wediscussmovies.project.model.relation.PersonRates;
-import com.wediscussmovies.project.repository.*;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.service.PersonService;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.sql.Date;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-@Service
-public class PersonServiceImpl implements PersonService {
-
- private final PersonRepository personRepository;
- private final MovieRepository movieRepository;
- private final MovieActorsRepository movieActorsRepository;
- private final PersonRatesRepository personRatesRepository;
- public PersonServiceImpl(PersonRepository personRepository,
- MovieRepository movieRepository, MovieActorsRepository movieActorsRepository,
- PersonRatesRepository personRatesRepository) {
- this.personRepository = personRepository;
- this.movieRepository = movieRepository;
- this.movieActorsRepository = movieActorsRepository;
- this.personRatesRepository = personRatesRepository;
- }
-
- @Override
- public List findAll() {
- return this.personRepository.findAll();
- }
-
- @Override
- public List findAllDirectors() {
- return this.personRepository.findAllByType('D');
- }
-
- @Override
- public Person findById(Integer id) {
- return this.personRepository.findById(id).orElseThrow(() -> new PersonNotExistException(id));
- }
-
-
-
- @Override
- public List findAllActors() {
- return this.personRepository.findAllByType('A');
- }
-
- @Override
- @Transactional
- public Person save(String name, String surname, Character type, Date birthDate, String image_url,
- String description,List movieIds) {
-
- Person person = this.personRepository.saveAndFlush(new Person(name,surname,type,birthDate,image_url,description));
-
- if (movieIds!= null) {
- if (type.equals('A'))
- this.addActorForMovies(person, movieIds);
- else
- this.addDirectorForMovies(person, movieIds);
- }
- return person;
-
- }
-
- @Override
- @Transactional
- public Person edit(Integer personId, String name, String surname,
- Character type, Date birthDate, String image_url, String description, List movieIds) {
- Person person = this.findById(personId);
-
- person.setName(name);
- person.setSurname(surname);
- person.setDateOfBirth(birthDate);
- person.setImageUrl(image_url);
- person.setType(type);
- person.setDescription(description);
-
-
- person = this.personRepository.saveAndFlush(person);
-
- this.movieActorsRepository.deleteAllByPerson(person);
- this.removeMovieDirectorsBeforeEdit(person);
- if (movieIds != null) {
- if (type.equals('A'))
- this.addActorForMovies(person, movieIds);
- else
- this.addDirectorForMovies(person, movieIds);
- }
-
- return person;
-
- }
-
- @Override
- public List findPersonsByNameOrSurname(Character type,String searchQuery) {
- if (searchQuery != null && searchQuery.isEmpty())
- return this.personRepository.findAllByTypeAndNameLikeOrSurnameLike(type,searchQuery,searchQuery);
- if (type.equals('D'))
- return this.findAllDirectors();
- return this.findAllActors();
-
- }
-
- @Override
- public List findAllMoviesByPerson(Person person) {
- if (person.getType().equals('A'))
- return this.movieActorsRepository
- .findAllByPerson(person)
- .stream()
- .map(MovieActors::getMovie)
- .collect(Collectors.toList());
- return this.movieRepository.findAllByDirector(person);
- }
-
- @Override
- public void deleteById(Integer id) {
- this.personRepository.deleteById(id);
- }
-
- @Override
- public void addGradePerson(Integer personId, User user, Grade grade) {
- PersonRatesPK key = new PersonRatesPK(personId, user.getUserId());
- Optional personRates = this.personRatesRepository.findById(key);
- if (personRates.isPresent()){
- PersonRates rates = personRates.get();
- rates.setReason(grade.getReason());
- rates.setStarsRated(grade.getRating());
- this.personRatesRepository.save(rates);
- }
- else{
- Person person = this.findById(personId);
- PersonRates rates = new PersonRates(user,person,grade.getReason(),grade.getRating());
- this.personRatesRepository.save(rates);
- }
-
- }
-
-
-
- private void addActorForMovies(Person person, List movieIds){
-
- movieIds.stream()
- .map(this::findMovieById)
- .forEach(m -> this.movieActorsRepository.save(new MovieActors(m,person)));
-
- }
- private void addDirectorForMovies(Person person, List movieIds){
- movieIds.stream()
- .map(this::findMovieById)
- .forEach(m -> this.addMovieDirector(m,person));
- }
- private void addMovieDirector(Movie movie,Person person){
- Person director = movie.getDirector();
- if (director != null)
- throw new MovieHasAlreadyDirector(movie.getTitle(),director.getName(),director.getSurname());
- movie.setDirector(person);
- this.movieRepository.save(movie);
- }
- private void removeMovieDirectorsBeforeEdit(Person person){
- this.movieRepository.findAllByDirector(person)
- .forEach(m ->{ m.setDirector(null); this.movieRepository.save(m); });
-
- }
-
- private Movie findMovieById(Integer id){
- return this.movieRepository.findById(id).orElseThrow(() -> new MovieIdNotFoundException(id));
- }
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,78 +1,0 @@
-package com.wediscussmovies.project.service.impl;
-
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.exception.DiscussionNotExistException;
-import com.wediscussmovies.project.model.exception.ReplyNotExistException;
-import com.wediscussmovies.project.model.primarykeys.ReplyPK;
-import com.wediscussmovies.project.repository.DiscussionRepository;
-import com.wediscussmovies.project.repository.ReplyRepository;
-import com.wediscussmovies.project.model.Reply;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.repository.UserRepository;
-import com.wediscussmovies.project.service.ReplyService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Date;
-import java.time.LocalDate;
-import java.util.List;
-
-@Service
-public class ReplyServiceImpl implements ReplyService {
-
- private final ReplyRepository replyRepository;
- private final DiscussionRepository discussionRepository;
-
- public ReplyServiceImpl(ReplyRepository replyRepository,
- DiscussionRepository discussionRepository) {
- this.replyRepository = replyRepository;
- this.discussionRepository = discussionRepository;
- }
-
-
-
- @Override
- public void save(Integer discussionId, String text,User user) {
-
- Discussion discussion = this.discussionRepository.findById(discussionId).orElseThrow(() -> new DiscussionNotExistException(discussionId));
-
- Date date = Date.valueOf(LocalDate.now());
- this.replyRepository.insertInto(text,date,user.getUserId(),discussionId);
-
- }
-
- @Override
- public void likeReply(Integer replyId, Integer userId) {
- //da se implementira, promena vo baza
- }
-
- @Override
- public void unlikeReply(Integer replyId, Integer userId) {
- // da se implementira, promena vo baza
- }
-
- @Override
- public List findAllByDiscussion(Discussion discussion) {
- return this.replyRepository.findAllByDiscussion(discussion);
- }
-
-
- @Override
- public Reply edit(Integer replyId,Integer discussionId,String text) {
- ReplyPK replyPK = new ReplyPK(discussionId,replyId);
- Reply reply = this.replyRepository.findById(replyPK).orElseThrow();
- reply.setText(text);
- return this.replyRepository.save(reply);
- }
-
- @Override
- public void delete(Integer discussionId, Integer replyId) {
- this.replyRepository.deleteById(new ReplyPK(discussionId,replyId));
- }
-
- @Override
- public Reply findById(Integer discussionId, Integer replyId) {
- ReplyPK replyPK = new ReplyPK(discussionId,replyId);
- return this.replyRepository.findById(replyPK).orElseThrow(() -> new ReplyNotExistException(replyPK));
-
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,58 +1,0 @@
-package com.wediscussmovies.project.service.impl;
-
-import com.wediscussmovies.project.model.exception.InvalidArgumentsException;
-import com.wediscussmovies.project.model.exception.PasswordsDoNotMatchException;
-import com.wediscussmovies.project.model.exception.UserNotExistException;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.exception.UsernameAlreadyExistsException;
-import com.wediscussmovies.project.repository.UserRepository;
-import com.wediscussmovies.project.service.UserService;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserServiceImpl implements UserService {
-
- private final UserRepository userRepository;
- private final PasswordEncoder passwordEncoder;
-
-
- public UserServiceImpl(UserRepository userRepository, PasswordEncoder passwordEncoder) {
- this.userRepository = userRepository;
- this.passwordEncoder = passwordEncoder;
- }
-
- @Override
- public User findByUsername(String username) {
- return this.userRepository.findByUsername(username).orElseThrow(() -> new UserNotExistException(username));
- }
-
-
-
- @Override
- public User register( String email, String username, String password, String confirmPassword
- , String name, String surname) {
-
- if ( username.isEmpty() || password.isEmpty())
- throw new InvalidArgumentsException();
- if (!password.equals(confirmPassword))
- throw new PasswordsDoNotMatchException();
- if(this.userRepository.findByUsername(username).isPresent())
- throw new UsernameAlreadyExistsException(username);
- User user = new User(email,username,passwordEncoder.encode(password),name,surname);
- return userRepository.save(user);
-
- }
-
- @Override
- public User findById(Integer id) {
- return userRepository.findById(id).orElseThrow(() -> new UserNotExistException(id.toString()));
- }
-
- @Override
- public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
- return this.findByUsername(username);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/DesignFrontMovies.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/DesignFrontMovies.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,17 +1,0 @@
-package com.wediscussmovies.project.web;
-
-import com.wediscussmovies.project.model.Movie;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DesignFrontMovies {
- public static void designMovieList(List movieList, List> movie_rows){
- for(int i=0; imovieList.size())
- j= movieList.size();
- movie_rows.add(movieList.subList(i, j));
- }
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/HomeController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/HomeController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-package com.wediscussmovies.project.web;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class HomeController {
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/PageFrontMovies.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/PageFrontMovies.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,42 +1,0 @@
-package com.wediscussmovies.project.web;
-
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.service.MovieService;
-import org.springframework.ui.Model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PageFrontMovies {
- public static List getPagedMovies(String page, MovieService movieService, Model model){
- List movieIds = movieService.listAllIds();
- List movies = new ArrayList<>();
- if(page==null || Integer.parseInt(page) <= 0)
- page="1";
- int pageToLoad = Integer.parseInt(page);
-
- int from = (pageToLoad-1)*12;
- int to = pageToLoad*12;
-
- if (from>movieIds.size()){
- page = "1";
- pageToLoad = Integer.parseInt(page);
- from = (pageToLoad-1)*12;
- to = pageToLoad*12;
- }
- else if(to>movieIds.size()){
- to = movieIds.size();
- }
-
- movieIds = movieIds.subList(from, to);
-
- for(Integer id: movieIds){
- //Trying to improve load times by not pulling all things from the database, excluding un-needed stuff
- //
- //movies.add(movieService.findById(id));
- movies.add(movieService.findBasicById(id));
- }
- model.addAttribute("page", page);
- return movies;
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/DiscussionController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,200 +1,0 @@
-package com.wediscussmovies.project.web.controller;
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.model.Discussion;
-import com.wediscussmovies.project.model.Reply;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.relation.DiscussionLikes;
-import com.wediscussmovies.project.querymodels.DiscussionLikesQM;
-import com.wediscussmovies.project.service.DiscussionService;
-import com.wediscussmovies.project.service.MovieService;
-import com.wediscussmovies.project.service.PersonService;
-import com.wediscussmovies.project.service.ReplyService;
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Controller
-@RequestMapping("/discussions")
-public class DiscussionController {
-
- private final DiscussionService discussionService;
- private final ReplyService replyService;
- private final MovieService movieService;
- private final PersonService personService;
-
- public DiscussionController(DiscussionService discussionService, ReplyService replyService, MovieService movieService, PersonService personService) {
- this.discussionService = discussionService;
- this.replyService = replyService;
- this.movieService = movieService;
- this.personService = personService;
- }
-
- @GetMapping()
- public String getDiscussions(@RequestParam(required = false) String titleSearch,
- Model model){
- /* 1.Validacija i na frontend so, da ne se isprakja baranjeto, ako titleSearch e null ili empty
- da ne se preoptovaruva serverot so baranja za titleSearch koga e null!
-
- */
- //List discussions = discussionService.listAllByTitle(titleSearch);
- List discussions = discussionService.listAll();
- model.addAttribute("discussions", discussions);
- model.addAttribute("contentTemplate", "discussionsList");
- model.addAttribute("user",LoggedUser.getLoggedUser());
- this.addModelPropertiesForUser(model);
- // this.addModelPropertiesLikes(model,null, discussions);
- return "template";
- }
-
- @GetMapping("/{id}")
- public String getDiscussion(
- @PathVariable Integer id,
- Model model){
- /*
- 2. Moze da se vrati indikator deka takva diskusija ne postoi! - postaveno
- */
- try {
- Discussion disc = discussionService.findById(id);
- model.addAttribute("disc", disc);
- model.addAttribute("contentTemplate", "discussion");
- model.addAttribute("replies",this.replyService.findAllByDiscussion(disc));
- addModelPropertiesForUser(model);
-
- return "template";
- }
- catch (RuntimeException exception){
- return "redirect:/discussions?error="+exception.getMessage();
-
- }
- }
- @GetMapping("/all/{id}")
- public String getDiscussionForId(@PathVariable Integer id,@RequestParam Character type, Model model){
-
- model.addAttribute("discussions", this.discussionService.findAllForPersonOrMovie(id,type));
- model.addAttribute("contentTemplate", "discussionForType");
- return "template";
-
- }
-
- @GetMapping("/{id}/replies")
- public String getRepliesToDiscussion(
- @PathVariable Integer id,
- Model model){
-
- try {
- Discussion discussion = discussionService.findById(id);
- model.addAttribute("discussion", discussion);
- model.addAttribute("contentTemplate", "discussionReply");
- return "template";
- }
- catch (RuntimeException exception){
- return "redirect:/discussions?error="+exception.getMessage();
-
- }
-
- }
-
-
- @GetMapping("/add/{id}")
- public String getFormForEdit(Model model,
- @PathVariable Integer id)
- {
- Discussion discussion = this.discussionService.findById(id);
- setModelPropertiesForForm(model);
- model.addAttribute("discussion", discussion);
-
- return "template";
- }
- @GetMapping("/add")
- public String getFormForAdd(Model model)
- {
- setModelPropertiesForForm(model);
-
- return "template";
- }
-
-
- @PostMapping("/save")
- public String saveDiscussion(
- @RequestParam Integer idDiscussed,
- @RequestParam String title,
- @RequestParam String text,
- @RequestParam Character type ){
-
-
-
- try{
-
- discussionService.save(type,idDiscussed, title, text, LoggedUser.getLoggedUser());
- return "redirect:/discussions";
-
- }
-
- catch (RuntimeException exc){
- return "redirect:/discussions?error="+exc.getMessage();
-
- }
- }
-
- @PostMapping("/save/{discussionId}/")
- public String editDiscussion(
- @PathVariable Integer discussionId,
- @RequestParam String title,
- @RequestParam String text,
- @RequestParam Character type,
- @RequestParam Integer idDiscussed
- ){
-
-
-
-
- try{
-
-
- discussionService.edit(discussionId,type,idDiscussed, title, text);
- return "redirect:/discussions";
-
- }
-
- catch (RuntimeException exc){
- return "redirect:/discussions?error="+exc.getMessage();
-
- }
- }
-
- private void setModelPropertiesForForm(Model model){
- model.addAttribute("movies",this.movieService.listAll());
- model.addAttribute("persons",this.personService.findAll());
- model.addAttribute("contentTemplate", "discussionsAdd");
-
- }
- private void addModelPropertiesForUser(Model model){
- User user = LoggedUser.getLoggedUser();
- model.addAttribute("likedDiscussions",this.discussionService.findLikedDiscussionsByUser(user));
- model.addAttribute("user",user);
- }
- private void addModelPropertiesLikes(Model model, Discussion discussion, List discussions){
- // ispagja kompliciran kod vaka, podobro da dodademe i svojstvo u diskusijata i koga ke se dodade lajk
- // soodvetno da se zgoleme i obratno
-// if(discussion==null){
-// List discussionLikes = new ArrayList<>();
-// for(Discussion d: discussions){
-// discussionLikes.add(discussionService.findLikesForDiscussionWithId(d.getDiscussionId()));
-// }
-// model.addAttribute("likes", discussionLikes);
-// }
-// else{
-// model.addAttribute("likes",discussionService.findLikesForDiscussionWithId(discussion.getDiscussionId()).getLikes());
-// }
- }
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/GenreController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/GenreController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,46 +1,0 @@
-package com.wediscussmovies.project.web.controller;
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.model.Genre;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.relation.UserGenres;
-import com.wediscussmovies.project.repository.GenreLikesRepository;
-import com.wediscussmovies.project.service.GenreService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Controller
-@RequestMapping("/genres")
-public class GenreController {
- private final GenreService genreService;
- private final GenreLikesRepository genreLikesRepository;
-
- public GenreController(GenreService genreService, GenreLikesRepository genreLikesRepository) {
- this.genreService = genreService;
- this.genreLikesRepository = genreLikesRepository;
- }
- @GetMapping
- public String getGenres(Model model){
- model.addAttribute("genres",genreService.findAllWithLikes());
- model.addAttribute("allGenres", genreService.findAll());
- model.addAttribute("contentTemplate","genres");
- addModelPropertiesForUser(model);
- return "template";
- }
-
- private void addModelPropertiesForUser(Model model){
- User user = LoggedUser.getLoggedUser();
- List genreLikesList = this.genreLikesRepository.findAllByUser(user);
- List genres = new ArrayList<>();
- for(UserGenres g: genreLikesList){
- genres.add(genreService.findById(g.getId().getGenreId()));
- }
- model.addAttribute("likedGenres",genres);
- model.addAttribute("user",user);
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/MovieController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/MovieController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,206 +1,0 @@
-package com.wediscussmovies.project.web.controller;
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.querymodels.MovieLikesQM;
-import com.wediscussmovies.project.service.GenreService;
-import com.wediscussmovies.project.service.MovieService;
-import com.wediscussmovies.project.service.PersonService;
-import com.wediscussmovies.project.web.DesignFrontMovies;
-import com.wediscussmovies.project.web.PageFrontMovies;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.sql.Date;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-
-@Controller
-@RequestMapping("/movies")
-public class MovieController {
- private final MovieService movieService;
- private final GenreService genreService;
- private final PersonService personService;
-
- public MovieController(MovieService movieService, GenreService genreService, PersonService personService) {
- this.movieService = movieService;
- this.genreService = genreService;
- this.personService = personService;
- }
-
- @GetMapping("/old")
- public String getMoviesOld(@RequestParam(required = false) String titleQuery, Model model,
- @RequestParam(required = false) String error){
- List movies;
- if(titleQuery == null ) {
- movies = movieService.listAll();
- }
- else{
- movies = movieService.searchByTitle(titleQuery);
- }
-
- addModelPropertiesForUser(model);
-
- List> movie_rows = new ArrayList<>();
- DesignFrontMovies.designMovieList(movies,movie_rows);
- model.addAttribute("movies", movies);
- model.addAttribute("movie_rows", movie_rows);
- model.addAttribute("contentTemplate", "moviesList");
- model.addAttribute("genres", genreService.findAll());
- if (error != null && !error.equals(" "))
- model.addAttribute("error",error);
- return "template";
- }
-
-
- @GetMapping
- public String getMovies(@RequestParam(required = false) String titleQuery, Model model,
- @RequestParam(required = false) String error, @RequestParam(required = false) String page){
- if (page==null){
- return "redirect:/movies?page=1";
- }
- addModelPropertiesForUser(model);
- List movies = PageFrontMovies.getPagedMovies(page, movieService, model);
- List> movie_rows = new ArrayList<>();
- DesignFrontMovies.designMovieList(movies,movie_rows);
- //addModelPropertiesForMoviesLikes(model, movies);
- model.addAttribute("movies", movies);
- model.addAttribute("movie_rows", movie_rows);
- model.addAttribute("genres", genreService.findAll());
- model.addAttribute("contentTemplate", "moviesListPaged");
- if (error != null && !error.equals(" "))
- model.addAttribute("error",error);
- return "template";
- }
-
- @GetMapping("/{id}")
- public String getMovie(@PathVariable Integer id, Model model){
- model.addAttribute("movie", movieService.findById(id));
- addModelPropertiesForUser(model);
- model.addAttribute("likes", movieService.findLikesForMovieById(id).getLikes());
- model.addAttribute("contentTemplate", "movieShow");
- return "template";
- }
-
- @GetMapping("/add")
- public String addMovie(Model model){
-
- addModelProperties(model);
- model.addAttribute("contentTemplate", "moviesAdd");
- return "template";
- }
-
-
- @GetMapping("/{id}/delete")
- public String deleteMovie(@PathVariable Integer id){
-
- try {
- this.movieService.deleteById(id);
- return "redirect:/movies";
-
- }
- catch (RuntimeException exc){
- return "redirect:/movies?error="+exc.getMessage();
- }
- }
-
- @PostMapping("/save")
- public String saveMovie(
-
-
-
- @RequestParam String title,
- @RequestParam String description,
- @RequestParam String imageUrl,
- @RequestParam(required = false) Double rating,
- @RequestParam(required = false) Integer directorId,
- @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate airingDate,
- @RequestParam List actors,
- @RequestParam List genres
- ){
-
- try {
- Movie movie = this.movieService.save(title,description,imageUrl,Date.valueOf(airingDate),rating,directorId,actors,genres);
-
- return "redirect:/movies";
- }
- catch (RuntimeException exc){
- return "redirect:/movies?error="+exc.getMessage();
- }
- }
- @PostMapping("/save/{movieId}")
- public String updateMovie(
-
-
- @PathVariable Integer movieId,
- @RequestParam String title,
- @RequestParam String description,
- @RequestParam String imageUrl,
- @RequestParam(required = false) Double rating,
- @RequestParam(required = false) Integer directorId,
- @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate airingDate,
- @RequestParam List actors,
- @RequestParam List genres
- ){
-
- try {
- Movie movie = this.movieService.edit(movieId,title,description,imageUrl,Date.valueOf(airingDate),rating,directorId,actors,genres);
-
- return "redirect:/movies";
- }
- catch (RuntimeException exc){
- return "redirect:/movies?error="+exc.getMessage();
- }
- }
-
-
-
- @GetMapping("/{id}/edit")
- public String editMovie(@PathVariable Integer id, Model model){
- try {
- Movie movie = movieService.findById(id);
- addModelProperties(model);
- model.addAttribute("movie", movie);
- model.addAttribute("director",movie.getDirector());
- model.addAttribute("movieActors",movieService.findAllActorsForMovie(movie));
- model.addAttribute("movieGenres",movieService.findAllGenresForMovie(movie));
- model.addAttribute("contentTemplate", "moviesAdd");
- return "template";
-
- }
- catch (RuntimeException exc){
- return "redirect:/movies?error="+exc.getMessage();
- }
-
- }
- private void addModelProperties(Model model){
- model.addAttribute("directors", personService.findAllDirectors());
- model.addAttribute("actors", personService.findAllActors());
- model.addAttribute("genres", genreService.findAll());
- }
- private void addModelPropertiesForUser(Model model){
- User user = LoggedUser.getLoggedUser();
- model.addAttribute("likedMovies",this.movieService.findLikedMoviesByUser(user));
- model.addAttribute("user",user);
- }
- private void addModelPropertiesForMoviesLikes(Model model, List movies){
- HashMap movieLikes = new HashMap<>();
- for(Movie m: movies){
- movieLikes.put(m.getMovieId(),movieService.findLikesForMovieById(m.getMovieId()));
- }
- model.addAttribute("movieLikes", movieLikes);
- }
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/PersonController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/PersonController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,145 +1,0 @@
-package com.wediscussmovies.project.web.controller;
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.model.Person;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.service.MovieService;
-import com.wediscussmovies.project.service.PersonService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.sql.Date;
-import java.util.List;
-
-@Controller
-public class PersonController {
- private final PersonService personService;
- private final MovieService movieService;
-
- public PersonController(PersonService personService, MovieService movieService) {
- this.personService = personService;
- this.movieService = movieService;
- }
-
- /*
- 1. Prebaruvanjeto po ime i prezime posoodvetno e da bide na frontend
- Da ne se preoptovaruva server i klient da ceka koga moze vo browser vekje dobieni da se filtrirat
- */
- @GetMapping("/actors")
- public String getActors(Model model, @RequestParam(required = false) String nameAndSurname){
- List persons = personService.findPersonsByNameOrSurname('A',nameAndSurname);
- model.addAttribute("persons", persons);
- model.addAttribute("contentTemplate", "personsList");
-
- return "template";
- }
- /*
- 2. Prebaruvanjeto po ime i prezime posoodvetno e da bide na frontend
- Da ne se preoptovaruva server i klient da ceka koga moze vo browser vekje dobieni da se filtrirat
- */
- @GetMapping("/directors")
- public String getDirectors(Model model, @RequestParam(required = false) String nameAndSurname){
- List persons = personService.findPersonsByNameOrSurname('D',nameAndSurname);
- model.addAttribute("persons", persons);
- model.addAttribute("contentTemplate", "personsList");
- return "template";
- }
-
- @GetMapping("/persons/{id}")
- public String getPerson(@PathVariable Integer id, Model model){
- Person person = personService.findById(id);
- //Error handling, could be null!!!!!!!!!
- model.addAttribute("person", person);
- addModelPropertiesForUser(model);
- model.addAttribute("contentTemplate", "personShow");
- return "template";
- }
-
- @GetMapping("/persons/add")
- public String addingFormForPerson( Model model){
-
- addModelPropertiesForForm(model);
- return "template";
- }
- @GetMapping("persons/edit/{personId}")
- public String editPerson(@PathVariable Integer personId, Model model){
-
- try {
- Person person = this.personService.findById(personId);
- addModelPropertiesForForm(model);
- model.addAttribute("person",person);
- model.addAttribute("movieActors",this.personService.findAllMoviesByPerson(person));
- return "template";
- }
- catch (RuntimeException exc){
- return "redirect:/actors?erorr="+exc.getMessage();
- }
- }
-
- @PostMapping("/persons/save")
- public String savePerson(
- @RequestParam String name,
- @RequestParam String surname,
- @RequestParam Character type,
- @RequestParam Date birthDate,
- @RequestParam String imageUrl,
- @RequestParam String description,
- @RequestParam(required = false) List movieIds){
-
- String returnedUrl = getReturnedUrl(type);
-
- try {
-
- Person person = this.personService.save(name, surname, type, birthDate, imageUrl, description, movieIds);
- return returnedUrl;
- }
- catch (RuntimeException exc){
- return returnedUrl + "?error" + exc.getMessage();
- }
-
- }
- @PostMapping("/persons/save/{personId}")
- public String editPerson(
- @PathVariable Integer personId,
- @RequestParam String name,
- @RequestParam String surname,
- @RequestParam Character type,
- @RequestParam Date birthDate,
- @RequestParam String imageUrl,
- @RequestParam String description,
- @RequestParam(required = false) List movieIds){
-
- String returnedUrl = getReturnedUrl(type);
- try {
-
- Person person = this.personService.edit(personId,name, surname, type, birthDate, imageUrl, description, movieIds);
- return returnedUrl;
- }
- catch (RuntimeException exc){
- return returnedUrl + "?error" + exc.getMessage();
- }
-
- }
- private String getReturnedUrl(Character type){
- if (type.equals('A'))
- return "redirect:/actors";
- return "redirect:/directors";
- }
- private void addModelPropertiesForForm(Model model){
- model.addAttribute("contentTemplate", "personsAdd");
- model.addAttribute("moviesActors",this.movieService.listAllByType('A'));
- model.addAttribute("moviesDirectors",this.movieService.listAllByType('D'));
-
- }
-
- private void addModelPropertiesForUser(Model model){
- User user = LoggedUser.getLoggedUser();
- model.addAttribute("user",user);
- }
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/ReplyController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/ReplyController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,85 +1,0 @@
-package com.wediscussmovies.project.web.controller;
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.model.Reply;
-import com.wediscussmovies.project.model.User;
-import com.wediscussmovies.project.model.primarykeys.ReplyPK;
-import com.wediscussmovies.project.service.ReplyService;
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-
-@Controller
-@RequestMapping("/replies")
-public class ReplyController {
- private final ReplyService replyService;
-
- public ReplyController(ReplyService replyService) {
- this.replyService = replyService;
- }
-
- @GetMapping("/add/{discussionId}")
- public String addForm(@PathVariable Integer discussionId, Model model){
- model.addAttribute("discussionId",discussionId);
- model.addAttribute("contentTemplate","repliesAdd");
- return "template";
- }
-
- @GetMapping("/edit/{discussionId}/{replyId}")
- public String editForm(@PathVariable Integer discussionId,@PathVariable Integer replyId, Model model){
-
- try {
- Reply reply = replyService.findById(discussionId,replyId);
- model.addAttribute("reply", reply);
- model.addAttribute("contentTemplate", "repliesAdd");
- return "template";
-
-
- }catch (RuntimeException exc){
- return "redirect:/discussions?error="+exc.getMessage();
-
- }
- }
- @PostMapping("/save")
- public String saveReply(
- @RequestParam Integer discussionId,
- @RequestParam String text){
-
- try {
-
- this.replyService.save(discussionId,text, LoggedUser.getLoggedUser());
- return "redirect:/discussions/"+discussionId;
-
- }
- catch (RuntimeException exc){
- return "redirect:/discussions?error="+exc.getMessage();
-
- }
- }
-
- @PostMapping("/save/{replyId}")
- public String editReply(
- @PathVariable Integer replyId,
- @RequestParam Integer discussionId,
- @RequestParam String text){
-
- /*
- 1. Da se realizira so ajax baranje na restController
- */
- try {
- Reply reply = replyService.edit(replyId,discussionId, text);
-
- return "redirect:/discussions/" + reply.getDiscussion().getDiscussionId();
- }
- catch (RuntimeException exc){
- return "redirect:/discussions?error="+exc.getMessage();
- }
-
- }
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/UsersController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/UsersController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,79 +1,0 @@
-package com.wediscussmovies.project.web.controller;
-
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.model.Movie;
-import com.wediscussmovies.project.model.exception.InvalidArgumentsException;
-import com.wediscussmovies.project.model.exception.PasswordsDoNotMatchException;
-import com.wediscussmovies.project.service.MovieService;
-import com.wediscussmovies.project.service.UserService;
-import com.wediscussmovies.project.web.DesignFrontMovies;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Controller
-@RequestMapping
-public class UsersController{
- private final UserService userService;
- private final MovieService movieService;
-
- public UsersController(UserService userService, MovieService movieService) {
- this.userService = userService;
- this.movieService = movieService;
- }
- @PostMapping("/register")
- public String register(@RequestParam String username,
- @RequestParam String password,
- @RequestParam String repeatedPassword,
- @RequestParam String email,
- @RequestParam String name,
- @RequestParam String surname) {
- try{
- this.userService.register(email,username,password,repeatedPassword,name,surname);
- return "redirect:/login";
- } catch (InvalidArgumentsException | PasswordsDoNotMatchException exception) {
- return "redirect:/register?error=" + exception.getMessage();
- }
- }
- @GetMapping("/profiles/{id}")
- public String getProfilePage(@PathVariable Integer id, Model model){
- model.addAttribute("user",userService.findById(id));
- model.addAttribute("contentTemplate","usersShow");
- return "template";
- }
- @GetMapping("/register")
- public String getRegisterPage(@RequestParam(required = false) String error, Model model) {
- addModelError(model,error);
- model.addAttribute("contentTemplate","register");
- return "template";
- }
- @GetMapping("/login")
- public String getLoginPage(@RequestParam(required = false) String error,Model model){
- addModelError(model,error);
- model.addAttribute("contentTemplate","login");
- return "template";
- }
-
- private void addModelError(Model model,String error){
- if(error != null && !error.isEmpty()) {
- model.addAttribute("hasError", true);
- model.addAttribute("error", error);
- }
- }
- @GetMapping("/favoriteList")
- public String getFavoriteList(Model model){
- List movieList = this.movieService.findLikedMoviesByUser(LoggedUser.getLoggedUser());
- List> movie_rows = new ArrayList<>();
- DesignFrontMovies.designMovieList(movieList,movie_rows);
- model.addAttribute("movie_rows", movie_rows);
- model.addAttribute("contentTemplate","favoriteList");
- return "template";
-
- }
-
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/rest/DiscussionRestController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/rest/DiscussionRestController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,46 +1,0 @@
-package com.wediscussmovies.project.web.controller.rest;
-
-import com.wediscussmovies.project.service.DiscussionService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("api/discussions")
-public class DiscussionRestController {
- private final DiscussionService discussionService;
-
- public DiscussionRestController(DiscussionService discussionService) {
- this.discussionService = discussionService;
- }
- @DeleteMapping("/delete/{id}")
- public ResponseEntity deleteById(@PathVariable Integer id){
- try {
- this.discussionService.deleteById(id);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
-
- }
- }
- @GetMapping("/like/{discussionId}")
- public ResponseEntity likeDiscussion(@PathVariable Integer discussionId, @RequestParam Integer userId){
- try {
- this.discussionService.likeDiscussion(discussionId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
- @GetMapping("/unlike/{discussionId}")
- public ResponseEntity unlikeDiscussion(@PathVariable Integer discussionId, @RequestParam Integer userId){
- try {
- this.discussionService.unlikeDiscussion(discussionId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/rest/GenreRestController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/rest/GenreRestController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,38 +1,0 @@
-package com.wediscussmovies.project.web.controller.rest;
-
-import com.wediscussmovies.project.service.DiscussionService;
-import com.wediscussmovies.project.service.GenreService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("api/genres")
-public class GenreRestController {
- private final GenreService genreService;
-
- public GenreRestController(GenreService genreService) {
- this.genreService = genreService;
- }
-
- @GetMapping("/like/{genreId}")
- public ResponseEntity likeGenre(@PathVariable Integer genreId, @RequestParam Integer userId){
- try {
- this.genreService.likeGenre(genreId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
- @GetMapping("/unlike/{genreId}")
- public ResponseEntity unlikeGenre (@PathVariable Integer genreId, @RequestParam Integer userId){
- try {
- this.genreService.unlikeGenre(genreId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- System.out.println(exception.getMessage());
- return ResponseEntity.ok(false);
- }
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/rest/MovieRestController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/rest/MovieRestController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,67 +1,0 @@
-package com.wediscussmovies.project.web.controller.rest;
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.ajaxmodels.Grade;
-import com.wediscussmovies.project.service.MovieService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("/api/movies")
-public class MovieRestController {
-
- private final MovieService movieService;
-
-
- public MovieRestController(MovieService movieService) {
- this.movieService = movieService;
- }
-
- @DeleteMapping("/delete/{id}")
- public ResponseEntity deleteById(@PathVariable Integer id){
- try {
- this.movieService.deleteById(id);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
-
- }
- }
- @GetMapping("/like/{movieId}")
- public ResponseEntity likeMovie(@PathVariable Integer movieId, @RequestParam Integer userId){
- try {
- this.movieService.likeMovie(movieId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
- @GetMapping("/unlike/{movieId}")
- public ResponseEntity unlikeMovie(@PathVariable Integer movieId, @RequestParam Integer userId){
- try {
- this.movieService.unlikeMovie(movieId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
- @PostMapping("/grade/{movieId}")
- public ResponseEntity addGrade(@PathVariable Integer movieId, @RequestBody Grade grade){
- try {
- if(grade.getRating() < 5)
- grade.setRating(5);
- else if(grade.getRating()>10)
- grade.setRating(10);
- this.movieService.addGradeMovie(movieId, LoggedUser.getLoggedUser(),grade);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
-
- }
-
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/rest/PersonRestController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/rest/PersonRestController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,41 +1,0 @@
-package com.wediscussmovies.project.web.controller.rest;
-
-import com.wediscussmovies.project.LoggedUser;
-import com.wediscussmovies.project.ajaxmodels.Grade;
-import com.wediscussmovies.project.service.PersonService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("/api/persons")
-public class PersonRestController {
-
- private final PersonService personService;
-
- public PersonRestController(PersonService personService) {
- this.personService = personService;
- }
-
- @DeleteMapping("/delete/{id}")
- public ResponseEntity deletePerson(@PathVariable Integer id){
-
- try {
- this.personService.deleteById(id);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
- @PostMapping("/grade/{personId}")
- public ResponseEntity addGrade(@PathVariable Integer personId, @RequestBody Grade grade){
- try {
- this.personService.addGradePerson(personId, LoggedUser.getLoggedUser(),grade);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
-
- }
-}
Index: urces/src/main/java/com/wediscussmovies/project/web/controller/rest/ReplyRestController.java
===================================================================
--- Sources/src/main/java/com/wediscussmovies/project/web/controller/rest/ReplyRestController.java (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,51 +1,0 @@
-package com.wediscussmovies.project.web.controller.rest;
-
-import com.wediscussmovies.project.model.primarykeys.ReplyPK;
-import com.wediscussmovies.project.service.ReplyService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("api/replies")
-public class ReplyRestController {
-
- private final ReplyService replyService;
-
- public ReplyRestController(ReplyService replyService) {
- this.replyService = replyService;
- }
-
- @PostMapping("/delete/{discussionId}")
- public ResponseEntity deleteById(@RequestParam Integer replyId,@PathVariable Integer discussionId){
- try {
- this.replyService.delete(discussionId,replyId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
-
- }
- }
- @GetMapping("/like/{replyId}")
- public ResponseEntity likeReply(@PathVariable Integer replyId,
- @RequestParam Integer userId){
- try {
- this.replyService.likeReply(replyId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
- @GetMapping("/unlike/{replyId}")
- public ResponseEntity unlikeReply(@PathVariable Integer replyId,
- @RequestParam Integer userId){
- try {
- this.replyService.unlikeReply(replyId,userId);
- return ResponseEntity.ok(true);
- }
- catch (RuntimeException exception){
- return ResponseEntity.ok(false);
- }
- }
-}
Index: urces/src/main/resources/application-prod.properties
===================================================================
--- Sources/src/main/resources/application-prod.properties (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,14 +1,0 @@
-spring.datasource.url=jdbc:postgresql://localhost:9999/db_202122z_va_prj_wediscussmovies?currentSchema=project
-spring.datasource.username=db_202122z_va_prj_wediscussmovies_owner
-spring.datasource.password=7d8fb26b5697
-
-
-## default connection pool
-
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQL95Dialect
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
-
-spring.jpa.hibernate.ddl-auto=validate
-spring.jpa.show-sql=true
-
Index: urces/src/main/resources/application.properties
===================================================================
--- Sources/src/main/resources/application.properties (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,7 +1,0 @@
-spring.profiles.active=prod
-
-server.port=9090
-
-spring.thymeleaf.cache=false
-
-spring.mvc.hiddenmethod.filter.enabled=true
Index: urces/src/main/resources/static/css/shared.css
===================================================================
--- Sources/src/main/resources/static/css/shared.css (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,303 +1,0 @@
-.col{
- max-width: 5vw;
-}
-
-.row{
- height: 300px;
- margin-bottom: 15px;
-}
-
-.row div{
- height: 100%;
-}
-
-.row div div{
- height: 100%;
-}
-
-.card{
- background-size: 100vh auto;
- float:left;
- margin: 7px;
- border-radius: 10px;
- padding: 20px;
- color: white;
- -webkit-text-stroke-width: 1px !important;
- -webkit-text-stroke-color: black !important;
- width: 90%;
- height: 90%;
- box-shadow: 4px 4px 4px rgba(128,128,128,1);
-}
-
-.card a h3{
- -webkit-text-stroke-width: 1px;
- -webkit-text-stroke-color: black;
- color:white;
- transition: 100ms;
-}
-
-.card:hover a h3{
- transition: 400ms;
- color:black;
- -webkit-text-stroke-color: white;
-}
-
-.title{
- text-align: center;
- background-color: rgba(0,0,0,0.25);
- border-radius: 10px 10px 0px 0px;
- padding: 10px;
-}
-
-.bottom{
- position: absolute;
- top: 75%;
- margin:auto;
- width: 100%;
- left: 0%;
- border-radius: 0px;
- text-align: center;
- background-color: rgba(0,0,0,0.25);
-}
-.bottom h3, .bottom span{
- margin-bottom: 0px;
- margin-top: 0px;
-}
-.bottom span{
- font-size: 75%;
- margin-top: 5px;
-}
-
-
-.elements .card .btn{
- top: 60%;
- left: auto;
- position: absolute;
- margin: auto;
- width: 20%;
- text-align: center;
-}
-
-#paging-section{
- width: 100%;
- clear: both;
- margin-bottom: 30px;
-}
-
-#inner-paging{
- width: fit-content;
- margin: auto;
-
-}
-
-#button-sub, #button-add{
- width: 100px;
-}
-
-#pageInput{
- font-size: 100%;
- text-align: center;
- width: 175px;
- margin: auto;
-}
-
-#button-submit-page{
- margin: auto;
- text-align: center;
- margin-top: 7px;
- display: none;
-}
-
-.visibility{
- transition: 200ms;
- opacity: 0;
-}
-
-.person-movies-list{
- margin: auto;
- margin-top: 20px;
- padding: 10px;
- width: 80%;
- background-color: rgba(52, 58, 64, 0.7);
- border-radius: 10px;
- transition: 200ms;
- color: white;
-}
-
-.person-movies-list:hover{
- background-color: rgba(52, 58, 64, 1);
-}
-
-.person-movies-list ul{
- list-style-type: none;
-}
-
-.person-movies-list ul li{
- color:black;
- background-color: rgba(255,255,255,0.7);
- padding: 12px;
- font-size: 120%;
- width: 80%;
- text-align: center;
- margin: auto;
- transition: 200ms;
- border-radius: 10px;
- margin-bottom: 5px;
- text-decoration: underline;
-}
-
-.person-movies-list hr{
- color: white;
- background-color: white;
- border-color: white;
-}
-
-.person-movies-list ul li:hover{
- background-color: rgba(255,255,255,1);
- text-decoration-color: blue;
-}
-
-.genres-listing ul li:hover{
- background-color: rgba(222,128,128,1);
-}
-
-.genres-listing ul li{
- background-color: rgba(192,128,128,0.7);
- text-decoration: none;
-}
-
-.person-movies-list ul li a{
- color: black;
- transition: 250ms;
- text-decoration: underline;
- text-decoration-color: black;
-}
-
-.person-movies-list ul li a:hover{
- color:blue;
-}
-
-
-#admin-buttons a{
- display: inline-block;
- width: 95%;
- margin: auto;
- margin-top: 10px;
- font-size: 125%;
- clear: both;
-}
-
-#image-movie-section{
- height: fit-content;
- min-height: fit-content;
-}
-
-#likes-showcase{
- background-color: rgba(192,128,128,0.7);
- border-radius: 10px;
- padding:10px;
- width: 60%;
- margin: auto;
- transition: 200ms;
- margin-top: 2%;
-}
-
-#likes-showcase strong{
- font-size: 150%;
-}
-
-#likes-showcase:hover{
- background-color: rgba(222,128,128,1);
-}
-
-.invisible-search{
- display: none;
-}
-
-.user-text{
- font-size: 95%;
- text-decoration: none !important;
- text-decoration-color: transparent;
- text-align: justify;
-}
-
-.user-text-small{
- font-size: 85%;
- text-decoration: none !important;
- text-decoration-color: transparent;
- text-align: justify;
-}
-
-
-.user-movies-list{
- margin: auto;
- margin-top: 20px;
- padding: 10px;
- width: 80%;
- background-color: rgba(52, 58, 64, 0.7);
- border-radius: 10px;
- transition: 200ms;
- margin-right: 15px;
- color: white;
- transition: 200ms;
-}
-
-.user-movies-list:hover{
- background-color: rgba(52, 58, 64, 1);
-}
-
-.user-movies-list ul{
- list-style-type: none;
- width: 99%;
- margin: auto;
- display: none;
-}
-
-.hidden-class{
- background-color: rgba(192,255,192,0.6);
- color: black;
-}
-
-.hidden-class:hover{
- background-color: rgba(128,255,128,1) !important;
-
-}
-
-.user-movies-list ul li{
- color:black;
- background-color: rgba(255,255,255,0.7);
- padding: 12px;
- font-size: 80%;
- width: 90%;
- text-align: center;
- margin: auto;
- transition: 200ms;
- border-radius: 10px;
- margin-bottom: 5px;
- text-decoration: none;
- float: left;
-}
-
-.user-movies-list hr{
- color: white;
- background-color: white;
- border-color: white;
-}
-
-
-.user-movies-list ul li:hover{
- background-color: rgba(255,255,255,1);
-}
-
-.rate-title{
- font-size: 130%;
-}
-
-#buttons-person{
- margin-top: 10px;
-}
-
-#buttons-person li{
- float: left;
- margin-right: 10px;
-}
Index: urces/src/main/resources/static/js/sharedScript.js
===================================================================
--- Sources/src/main/resources/static/js/sharedScript.js (revision 980eeda285ff3ffb16a3a043cf9c4086a8686f85)
+++ (revision )
@@ -1,424 +1,0 @@
-var urlRating;
-
-$(document).ready(function (){
- var elements = $(".elements")
- var elementGrade;
- var first_time = true;
-
- $("#button-add").on("click", function (){
- itemInput = $("#pageInput")
- itemInput.val(Number(itemInput.val()) + 1);
- $("#button-submit-page").click()
- })
-
- $("#button-sub").on("click", function (){
- itemInput = $("#pageInput")
- if(Number(itemInput.val()) > 1){
- itemInput.val(Number(itemInput.val()) - 1);
- $("#button-submit-page").click()
- }
- })
-
- $("#searchTitle").on("keyup", function() {
- var value = $(this).val().toLowerCase();
- console.log(value)
- $(".elements div a .title").filter(function() {
- console.log($(this).text())
- if($(this).text().toLowerCase().indexOf(value) <= -1)
- $(this).parent().parent().parent().addClass("visibility")
- else
- $(this).parent().parent().parent().removeClass("visibility")
- });
- });
-
-
-
-
- $("#dialog-rating").dialog({
- autoOpen: false,
- modal: true,
- buttons: [
- {
- text: "Потврди",
- click: function () {
- $("#dialog-rating").dialog("close")
- ajaxCallRating(urlRating,elementGrade)
- }
- },
- {
- text: "Откажи",
- click: function () {
- $("#dialog-rating").dialog("close")
- }
- }
- ]
- });
- $(".button-add-grade-movie").on("click",function (){
- elementGrade = $(this)
- urlRating ="/api/movies/grade/"+$(this).attr("movie-id")
- $("#dialog-rating").dialog("open")
- })
- $(".button-add-grade-person").on("click",function (){
- elementGrade = $(this)
- urlRating ="/api/persons/grade/"+$(this).attr("person-id")
- $("#dialog-rating").dialog("open")
- })
-
-
- /*$(".search-button-title").on("click",function (){
- let filter = $("#searchTitle").val()
- console.log(elements)
- for (let item of elements){
- let title = $(item).find(".card-title").text()
- if (title.toLowerCase() === filter.toLowerCase()){
- console.log("Da")
- $(item).css("display","block")
- }
- else{
- $(item).css("display","none")
- }
- }
- })*/
-
- $("#button_toggle_filters").on("click", function (){
- if(first_time){
- $("#filters_div").removeClass("invisible-search")
- first_time=false
- }
- else
- $("#filters_div").fadeToggle();
- })
-
- $(".user-movies-list").on("click", function (){
- let children = $(this).children()
- let first = true
- for (let item of children){
- if(first){
- first = !first
- }
- else{
- $(item).fadeToggle();
- }
- }
- $(this).toggleClass("hidden-class")
- })
-
- $(".search-button").on("click",function () {
- elements = $(".elements")
- let filter = $("#searchGenre").val()
- console.log('\''+filter+'\'')
- console.log(elements)
- if(filter.length==0){
- console.log("HERE")
- for (let item of elements) {
- $(item).removeClass("visibility")
- }
- }
- for (let item of elements) {
- $(item).removeClass("visibility")
- let genre = $(item).children(".card-genre")
- let visible = false;
- console.log(genre.length)
- for (let g of genre) {
- if (( $(g).text().toLowerCase() === filter.toLowerCase())){
- console.log(item.text + ' ' + $(g).text())
- visible = true
- $(item).removeClass("visibility")
- break;
- }
- }
- if(!visible){
- $(item).addClass("visibility")
- }
-
- }
- });
-
- $(".button-delete-movie").on("click",function (){
- let button = $(this)
- let url = "/api/movies/delete/" + $(button).attr("movie-id")
- ajaxCallDelete(url,button)
- })
- $(".button-delete-actor").on("click",function (){
- let button = $(this)
- let url = "/api/persons/delete/" + $(button).attr("person-id")
- ajaxCallDelete(url,button)
- })
- $(".button-delete-discussion").on("click",function (){
- let button = $(this)
- let url = "/api/discussions/delete/" + $(button).attr("discussion-id")
- ajaxCallDelete(url,button)
- })
-
- $(document.body).on("click",".button-confirm",function (){
-
- $(this).parent().parent().fadeOut(2000)
- })
- $(".person-movies").change(function (){
- if (this.value === "A"){
- $(".movie-directors").attr("hidden",true).prop("selected",false)
-
-
- $(".movies-actors").attr("hidden",false)
-
- }
- else{
- $(".movies-actors").attr("hidden",true).prop("selected",false)
- $(".movie-directors").attr("hidden",false)
- }
- })
- $(document.body).on("click",".button-add-favourite-list",function (){
- let button = $(this)
- let url = "/api/movies/like/"+ $(this).attr("movie-id") + "?userId="+ $(this).attr("user-id")
- ajaxCallLike(url,button,'like','Веќе е филмот допаднат!')
- })
- $(document.body).on("click",".button-remove-favourite-list",function (){
- let button = $(this)
- let url = "/api/movies/unlike/"+ $(this).attr("movie-id")+"?userId="+ $(this).attr("user-id")
- ajaxCallLike(url,button,'unlike','Немате оставено допаѓање на филмот!')
- })
- $(document.body).on("click",".button-add-genre-liked-list",function (){
- let button = $(this)
- let url = "/api/genres/like/"+ $(this).attr("genre-id") + "?userId="+ $(this).attr("user-id")
- ajaxCallLikeGenre(url,button,'like','Веќе ви се допаѓа жанрот!')
- })
- $(document.body).on("click",".button-remove-genre-liked-list",function (){
- let button = $(this)
- let url = "/api/genres/unlike/"+ $(this).attr("genre-id")+"?userId="+ $(this).attr("user-id")
- ajaxCallLikeGenre(url,button,'unlike','Немате оставено допаѓање на жанрот!')
- })
- $(document.body).on("click",".button-like-discussion",function (){
- let button = $(this)
- let url = "/api/discussions/like/"+ $(this).attr("discussion-id")+"?userId="+ $(this).attr("user-id")
- ajaxCallLikeDiscussion(url,button,'like','Веќе имате оставено допаѓање на дискусијата!')
- })
- $(document.body).on("click",".button-unlike-discussion",function (){
- let button = $(this)
- let url = "/api/discussions/unlike/"+ $(this).attr("discussion-id")+"?userId="+ $(this).attr("user-id")
- ajaxCallLikeDiscussion(url,button,'unlike','Немате оставено допаѓање на дискусијата!')
- })
- $(document.body).on("click",".button-like-discussion-alt",function (){
- let button = $(this)
- let url = "/api/discussions/like/"+ $(this).attr("discussion-id")+"?userId="+ $(this).attr("user-id")
- ajaxCallLikeDiscussionAlternative(url,button,'like','Веќе имате оставено допаѓање на дискусијата!')
- })
- $(document.body).on("click",".button-unlike-discussion-alt",function (){
- let button = $(this)
- let url = "/api/discussions/unlike/"+ $(this).attr("discussion-id")+"?userId="+ $(this).attr("user-id")
- ajaxCallLikeDiscussionAlternative(url,button,'unlike','Немате оставено допаѓање на дискусијата!')
- })
- $(".discussion-type").change(function (){
- if (this.value === "M"){
- $(".persons-discussion").hide()
- $(".movies-discussion").show()
-
-
- }
- else{
- $(".movies-discussion").hide()
- $(".persons-discussion").show()
- }
- })
-
-
-})
-function ajaxCallLike(url,button,type,message){
- $.ajax({
- url:url,
- success:function (data){
- if (data){
- let el = $(button).parent().siblings().eq(3)
- console.log(el)
- if (type=="like") {
- $(el).html(parseInt($(el).text()) + 1)
- console.log("da")
- }
- else
- $(el).html(parseInt($(el).text()) - 1)
- $(button).css("display","none")
- let userId = $(button).attr("user-id")
- let movieId=$(button).attr("movie-id")
- if (type==='like') {
- $(button).parent().append("💔")
- console.log("da")
- }
- else{
- $(button).parent().append("❤")
- }
- likes_count = $("#movie_likes_count")
- count = Number($(likes_count).text())
- if(type==="like")
- count++
- else
- count--
- likes_count.text(count)
- $(button).remove()
- }
- else {
- $(button).parent().append("
+
-