Index: src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java
===================================================================
--- src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java	(revision 7fafeade7bf35835297971768f9dc93f768c1ff0)
+++ src/main/java/com/wediscussmovies/project/service/impl/DiscussionServiceImpl.java	(revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a)
@@ -1,5 +1,5 @@
 package com.wediscussmovies.project.service.impl;
 
-import com.wediscussmovies.project.model.Discussion;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.repository.DiscussionRepository;
 import com.wediscussmovies.project.service.DiscussionService;
Index: src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java
===================================================================
--- src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java	(revision 7fafeade7bf35835297971768f9dc93f768c1ff0)
+++ src/main/java/com/wediscussmovies/project/service/impl/GenreServiceImpl.java	(revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a)
@@ -1,5 +1,5 @@
 package com.wediscussmovies.project.service.impl;
 
-import com.wediscussmovies.project.model.Genre;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.repository.GenreRepository;
 import com.wediscussmovies.project.service.GenreService;
@@ -24,10 +24,10 @@
     @Override
     public List<Genre> findAllByType(String genre) {
-        return genreRepository.findAllByGenre(genre);
+        return genreRepository.findAllByGenreType(genre);
     }
 
     @Override
     public Genre save(String genreName) {
-        Genre genre = new Genre(genreName);
+       Genre genre = new Genre(genreName);
         return genreRepository.save(genre);
     }
Index: src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java
===================================================================
--- src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java	(revision 7fafeade7bf35835297971768f9dc93f768c1ff0)
+++ src/main/java/com/wediscussmovies/project/service/impl/MovieServiceImpl.java	(revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a)
@@ -1,5 +1,5 @@
 package com.wediscussmovies.project.service.impl;
 
-import com.wediscussmovies.project.model.Movie;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.repository.MovieRepository;
 import com.wediscussmovies.project.service.MovieService;
@@ -23,5 +23,5 @@
 
     @Override
-    public Optional<Movie> findById(Long id) {
+    public Optional<Movie> findById(Integer id) {
         return movieRepository.findById(1);
     }
@@ -33,6 +33,6 @@
 
     @Override
-    public void deleteById(Long id) {
-        movieRepository.deleteById(0);
+    public void deleteById(Integer id) {
+        movieRepository.deleteById(id);
     }
 
Index: src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java
===================================================================
--- src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java	(revision 7fafeade7bf35835297971768f9dc93f768c1ff0)
+++ src/main/java/com/wediscussmovies/project/service/impl/PersonServiceImpl.java	(revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a)
@@ -1,5 +1,5 @@
 package com.wediscussmovies.project.service.impl;
 
-import com.wediscussmovies.project.model.Person;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.model.enumerations.PersonType;
 import com.wediscussmovies.project.repository.PersonRepository;
@@ -21,10 +21,10 @@
     @Override
     public List<Person> findAllDirectors() {
-        return personRepository.findAllByPersonType(PersonType.D);
+        return personRepository.findAllByType('D');
     }
 
     @Override
     public Optional<Person> findActorById(Integer id) {
-        return personRepository.findPersonByPerson_idAndPersonType(id, PersonType.A);
+        return personRepository.findPersonByPersonIdAndType(id, 'A');
     }
 
@@ -36,10 +36,10 @@
     @Override
     public Optional<Person> findDirectorById(Integer id) {
-        return personRepository.findPersonByPerson_idAndPersonType(id, PersonType.D);
+        return personRepository.findPersonByPersonIdAndType(id, 'D');
     }
 
     @Override
     public List<Person> findAllActors() {
-        return personRepository.findAllByPersonType(PersonType.A);
+        return personRepository.findAllByType('A');
     }
 
@@ -54,20 +54,20 @@
     @Override
     public List<Person> findActorsByNameLike(String name) {
-        return personRepository.findAllByPersonTypeAndNameLike(PersonType.A, name);
+        return personRepository.findAllByTypeAndNameLike('A', name);
     }
 
     @Override
     public List<Person> findActorsBySurnameLike(String surname) {
-        return personRepository.findAllByPersonTypeAndSurnameLike(PersonType.A, surname);
+        return personRepository.findAllByTypeAndSurnameLike('A', surname);
     }
 
     @Override
     public List<Person> findDirectorsByNameLike(String name) {
-        return personRepository.findAllByPersonTypeAndNameLike(PersonType.D, name);
+        return personRepository.findAllByTypeAndNameLike('D', name);
     }
 
     @Override
     public List<Person> findDirectorsBySurnameLike(String surname) {
-        return personRepository.findAllByPersonTypeAndSurnameLike(PersonType.D, surname);
+        return personRepository.findAllByTypeAndSurnameLike('D', surname);
     }
 }
Index: src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java
===================================================================
--- src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java	(revision 7fafeade7bf35835297971768f9dc93f768c1ff0)
+++ src/main/java/com/wediscussmovies/project/service/impl/ReplyServiceImpl.java	(revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a)
@@ -1,5 +1,5 @@
 package com.wediscussmovies.project.service.impl;
 
-import com.wediscussmovies.project.model.Reply;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.repository.ReplyRepository;
 import com.wediscussmovies.project.service.ReplyService;
Index: src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java
===================================================================
--- src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java	(revision 7fafeade7bf35835297971768f9dc93f768c1ff0)
+++ src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java	(revision 3ded84dfbf8ff25bf27cc822ac97b84a063fa95a)
@@ -1,6 +1,5 @@
 package com.wediscussmovies.project.service.impl;
 
-import com.wediscussmovies.project.model.PasswordEncoder;
-import com.wediscussmovies.project.model.User;
+import com.wediscussmovies.project.model.*;
 import com.wediscussmovies.project.model.exception.PasswordsDontMatchException;
 import com.wediscussmovies.project.model.exception.UserWithEmailAlreadyExists;
@@ -8,9 +7,7 @@
 import com.wediscussmovies.project.repository.UserRepository;
 import com.wediscussmovies.project.service.UserService;
-import org.springframework.http.HttpRequest;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.security.NoSuchAlgorithmException;
 import java.util.Optional;
 
