From db5fc3d8595e0017f1b00c9dc650af5e14fbd1de Mon Sep 17 00:00:00 2001
From: Dado555 <dmalic555@gmail.com>
Date: Sun, 4 Sep 2022 17:12:16 +0200
Subject: [PATCH] fixes for java and drools part .. ugh

---
 gleficu-frontend/package-lock.json            |  11 +
 gleficu-frontend/package.json                 |   1 +
 gleficu-frontend/public/index.html            |   1 +
 .../src/components/users/RecommendMeMovie.vue |  90 +++--
 gleficu-frontend/src/routes.js                |   8 +-
 .../src/services/javaMovieRecommend.js        |  17 +
 gleficu-frontend/src/services/movieService.js |   9 +
 .../com/sbnz/rules/genreFilterFinal.drl       |   3 +
 .../com/sbnz/rules/genreFilterRated.drl       |   3 +
 .../com/sbnz/rules/genreFilterTag.drl         |   3 +
 .../com/sbnz/rules/genreFilterWatched.drl     |   3 +
 .../com/sbnz/rules/genreFilterWishlist.drl    |   3 +
 .../com/sbnz/rules/genrebygenderandage.drl    |   3 +
 .../com/sbnz/rules/movieFilterActors.drl      |  39 +-
 .../com/sbnz/rules/movieFilterDirector.drl    |  39 +-
 .../com/sbnz/rules/movieFilterRating.drl      |  29 +-
 .../com/sbnz/rules/movieFilterWriter.drl      |  39 +-
 .../com/sbnz/rules/movieFilterYear.drl        |  97 ++---
 .../main/resources/com/sbnz/rules/status.drl  |   9 +-
 .../java/com/sbnz/gleficu/DbInitializer.java  | 123 ------
 .../com/sbnz/gleficu/config/BeanConfig.java   |   4 +-
 .../gleficu/config/ListsDBAutoConfig.java     |  66 ++++
 .../gleficu/config/MovieDBAutoConfig.java     |  66 ++++
 .../gleficu/config/RestAuthEntryPoint.java    |  35 --
 .../sbnz/gleficu/config/SecurityConfig.java   |  70 +---
 .../sbnz/gleficu/config/UserDBAutoConfig.java |  66 ++++
 .../GenreRecommendByTagsController.java       |   8 +-
 .../gleficu/controller/UserController.java    |  39 --
 .../com/sbnz/gleficu/dto/AuthRequestDTO.java  |  15 -
 .../com/sbnz/gleficu/dto/AuthResponseDTO.java |  14 -
 .../java/com/sbnz/gleficu/model/BaseUser.java |  13 +-
 .../java/com/sbnz/gleficu/model/Genre.java    |   7 +-
 .../java/com/sbnz/gleficu/model/Movie.java    |  39 --
 .../com/sbnz/gleficu/model/RatedMovie.java    |   4 +-
 .../sbnz/gleficu/model/RecommendRequest.java  |   1 +
 .../main/java/com/sbnz/gleficu/model/Tag.java |  22 --
 .../java/com/sbnz/gleficu/model/User.java     |  72 ----
 .../com/sbnz/gleficu/model/WatchedMovie.java  |  25 --
 .../com/sbnz/gleficu/model/WishlistMovie.java |  25 --
 .../model/facts/MoviesFilterFilmCrewFact.java |   2 +-
 .../facts/MoviesFilterYearRatingFact.java     |   2 +-
 .../gleficu/model/lists/WatchedMovie.java     |  48 +++
 .../gleficu/model/lists/WishlistMovie.java    |  48 +++
 .../com/sbnz/gleficu/model/movie/Movie.java   |  84 ++++
 .../com/sbnz/gleficu/model/movie/Tag.java     |  36 ++
 .../model/phases/GenresFilterByTagsPhase.java |   2 +-
 ...GenresFilterRatedWatchedWishlistPhase.java |   8 +-
 .../phases/MovieFilterByFilmCrewPhase.java    |   2 +-
 .../phases/MovieFilterByYearRatingPhase.java  |   2 +-
 .../com/sbnz/gleficu/model/user/User.java     |  17 +
 .../com/sbnz/gleficu/model/user/UserDb.java   |  46 +++
 .../sbnz/gleficu/repository/GenreRepo.java    |   9 -
 .../sbnz/gleficu/repository/RequestRepo.java  |   9 -
 .../com/sbnz/gleficu/repository/UserRepo.java |  12 -
 .../{ => lists}/WatchedMovieRepo.java         |   4 +-
 .../{ => lists}/WishlistMovieRepo.java        |   4 +-
 .../repository/{ => movie}/MovieRepo.java     |   4 +-
 .../repository/{ => movie}/TagRepo.java       |   4 +-
 .../gleficu/repository/user/UserRepo.java     |  12 +
 .../service/GenreRecommendByTagsService.java  | 361 +++++++++---------
 .../com/sbnz/gleficu/service/UserService.java |  23 --
 .../java/com/sbnz/gleficu/util/JwtFilter.java |  83 ----
 .../java/com/sbnz/gleficu/util/JwtUtil.java   |  75 ----
 .../com/sbnz/gleficu/util/TokenBasedAuth.java |  36 --
 .../src/main/resources/application.properties |  23 +-
 .../main/resources/templates/ageTemplate.drt  |   5 +-
 ...enreDistributionByGenderAndAgeTemplate.drt |   3 +
 scrape-movie-service/api/tags.go              |   6 +-
 scrape-movie-service/models/tags.go           |  27 +-
 scrape-movie-service/routes/routes.go         |   2 +-
 70 files changed, 1030 insertions(+), 1090 deletions(-)
 create mode 100644 gleficu-frontend/src/services/javaMovieRecommend.js
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/DbInitializer.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/config/ListsDBAutoConfig.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/config/MovieDBAutoConfig.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/config/RestAuthEntryPoint.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/config/UserDBAutoConfig.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/controller/UserController.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/dto/AuthRequestDTO.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/dto/AuthResponseDTO.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/Movie.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/Tag.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/User.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/WatchedMovie.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/WishlistMovie.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/lists/WatchedMovie.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/lists/WishlistMovie.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/movie/Movie.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/movie/Tag.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/user/User.java
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/model/user/UserDb.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/repository/GenreRepo.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/repository/RequestRepo.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/repository/UserRepo.java
 rename gleficu/src/main/java/com/sbnz/gleficu/repository/{ => lists}/WatchedMovieRepo.java (75%)
 rename gleficu/src/main/java/com/sbnz/gleficu/repository/{ => lists}/WishlistMovieRepo.java (75%)
 rename gleficu/src/main/java/com/sbnz/gleficu/repository/{ => movie}/MovieRepo.java (69%)
 rename gleficu/src/main/java/com/sbnz/gleficu/repository/{ => movie}/TagRepo.java (69%)
 create mode 100644 gleficu/src/main/java/com/sbnz/gleficu/repository/user/UserRepo.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/service/UserService.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/util/JwtFilter.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/util/JwtUtil.java
 delete mode 100644 gleficu/src/main/java/com/sbnz/gleficu/util/TokenBasedAuth.java

diff --git a/gleficu-frontend/package-lock.json b/gleficu-frontend/package-lock.json
index 59c77b3..a80033f 100644
--- a/gleficu-frontend/package-lock.json
+++ b/gleficu-frontend/package-lock.json
@@ -12,6 +12,7 @@
         "@fortawesome/free-regular-svg-icons": "^6.1.2",
         "@fortawesome/free-solid-svg-icons": "^6.1.2",
         "@fortawesome/vue-fontawesome": "^2.0.8",
+        "@voerro/vue-tagsinput": "^2.7.1",
         "autoprefixer": "^9.8.6",
         "awesome-vue-star-rating": "^1.0.9",
         "axios": "^0.21.4",
@@ -2266,6 +2267,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@voerro/vue-tagsinput": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/@voerro/vue-tagsinput/-/vue-tagsinput-2.7.1.tgz",
+      "integrity": "sha512-G7ClILHgtc/D1vEw9qp6dlsAstlhwLDkPvEp6w1iY/dmSzu4hhxaMk8jyahjxQRDgiLlrAikESOsfkVhy18YwQ=="
+    },
     "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
@@ -18914,6 +18920,11 @@
         }
       }
     },
+    "@voerro/vue-tagsinput": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/@voerro/vue-tagsinput/-/vue-tagsinput-2.7.1.tgz",
+      "integrity": "sha512-G7ClILHgtc/D1vEw9qp6dlsAstlhwLDkPvEp6w1iY/dmSzu4hhxaMk8jyahjxQRDgiLlrAikESOsfkVhy18YwQ=="
+    },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
diff --git a/gleficu-frontend/package.json b/gleficu-frontend/package.json
index bfbf9e5..69ada2b 100644
--- a/gleficu-frontend/package.json
+++ b/gleficu-frontend/package.json
@@ -14,6 +14,7 @@
     "@fortawesome/free-regular-svg-icons": "^6.1.2",
     "@fortawesome/free-solid-svg-icons": "^6.1.2",
     "@fortawesome/vue-fontawesome": "^2.0.8",
+    "@voerro/vue-tagsinput": "^2.7.1",
     "autoprefixer": "^9.8.6",
     "awesome-vue-star-rating": "^1.0.9",
     "axios": "^0.21.4",
diff --git a/gleficu-frontend/public/index.html b/gleficu-frontend/public/index.html
index 8f255fc..f2624a0 100644
--- a/gleficu-frontend/public/index.html
+++ b/gleficu-frontend/public/index.html
@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@voerro/vue-tagsinput@2.7.0/dist/style.css">
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body class="bg-gray-900 text-white">
diff --git a/gleficu-frontend/src/components/users/RecommendMeMovie.vue b/gleficu-frontend/src/components/users/RecommendMeMovie.vue
index c0a98ac..8e68c7d 100644
--- a/gleficu-frontend/src/components/users/RecommendMeMovie.vue
+++ b/gleficu-frontend/src/components/users/RecommendMeMovie.vue
@@ -1,6 +1,9 @@
 <template>
   <div class="container mx-auto px-4 py-16">
-    <button id="recommendMovieBtn" class="rounded bg-yellow-500 text-white cursor-auto">Recommend Me A Movie!</button>
+    <voerro-tags-input id="recommendMovieSearch" element-id="tags" v-model="selectedTags" :existing-tags="existingTags"
+                       :typeahead="true" style="margin-bottom: 30px" @change="onChange($event)"/>
+
+    <button id="recommendMovieBtn" class="rounded bg-yellow-500 text-white cursor-auto" @click="recommendMovie()">Recommend Me A Movie!</button>
     <br/> <br/>
 
     <div class="container mx-auto border-b border-gray-600 px-4 py-4">
@@ -33,6 +36,10 @@
 <script>
 // import MovieItem from "../items/MovieItem";
 import PopularMovies from "@/components/front/PopularMovies";
+import {movieService} from "@/services/movieService";
+import VoerroTagsInput from "@voerro/vue-tagsinput";
+import {authService} from "@/services/authService";
+import {javaMovieRecommend} from "@/services/javaMovieRecommend";
 
 let currentPage = 1;
 
@@ -40,52 +47,89 @@ export default {
   name: "RecommendMeMovie",
   components: {
     PopularMovies,
+    VoerroTagsInput
     // MovieItem,
   },
 
   data: function() {
     return {
       movies: [],
-      // genres: [],
+      searchResult: [],
+      searchTerm: "",
+      showSearchResult: false,
+      searchResultType: "none",
+      selectedTags: [],
+      existingTags: [
+        { key: 'web-development', value: 'Web Development' },
+        { key: 'php', value: 'PHP' },
+        { key: 'javascript', value: 'JavaScript' },
+      ],
     };
   },
 
-  // async mounted() {
-  //   await this.fetchGenres();
-  //   try {
-  //     const response = await this.$http.get("/movie/popular");
-  //     this.movies = response.data.results;
-  //   } catch (error) {
-  //     console.log(error);
-  //   }
-  // },
+  mounted() {
+    this.keyboardEvents();
+  },
 
   methods: {
-    // async fetchGenres() {
-    //   try {
-    //     const response = await this.$http.get("/genre/movie/list");
-    //     this.genres = response.data.genres;
-    //     console.log("Genres: " + this.genres.toString());
-    //   } catch (error) {
-    //     console.log(error);
-    //   }
-    // },
+    recommendMovie() {
+      let userId = authService.getJwtField("userId");
+      if(this.selectedTags.length < 1 || userId === null) {
+        alert("Input some tags!")
+      } else {
+        let tempTags = [];
+        for(let t of this.selectedTags) {
+          tempTags.push(t.key);
+        }
+        let payload = {
+          tags: tempTags,
+          userId: userId
+        };
+        console.log(payload);
+        javaMovieRecommend.getMovieRecommends(payload).then((response) => {
+          console.log(response.data);
+        });
+      }
+    },
+
+    onChange(value) {
+      if(value.length > 2) {
+        clearTimeout(this.debounce);
+        this.debounce = setTimeout(() => {
+          this.fetchSearch(value);
+        }, 600);
+      }
+    },
+
+    async fetchSearch(name) {
+      try {
+        movieService.searchTags(name).then((response) => {
+          this.existingTags = [];
+          for(let str of response.data) {
+            let temp = {key: str, value: str};
+            this.existingTags.push(temp);
+          }
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    },
+
     next() {
       currentPage += 1;
       console.log(currentPage);
-      // this.fetchMovies(currentPage);
     },
+
     previous() {
       currentPage -= 1;
       console.log(currentPage);
-      // this.fetchMovies(currentPage);
     },
   },
 }
 </script>
 
 <style scoped>
-#recommendMovieBtn {
+#recommendMovieBtn, #recommendMovieSearch{
   margin-left: 10%;
   width: 1200px;
   height: 80px;
diff --git a/gleficu-frontend/src/routes.js b/gleficu-frontend/src/routes.js
index d1b8a30..a435444 100644
--- a/gleficu-frontend/src/routes.js
+++ b/gleficu-frontend/src/routes.js
@@ -78,10 +78,10 @@ let router = new VueRouter({
       path: "/recommend-movie",
       name: "recommendMovie",
       component: RecommendMeMovie,
-      meta: {
-        authenticated: true,
-        authorities: ["USER"],
-      }
+      // meta: {
+      //   authenticated: true,
+      //   authorities: ["USER"],
+      // }
     },
     {
       path: '/login',
diff --git a/gleficu-frontend/src/services/javaMovieRecommend.js b/gleficu-frontend/src/services/javaMovieRecommend.js
new file mode 100644
index 0000000..1051863
--- /dev/null
+++ b/gleficu-frontend/src/services/javaMovieRecommend.js
@@ -0,0 +1,17 @@
+import axios from "axios";
+
+const API_URL = 'http://localhost:3004/api/recommend/'
+const GET_GENRES = API_URL + "genre-by-tags"
+
+class JavaMovieRecommend {
+    getMovieRecommends(payload) {
+        return axios.get(GET_GENRES + `?user_id=${payload.userId}&tags=${payload.tags}`,
+            {
+                headers: {
+                    Authorization: "Bearer " + localStorage.getItem("id_token"),
+                }
+            }
+        );
+    }
+}
+export const javaMovieRecommend = new JavaMovieRecommend();
\ No newline at end of file
diff --git a/gleficu-frontend/src/services/movieService.js b/gleficu-frontend/src/services/movieService.js
index 72bc8fa..a833427 100644
--- a/gleficu-frontend/src/services/movieService.js
+++ b/gleficu-frontend/src/services/movieService.js
@@ -9,6 +9,7 @@ const GET_MOVIE_BY_IMDB_ID = API_URL + "getByImdbId"
 const WATCH_MAGNET = API_URL + "watchMagnet"
 const SEARCH_MOVIES = API_URL + "searchMovies"
 const UPDATE_MOVIE = API_URL + "updateMovie"
+const SEARCH_TAGS = API_URL + "searchTags"
 
 class MovieService {
     getByTitle(movie) {
@@ -80,6 +81,14 @@ class MovieService {
             },
         });
     }
+
+    searchTags(tagName) {
+        return axios.get(SEARCH_TAGS + `/${tagName}`, {
+            headers: {
+                Authorization: "Bearer " + localStorage.getItem("id_token"),
+            },
+        })
+    }
 }
 
 export const movieService = new MovieService();
\ No newline at end of file
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterFinal.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterFinal.drl
index 6d358ae..bd8d372 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterFinal.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterFinal.drl
@@ -5,6 +5,9 @@ import java.util.Set;
 import java.util.HashSet;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterRated.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterRated.drl
index 1f3eb76..bad151e 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterRated.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterRated.drl
@@ -4,6 +4,9 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterTag.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterTag.drl
index de8c829..917ef54 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterTag.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterTag.drl
@@ -4,6 +4,9 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWatched.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWatched.drl
index cecacb0..607d43e 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWatched.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWatched.drl
@@ -4,6 +4,9 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWishlist.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWishlist.drl
index 8631b1d..f1fe4fe 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWishlist.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/genreFilterWishlist.drl
@@ -4,6 +4,9 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/genrebygenderandage.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/genrebygenderandage.drl
index 6b8642f..f6fe468 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/genrebygenderandage.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/genrebygenderandage.drl
@@ -1,6 +1,9 @@
 package com.sbnz.templates;
 import java.util.Set;
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterActors.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterActors.drl
index f08bcaa..ca599d1 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterActors.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterActors.drl
@@ -4,27 +4,30 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
 
-rule "Filter filmova po glavnim glumcima"
-    agenda-group "Filter filmova po filmskoj ekipi"
-    no-loop true
-    when
-        $phase: MovieFilterByFilmCrewPhase($actors: actors, $movies: movies)
+// rule "Filter filmova po glavnim glumcima"
+//     agenda-group "Filter filmova po filmskoj ekipi"
+//     no-loop true
+//     when
+//         $phase: MovieFilterByFilmCrewPhase($actors: actors, $movies: movies)
 
-        accumulate (
-            FilmCrew($id: id) from $actors;
-            $actorsIn: collectSet($id)
-        )
+//         accumulate (
+//             FilmCrew($id: id) from $actors;
+//             $actorsIn: collectSet($id)
+//         )
 
-        accumulate (
-            $retMovie: Movie($movieId: id, $movieActors: actors) from $movies 
-            and FilmCrew($id: id, id memberOf $actorsIn) from $movieActors;
-            $retMovies: collectSet($retMovie)
-        )
-    then
-        System.out.println("(glumci) Filtriranje filmova..");
-        insert(new MoviesFilterFilmCrewFact($retMovies));
-end
\ No newline at end of file
+//         accumulate (
+//             $retMovie: Movie($movieId: id, $movieActors: actors) from $movies 
+//             and FilmCrew($id: id, id memberOf $actorsIn) from $movieActors;
+//             $retMovies: collectSet($retMovie)
+//         )
+//     then
+//         System.out.println("(glumci) Filtriranje filmova..");
+//         insert(new MoviesFilterFilmCrewFact($retMovies));
+// end
\ No newline at end of file
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterDirector.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterDirector.drl
index ffba3c4..c54c971 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterDirector.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterDirector.drl
@@ -4,28 +4,31 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
 
-rule "Filter filmova po direktoru"
-    agenda-group "Filter filmova po filmskoj ekipi"
-    no-loop true
-    when
-        $phase: MovieFilterByFilmCrewPhase($directors: directors, $movies: movies)
+// rule "Filter filmova po direktoru"
+//     agenda-group "Filter filmova po filmskoj ekipi"
+//     no-loop true
+//     when
+//         $phase: MovieFilterByFilmCrewPhase($directors: directors, $movies: movies)
 
-        accumulate (
-            FilmCrew($id: id) from $directors;
-            $directorsIn: collectSet($id)
-        )
+//         accumulate (
+//             FilmCrew($id: id) from $directors;
+//             $directorsIn: collectSet($id)
+//         )
 
-        accumulate (
-            $retMovie: Movie($movieId: id, $movieDirector: director) from $movies 
-            and FilmCrew(id == $movieDirector.getId(), id memberOf $directorsIn);
-            $retMovies: collectSet($retMovie)
-        )
-    then
-        System.out.println("(direktori) Filtriranje filmova..");
-        insert(new MoviesFilterFilmCrewFact($retMovies));
+//         accumulate (
+//             $retMovie: Movie($movieId: id, $movieDirector: director) from $movies 
+//             and FilmCrew(id == $movieDirector.getId(), id memberOf $directorsIn);
+//             $retMovies: collectSet($retMovie)
+//         )
+//     then
+//         System.out.println("(direktori) Filtriranje filmova..");
+//         insert(new MoviesFilterFilmCrewFact($retMovies));
 
-end
\ No newline at end of file
+// end
\ No newline at end of file
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterRating.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterRating.drl
index 238c59e..473361e 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterRating.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterRating.drl
@@ -4,22 +4,25 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
 
-rule "Filter filmova po ocjeni sa imdb"
-    agenda-group "Filter filmova godine i ocjena"
-    no-loop true
-    when
-        $phase: MovieFilterByYearRatingPhase($movies: movies, $ratingLimit: ratingLimit)
+// rule "Filter filmova po ocjeni sa imdb"
+//     agenda-group "Filter filmova godine i ocjena"
+//     no-loop true
+//     when
+//         $phase: MovieFilterByYearRatingPhase($movies: movies, $ratingLimit: ratingLimit)
 
-        accumulate (
-            $retMovie: Movie($movieId: id, $rating: criticsRating, criticsRating >= $ratingLimit) from $movies;
-            $retMovies: collectSet($retMovie)
-        )
-    then
-        System.out.println("(rejting) Filtriranje filmova..");
-        insert(new MoviesFilterYearRatingFact($retMovies));
+//         accumulate (
+//             $retMovie: Movie($movieId: id, $rating: criticsRating, criticsRating >= $ratingLimit) from $movies;
+//             $retMovies: collectSet($retMovie)
+//         )
+//     then
+//         System.out.println("(rejting) Filtriranje filmova..");
+//         insert(new MoviesFilterYearRatingFact($retMovies));
 
-end
\ No newline at end of file
+// end
\ No newline at end of file
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterWriter.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterWriter.drl
index d5ab5d4..9052b3b 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterWriter.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterWriter.drl
@@ -4,28 +4,31 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
 
-rule "Filter filmova po piscima"
-    agenda-group "Filter filmova po filmskoj ekipi"
-    no-loop true
-    when
-        $phase: MovieFilterByFilmCrewPhase($writers: writers, $movies: movies)
+// rule "Filter filmova po piscima"
+//     agenda-group "Filter filmova po filmskoj ekipi"
+//     no-loop true
+//     when
+//         $phase: MovieFilterByFilmCrewPhase($writers: writers, $movies: movies)
 
-        accumulate (
-            FilmCrew($id: id) from $writers;
-            $writersIn: collectSet($id)
-        )
+//         accumulate (
+//             FilmCrew($id: id) from $writers;
+//             $writersIn: collectSet($id)
+//         )
 
-        accumulate (
-            $retMovie: Movie($movieId: id, $movieWriters: writer) from $movies 
-            and FilmCrew($id: id, id memberOf $writersIn) from $movieWriters;
-            $retMovies: collectSet($retMovie)
-        )
-    then
-        System.out.println("(pisci) Filtriranje filmova..");
-        insert(new MoviesFilterFilmCrewFact($retMovies));
+//         accumulate (
+//             $retMovie: Movie($movieId: id, $movieWriters: writer) from $movies 
+//             and FilmCrew($id: id, id memberOf $writersIn) from $movieWriters;
+//             $retMovies: collectSet($retMovie)
+//         )
+//     then
+//         System.out.println("(pisci) Filtriranje filmova..");
+//         insert(new MoviesFilterFilmCrewFact($retMovies));
 
-end
\ No newline at end of file
+// end
\ No newline at end of file
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterYear.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterYear.drl
index 57c5b10..4935d42 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterYear.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/movieFilterYear.drl
@@ -4,54 +4,57 @@ import java.util.List;
 import java.util.Set;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
 
-rule "Filter filmova po starosti filma na osnovu godina korisnika - YOUNG"
-    agenda-group "Filter filmova godine i ocjena"
-    no-loop true
-    when
-        $phase: MovieFilterByYearRatingPhase($movies: movies, $yearLimit: yearLimit, $userAge: userAge, userAge == AgeRange.YOUNG)
-
-        accumulate (
-            $retMovie: Movie($movieId: id, $releaseYear: releaseYear, releaseYear >= ($yearLimit - 20)) from $movies;
-            $retMovies: collectSet($retMovie)
-        )
-    then
-        System.out.println("(starosna dob) Filtriranje filmova..");
-        insert(new MoviesFilterYearRatingFact($retMovies));
-
-end
-
-rule "Filter filmova po starosti filma na osnovu godina korisnika - MIDDLE"
-    agenda-group "Filter filmova godine i ocjena"
-    no-loop true
-    when
-        $phase: MovieFilterByYearRatingPhase($movies: movies, $yearLimit: yearLimit, $userAge: userAge, userAge == AgeRange.MIDDLE)
-
-        accumulate (
-            $retMovie: Movie($movieId: id, $releaseYear: releaseYear, releaseYear >= ($yearLimit-40)) from $movies;
-            $retMovies: collectSet($retMovie)
-        )
-    then
-        System.out.println("(starosna dob) Filtriranje filmova..");
-        insert(new MoviesFilterYearRatingFact($retMovies));
-
-end
-
-rule "Filter filmova po starosti filma na osnovu godina korisnika - OLDER"
-    agenda-group "Filter filmova godine i ocjena"
-    no-loop true
-    when
-        $phase: MovieFilterByYearRatingPhase($movies: movies, $yearLimit: yearLimit, $userAge: userAge, userAge == AgeRange.OLDER)
-
-        accumulate (
-            $retMovie: Movie($movieId: id, $releaseYear: releaseYear, releaseYear <= ($yearLimit-10)) from $movies;
-            $retMovies: collectSet($retMovie)
-        )
-    then
-        System.out.println("(starosna dob) Filtriranje filmova..");
-        insert(new MoviesFilterYearRatingFact($retMovies));
-
-end
\ No newline at end of file
+// rule "Filter filmova po starosti filma na osnovu godina korisnika - YOUNG"
+//     agenda-group "Filter filmova godine i ocjena"
+//     no-loop true
+//     when
+//         $phase: MovieFilterByYearRatingPhase($movies: movies, $yearLimit: yearLimit, $userAge: userAge, userAge == AgeRange.YOUNG)
+
+//         accumulate (
+//             $retMovie: Movie($movieId: id, $releaseYear: releaseYear, releaseYear >= ($yearLimit - 20)) from $movies;
+//             $retMovies: collectSet($retMovie)
+//         )
+//     then
+//         System.out.println("(starosna dob) Filtriranje filmova..");
+//         insert(new MoviesFilterYearRatingFact($retMovies));
+
+// end
+
+// rule "Filter filmova po starosti filma na osnovu godina korisnika - MIDDLE"
+//     agenda-group "Filter filmova godine i ocjena"
+//     no-loop true
+//     when
+//         $phase: MovieFilterByYearRatingPhase($movies: movies, $yearLimit: yearLimit, $userAge: userAge, userAge == AgeRange.MIDDLE)
+
+//         accumulate (
+//             $retMovie: Movie($movieId: id, $releaseYear: releaseYear, releaseYear >= ($yearLimit-40)) from $movies;
+//             $retMovies: collectSet($retMovie)
+//         )
+//     then
+//         System.out.println("(starosna dob) Filtriranje filmova..");
+//         insert(new MoviesFilterYearRatingFact($retMovies));
+
+// end
+
+// rule "Filter filmova po starosti filma na osnovu godina korisnika - OLDER"
+//     agenda-group "Filter filmova godine i ocjena"
+//     no-loop true
+//     when
+//         $phase: MovieFilterByYearRatingPhase($movies: movies, $yearLimit: yearLimit, $userAge: userAge, userAge == AgeRange.OLDER)
+
+//         accumulate (
+//             $retMovie: Movie($movieId: id, $releaseYear: releaseYear, releaseYear <= ($yearLimit-10)) from $movies;
+//             $retMovies: collectSet($retMovie)
+//         )
+//     then
+//         System.out.println("(starosna dob) Filtriranje filmova..");
+//         insert(new MoviesFilterYearRatingFact($retMovies));
+
+// end
\ No newline at end of file
diff --git a/gleficu-rules/src/main/resources/com/sbnz/rules/status.drl b/gleficu-rules/src/main/resources/com/sbnz/rules/status.drl
index 7d4e8e0..8f7f6e8 100644
--- a/gleficu-rules/src/main/resources/com/sbnz/rules/status.drl
+++ b/gleficu-rules/src/main/resources/com/sbnz/rules/status.drl
@@ -1,5 +1,8 @@
 package com.sbnz.templates;
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
@@ -8,7 +11,7 @@ import com.sbnz.gleficu.model.enums.*;
         agenda-group "Postavljanje starosne dobi"
         no-loop true
         when
-            $user: User(years >= "50", years < "100")
+            $user: User(age >= "50", age < "100")
         then
             System.out.println("Postavljanje starosne dobi za korisnika");
             modify ($user) { setAgeRange(AgeRange.OLDER) };
@@ -18,7 +21,7 @@ import com.sbnz.gleficu.model.enums.*;
         agenda-group "Postavljanje starosne dobi"
         no-loop true
         when
-            $user: User(years >= "25", years < "50")
+            $user: User(age >= "25", age < "50")
         then
             System.out.println("Postavljanje starosne dobi za korisnika");
             modify ($user) { setAgeRange(AgeRange.MIDDLE) };
@@ -28,7 +31,7 @@ import com.sbnz.gleficu.model.enums.*;
         agenda-group "Postavljanje starosne dobi"
         no-loop true
         when
-            $user: User(years >= "17", years < "25")
+            $user: User(age >= "17", age < "25")
         then
             System.out.println("Postavljanje starosne dobi za korisnika");
             modify ($user) { setAgeRange(AgeRange.YOUNG) };
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/DbInitializer.java b/gleficu/src/main/java/com/sbnz/gleficu/DbInitializer.java
deleted file mode 100644
index 808b885..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/DbInitializer.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.sbnz.gleficu;
-
-import com.sbnz.gleficu.model.*;
-import com.sbnz.gleficu.model.enums.*;
-import com.sbnz.gleficu.repository.*;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.stereotype.Component;
-
-import javax.transaction.Transactional;
-import java.util.Arrays;
-
-@Component
-public class DbInitializer implements ApplicationRunner {
-
-    private final GenreRepo genreRepo;
-
-    private final MovieRepo movieRepo;
-
-    private final RatedMovieRepo ratedMovieRepo;
-
-    private final RequestRepo requestRepo;
-
-    private final TagRepo tagRepo;
-
-    private final UserRepo userRepo;
-
-    private final WatchedMovieRepo watchedMovieRepo;
-
-    private final WishlistMovieRepo wishlistMovieRepo;
-
-    private final FilmCrewRepo filmCrewRepo;
-
-    public DbInitializer(GenreRepo genreRepo, MovieRepo movieRepo, RatedMovieRepo ratedMovieRepo,
-                         RequestRepo requestRepo, TagRepo tagRepo, UserRepo userRepo, FilmCrewRepo filmCrewRepo,
-                         WatchedMovieRepo watchedMovieRepo, WishlistMovieRepo wishlistMovieRepo) {
-        this.genreRepo = genreRepo;
-        this.movieRepo = movieRepo;
-        this.ratedMovieRepo = ratedMovieRepo;
-        this.requestRepo = requestRepo;
-        this.tagRepo = tagRepo;
-        this.userRepo = userRepo;
-        this.watchedMovieRepo = watchedMovieRepo;
-        this.wishlistMovieRepo = wishlistMovieRepo;
-        this.filmCrewRepo = filmCrewRepo;
-    }
-
-
-    @Override
-    @Transactional
-    public void run(ApplicationArguments args) throws Exception {
-        FilmCrew actor1 = new FilmCrew("Fullname1", "Biography1", CrewType.ACTOR);
-        FilmCrew actor2 = new FilmCrew("Fullname2", "Biography2", CrewType.ACTOR);
-        FilmCrew actor3 = new FilmCrew("Fullname3", "Biography3", CrewType.ACTOR);
-        FilmCrew actor4 = new FilmCrew("Fullname4", "Biography4", CrewType.ACTOR);
-        FilmCrew actor5 = new FilmCrew("Fullname5", "Biography5", CrewType.ACTOR);
-        FilmCrew actor6 = new FilmCrew("Fullname6", "Biography6", CrewType.ACTOR);
-
-        FilmCrew director1 = new FilmCrew("Fullname7", "Biography7", CrewType.DIRECTOR);
-        FilmCrew director2 = new FilmCrew("Fullname8", "Biography8", CrewType.DIRECTOR);
-        FilmCrew director3 = new FilmCrew("Fullname9", "Biography9", CrewType.DIRECTOR);
-
-        FilmCrew writer1 = new FilmCrew("Fullname10", "Biography10", CrewType.WRITER);
-        FilmCrew writer2 = new FilmCrew("Fullname11", "Biography11", CrewType.WRITER);
-        FilmCrew writer3 = new FilmCrew("Fullname12", "Biography12", CrewType.WRITER);
-
-        filmCrewRepo.saveAll(Arrays.asList(actor1, actor2, actor3, actor4, actor5, actor6,
-                director1, director2, director3, writer1, writer2, writer3));
-
-        Tag t1 = new Tag(MovieTag.ACTION_HERO);
-        Tag t2 = new Tag(MovieTag.CHASE);
-        Tag t3 = new Tag(MovieTag.CAR_CHASE);
-        Tag t4 = new Tag(MovieTag.VILLAIN);
-        Tag t5 = new Tag(MovieTag.TOUGH_GUY);
-
-        tagRepo.saveAll(Arrays.asList(t1, t2, t3, t4, t5));
-
-        Genre g1 = new Genre(MovieGenre.ACTION, Arrays.asList(t2, t3, t5));
-        Genre g2 = new Genre(MovieGenre.FANTASY, Arrays.asList(t1, t4));
-        Genre g3 = new Genre(MovieGenre.ADVENTURE, Arrays.asList(t1, t2, t3));
-
-        genreRepo.saveAll(Arrays.asList(g1, g2, g3));
-
-        Movie m1 = new Movie(7.0, Arrays.asList(t1, t4, t2), Arrays.asList(g1, g2),
-                Arrays.asList(actor1, actor2), MovieLanguage.ENGLISH, 1999,
-                director1, Arrays.asList(writer1, writer2));
-        Movie m2 = new Movie(7.5, Arrays.asList(t3, t5), Arrays.asList(g3),
-                Arrays.asList(actor3, actor4), MovieLanguage.ENGLISH, 2001,
-                director2, Arrays.asList(writer3));
-        Movie m3 = new Movie(8.0, Arrays.asList(t1, t2, t3, t4, t5), Arrays.asList(g1, g2, g3),
-                Arrays.asList(actor1, actor3, actor5), MovieLanguage.ENGLISH, 2010,
-                director3, Arrays.asList(writer1, writer3));
-
-        movieRepo.saveAll(Arrays.asList(m1, m2, m3));
-
-        User u1 = new User("mail", "pass", 22, "korisnik", Gender.MALE, Arrays.asList(t1, t4));
-
-        // userRepo.saveAll(Arrays.asList(u1));
-        u1 = userRepo.save(u1);
-
-        RatedMovie rm1 = new RatedMovie(m1, u1, 8.0, -1L);
-        RatedMovie rm2 = new RatedMovie(m2, u1, 7.0, -1L);
-        RatedMovie rm3 = new RatedMovie(m3, u1, 9.0, -1L);
-
-        ratedMovieRepo.saveAll(Arrays.asList(rm1, rm2, rm3));
-
-        WatchedMovie wm1 = new WatchedMovie(m1, u1, -1L);
-        WatchedMovie wm2 = new WatchedMovie(m2, u1, -1L);
-        WatchedMovie wm3 = new WatchedMovie(m3, u1, -1L);
-
-        watchedMovieRepo.saveAll(Arrays.asList(wm1, wm2, wm3));
-
-        WishlistMovie wsh1 = new WishlistMovie(m1, u1, -1L);
-        WishlistMovie wsh2 = new WishlistMovie(m2, u1, -1L);
-        WishlistMovie wsh3 = new WishlistMovie(m3, u1, -1L);
-
-        wishlistMovieRepo.saveAll(Arrays.asList(wsh1, wsh2, wsh3));
-
-        RecommendRequest request = new RecommendRequest(u1.getId(), Arrays.asList(t2, t5), AgeRange.YOUNG);
-
-        requestRepo.saveAll(Arrays.asList(request));
-    }
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/config/BeanConfig.java b/gleficu/src/main/java/com/sbnz/gleficu/config/BeanConfig.java
index 21b2979..c973c43 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/config/BeanConfig.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/config/BeanConfig.java
@@ -18,8 +18,8 @@ public void addCorsMappings(CorsRegistry registry) {
                 registry
                         .addMapping("/**")
                         .allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS")
-                        .allowedOrigins("http://localhost:8080")
-                        .allowCredentials(true);
+                        .allowedOrigins("*")
+                        .allowCredentials(false);
             }
         };
     }
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/config/ListsDBAutoConfig.java b/gleficu/src/main/java/com/sbnz/gleficu/config/ListsDBAutoConfig.java
new file mode 100644
index 0000000..626d4fa
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/config/ListsDBAutoConfig.java
@@ -0,0 +1,66 @@
+package com.sbnz.gleficu.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+
+@Configuration
+@PropertySource({"classpath:application.properties"})
+@EnableJpaRepositories(
+        basePackages = "com.sbnz.gleficu.repository.lists",
+        entityManagerFactoryRef = "listsEntityManager",
+        transactionManagerRef = "listsTransactionManager")
+public class ListsDBAutoConfig {
+    @Autowired
+    private Environment env;
+
+    @Bean
+    @Primary
+    public LocalContainerEntityManagerFactoryBean listsEntityManager() {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(listsDataSource());
+        em.setPackagesToScan(new String[] { "com.sbnz.gleficu.model.lists" });
+
+        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        em.setJpaVendorAdapter(vendorAdapter);
+        HashMap<String, Object> properties = new HashMap<>();
+        properties.put("hibernate.hbm2ddl.auto", env.getProperty("user.hibernate.hbm2ddl.auto"));
+        properties.put("hibernate.dialect", env.getProperty("user.hibernate.dialect"));
+        em.setJpaPropertyMap(properties);
+
+        return em;
+    }
+
+    @Primary
+    @Bean
+    public DataSource listsDataSource() {
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
+        dataSource.setUrl(env.getProperty("spring.third-datasource.url"));
+        dataSource.setUsername(env.getProperty("spring.third-datasource.username"));
+        dataSource.setPassword(env.getProperty("spring.third-datasource.password"));
+
+        return dataSource;
+    }
+
+    @Primary
+    @Bean
+    public PlatformTransactionManager listsTransactionManager() {
+
+        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(listsEntityManager().getObject());
+        return transactionManager;
+    }
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/config/MovieDBAutoConfig.java b/gleficu/src/main/java/com/sbnz/gleficu/config/MovieDBAutoConfig.java
new file mode 100644
index 0000000..9036295
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/config/MovieDBAutoConfig.java
@@ -0,0 +1,66 @@
+package com.sbnz.gleficu.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+
+@Configuration
+@PropertySource({"classpath:application.properties"})
+@EnableJpaRepositories(
+        basePackages = "com.sbnz.gleficu.repository.movie",
+        entityManagerFactoryRef = "movieEntityManager",
+        transactionManagerRef = "movieTransactionManager")
+public class MovieDBAutoConfig {
+    @Autowired
+    private Environment env;
+
+    @Bean
+    @Primary
+    public LocalContainerEntityManagerFactoryBean movieEntityManager() {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(movieDataSource());
+        em.setPackagesToScan(new String[] { "com.sbnz.gleficu.model.movie" });
+
+        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        em.setJpaVendorAdapter(vendorAdapter);
+        HashMap<String, Object> properties = new HashMap<>();
+        properties.put("hibernate.hbm2ddl.auto", env.getProperty("user.hibernate.hbm2ddl.auto"));
+        properties.put("hibernate.dialect", env.getProperty("user.hibernate.dialect"));
+        em.setJpaPropertyMap(properties);
+
+        return em;
+    }
+
+    @Primary
+    @Bean
+    public DataSource movieDataSource() {
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
+        dataSource.setUrl(env.getProperty("spring.second-datasource.url"));
+        dataSource.setUsername(env.getProperty("spring.second-datasource.username"));
+        dataSource.setPassword(env.getProperty("spring.second-datasource.password"));
+
+        return dataSource;
+    }
+
+    @Primary
+    @Bean
+    public PlatformTransactionManager movieTransactionManager() {
+
+        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(movieEntityManager().getObject());
+        return transactionManager;
+    }
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/config/RestAuthEntryPoint.java b/gleficu/src/main/java/com/sbnz/gleficu/config/RestAuthEntryPoint.java
deleted file mode 100644
index d2cd187..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/config/RestAuthEntryPoint.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.sbnz.gleficu.config;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sbnz.gleficu.util.ErrorObject;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.web.AuthenticationEntryPoint;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@Slf4j
-@Component("restAuthenticationEntryPoint")
-public class RestAuthEntryPoint implements AuthenticationEntryPoint {
-
-    private final ObjectMapper mapper;
-
-    @Autowired
-    public RestAuthEntryPoint(ObjectMapper mapper) {
-        this.mapper = mapper;
-    }
-
-    @Override
-    public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException {
-        response.setContentType("application/json");
-        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
-        ErrorObject errorObject = new ErrorObject(request, authException.getMessage(), HttpStatus.UNAUTHORIZED);
-        response.getOutputStream().println(mapper.writeValueAsString(errorObject));
-    }
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/config/SecurityConfig.java b/gleficu/src/main/java/com/sbnz/gleficu/config/SecurityConfig.java
index bfdd3f1..c2dd031 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/config/SecurityConfig.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/config/SecurityConfig.java
@@ -1,73 +1,17 @@
 package com.sbnz.gleficu.config;
 
-import com.sbnz.gleficu.service.UserService;
-import com.sbnz.gleficu.util.JwtFilter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
-@EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true,
-        securedEnabled = true,
-        jsr250Enabled = true)
+@Configuration
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
-    private final UserService userService;
-    private final JwtFilter jwtFilter;
-    private final PasswordEncoder passwordEncoder;
-    private final RestAuthEntryPoint restAuthenticationEntryPoint;
-
-    @Autowired
-    public SecurityConfig(UserService userService, JwtFilter jwtFilter, PasswordEncoder passwordEncoder, RestAuthEntryPoint restAuthenticationEntryPoint) {
-        this.userService = userService;
-        this.jwtFilter = jwtFilter;
-        this.passwordEncoder = passwordEncoder;
-        this.restAuthenticationEntryPoint = restAuthenticationEntryPoint;
-    }
-
     @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(userService).passwordEncoder(this.passwordEncoder);
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        final String unosenjeZahtjeva = "UNOSENJE_ZAHTJEVA";
-        final String popunjavanjeUpitnika = "POPUNJAVANJE_UPITNIKA";
-        final String dobavljanjeZahtjevaZaKorisnika = "DOBAVLJANJE_ZAHTJEVA_ZA_KORISNIKA";
-
-        http = http.cors().and().csrf().disable();
-
-        http = http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and();
-
-        http.exceptionHandling().authenticationEntryPoint(restAuthenticationEntryPoint);
-
-        http.authorizeRequests()
-
-                .antMatchers(HttpMethod.POST, "/api/korisnici/prijava").permitAll()
-                .antMatchers(HttpMethod.POST, "/api/detekcija-nepravilnosti").permitAll()
-                .antMatchers(HttpMethod.POST, "/api/zahtjev-za-dozvolu").hasAuthority(unosenjeZahtjeva)
-                .antMatchers(HttpMethod.GET, "/api/korisnici/{id}/odobreni-zahtjevi").hasAuthority(dobavljanjeZahtjevaZaKorisnika)
-                .antMatchers(HttpMethod.GET, "/api/korisnici/{korisnikId}/odobreni-zahtjevi/{zahtjevId}").hasAuthority(dobavljanjeZahtjevaZaKorisnika)
-                .antMatchers(HttpMethod.POST, "/api/korisnicki-upitnik").hasAuthority(popunjavanjeUpitnika)
-                .antMatchers(HttpMethod.GET, "/api/kalibri").permitAll()
+    public void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable().authorizeRequests()
+                .antMatchers("/").permitAll()
+                .antMatchers(HttpMethod.GET,"/api/recommend/genre-by-tags").permitAll()
                 .anyRequest().authenticated();
-
-        http.addFilterBefore(jwtFilter,
-                BasicAuthenticationFilter.class);
-    }
-
-    @Override
-    @Bean
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
     }
 }
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/config/UserDBAutoConfig.java b/gleficu/src/main/java/com/sbnz/gleficu/config/UserDBAutoConfig.java
new file mode 100644
index 0000000..8404dab
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/config/UserDBAutoConfig.java
@@ -0,0 +1,66 @@
+package com.sbnz.gleficu.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
+import org.springframework.transaction.PlatformTransactionManager;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+
+@Configuration
+@PropertySource({"classpath:application.properties"})
+@EnableJpaRepositories(
+        basePackages = "com.sbnz.gleficu.repository.user",
+        entityManagerFactoryRef = "userEntityManager",
+        transactionManagerRef = "userTransactionManager")
+public class UserDBAutoConfig {
+    @Autowired
+    private Environment env;
+
+    @Bean
+    @Primary
+    public LocalContainerEntityManagerFactoryBean userEntityManager() {
+        LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
+        em.setDataSource(userDataSource());
+        em.setPackagesToScan(new String[] { "com.sbnz.gleficu.model.user" });
+
+        HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+        em.setJpaVendorAdapter(vendorAdapter);
+        HashMap<String, Object> properties = new HashMap<>();
+        properties.put("hibernate.hbm2ddl.auto", env.getProperty("user.hibernate.hbm2ddl.auto"));
+        properties.put("hibernate.dialect", env.getProperty("user.hibernate.dialect"));
+        em.setJpaPropertyMap(properties);
+
+        return em;
+    }
+
+    @Primary
+    @Bean
+    public DataSource userDataSource() {
+        DriverManagerDataSource dataSource = new DriverManagerDataSource();
+        dataSource.setDriverClassName(env.getProperty("jdbc.driverClassName"));
+        dataSource.setUrl(env.getProperty("spring.datasource.url"));
+        dataSource.setUsername(env.getProperty("spring.datasource.username"));
+        dataSource.setPassword(env.getProperty("spring.datasource.password"));
+
+        return dataSource;
+    }
+
+    @Primary
+    @Bean
+    public PlatformTransactionManager userTransactionManager() {
+
+        JpaTransactionManager transactionManager = new JpaTransactionManager();
+        transactionManager.setEntityManagerFactory(userEntityManager().getObject());
+        return transactionManager;
+    }
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/controller/GenreRecommendByTagsController.java b/gleficu/src/main/java/com/sbnz/gleficu/controller/GenreRecommendByTagsController.java
index e3f589e..8b9cf52 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/controller/GenreRecommendByTagsController.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/controller/GenreRecommendByTagsController.java
@@ -6,7 +6,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping(value = "/recommend/genre-by-tags")
+@RequestMapping(value = "/api/recommend/genre-by-tags")
 public class GenreRecommendByTagsController {
     private final GenreRecommendByTagsService genreRecommendByTagsService;
 
@@ -15,8 +15,8 @@ public GenreRecommendByTagsController(GenreRecommendByTagsService service) {
         this.genreRecommendByTagsService = service;
     }
 
-    @GetMapping(value = "/{requestId}")
-    public int recommendByTags(@PathVariable Integer requestId) {
-        return genreRecommendByTagsService.recommendByInputTags(requestId);
+    @GetMapping()
+    public int recommendByTags(@RequestParam("userId") Integer userId, @RequestParam("tags") String tags) {
+        return genreRecommendByTagsService.recommendByInputTags(userId, tags);
     }
 }
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/controller/UserController.java b/gleficu/src/main/java/com/sbnz/gleficu/controller/UserController.java
deleted file mode 100644
index 695abeb..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/controller/UserController.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.sbnz.gleficu.controller;
-
-import com.sbnz.gleficu.dto.AuthRequestDTO;
-import com.sbnz.gleficu.dto.AuthResponseDTO;
-import com.sbnz.gleficu.util.JwtUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping(value = "/recommend/users")
-public class UserController {
-    private final AuthenticationManager authenticationManager;
-    private final JwtUtil jwtUtil;
-
-    @Autowired
-    public UserController(AuthenticationManager authenticationManager, JwtUtil jwtUtil) {
-        this.authenticationManager = authenticationManager;
-        this.jwtUtil = jwtUtil;
-    }
-
-    @PostMapping(value = "/login")
-    @ResponseStatus(HttpStatus.OK)
-    public AuthResponseDTO authenticate(@RequestBody AuthRequestDTO authenticationRequestDTO) {
-        Authentication authentication = authenticationManager.authenticate(
-                new UsernamePasswordAuthenticationToken(authenticationRequestDTO.getEmail(), authenticationRequestDTO.getPassword())
-        );
-        SecurityContextHolder.getContext().setAuthentication(authentication);
-
-        String token = jwtUtil.generateToken(authentication);
-
-        return new AuthResponseDTO(token);
-    }
-
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/dto/AuthRequestDTO.java b/gleficu/src/main/java/com/sbnz/gleficu/dto/AuthRequestDTO.java
deleted file mode 100644
index b59079c..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/dto/AuthRequestDTO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.sbnz.gleficu.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class AuthRequestDTO {
-    private String email;
-    private String password;
-}
\ No newline at end of file
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/dto/AuthResponseDTO.java b/gleficu/src/main/java/com/sbnz/gleficu/dto/AuthResponseDTO.java
deleted file mode 100644
index 309c565..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/dto/AuthResponseDTO.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.sbnz.gleficu.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-public class AuthResponseDTO {
-    private String jwt;
-}
\ No newline at end of file
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/BaseUser.java b/gleficu/src/main/java/com/sbnz/gleficu/model/BaseUser.java
index 0451766..8ee613d 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/BaseUser.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/BaseUser.java
@@ -14,9 +14,18 @@
 @AllArgsConstructor
 @MappedSuperclass
 public class BaseUser extends BaseEntity{
-    @Column(name = "email", nullable = false)
-    private String email;
+    @Column(name = "username", nullable = false)
+    private String username;
 
     @Column(name = "password", nullable = false)
     private String password;
+
+    @Column(name = "role_id")
+    private Integer roleId;
+
+    @Column(name = "banned")
+    private Boolean banned;
+
+    @Column(name = "can_be_banned")
+    private Boolean canBeBanned;
 }
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/Genre.java b/gleficu/src/main/java/com/sbnz/gleficu/model/Genre.java
index d681148..c024abe 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/Genre.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/Genre.java
@@ -1,24 +1,19 @@
 package com.sbnz.gleficu.model;
 
 import com.sbnz.gleficu.model.enums.MovieGenre;
+import com.sbnz.gleficu.model.movie.Tag;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.persistence.*;
 import java.util.List;
 
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-@Entity
-@Table(name = "genre")
 public class Genre extends BaseEntity{
-    @Column(name = "genre", nullable = false)
     public MovieGenre genre;
-
-    @ManyToMany(fetch = FetchType.EAGER)
     public List<Tag> tags;
 }
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/Movie.java b/gleficu/src/main/java/com/sbnz/gleficu/model/Movie.java
deleted file mode 100644
index 809d7b2..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/Movie.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.sbnz.gleficu.model;
-
-import com.sbnz.gleficu.model.enums.MovieLanguage;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Getter @Setter @NoArgsConstructor @AllArgsConstructor
-@Table(name = "movie")
-@Entity
-public class Movie extends BaseEntity{
-    @Column(name = "criticsRating", nullable = false)
-    public Double criticsRating;
-
-    @ManyToMany
-    public List<Tag> tags;
-
-    @ManyToMany
-    public List<Genre> genres;
-
-    @ManyToMany
-    public List<FilmCrew> actors;
-
-    @Column(name = "language", nullable = false)
-    public MovieLanguage language;
-
-    @Column(name = "releaseYear", nullable = false)
-    public Integer releaseYear;
-
-    @ManyToOne
-    public FilmCrew director;
-
-    @ManyToMany
-    public List<FilmCrew> writer;
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/RatedMovie.java b/gleficu/src/main/java/com/sbnz/gleficu/model/RatedMovie.java
index 9e6b906..c038468 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/RatedMovie.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/RatedMovie.java
@@ -1,5 +1,7 @@
 package com.sbnz.gleficu.model;
 
+import com.sbnz.gleficu.model.movie.Movie;
+import com.sbnz.gleficu.model.user.UserDb;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -18,7 +20,7 @@ public class RatedMovie extends BaseEntity{
     public Movie movie;
 
     @ManyToOne
-    public User user;
+    public UserDb user;
 
     @Column(name = "rating", nullable = false)
     public Double rating;
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/RecommendRequest.java b/gleficu/src/main/java/com/sbnz/gleficu/model/RecommendRequest.java
index 1a395ad..3d1776b 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/RecommendRequest.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/RecommendRequest.java
@@ -1,6 +1,7 @@
 package com.sbnz.gleficu.model;
 
 import com.sbnz.gleficu.model.enums.AgeRange;
+import com.sbnz.gleficu.model.movie.Tag;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/Tag.java b/gleficu/src/main/java/com/sbnz/gleficu/model/Tag.java
deleted file mode 100644
index c408f44..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/Tag.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.sbnz.gleficu.model;
-
-import com.sbnz.gleficu.model.enums.MovieTag;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "tag")
-public class Tag extends BaseEntity{
-    @Column(name = "tag", nullable = false)
-    public MovieTag tag;
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/User.java b/gleficu/src/main/java/com/sbnz/gleficu/model/User.java
deleted file mode 100644
index c9d435a..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/User.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.sbnz.gleficu.model;
-
-import com.sbnz.gleficu.model.enums.AgeRange;
-import com.sbnz.gleficu.model.enums.Gender;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import javax.persistence.*;
-import java.util.Collection;
-import java.util.List;
-
-@Getter @Setter @NoArgsConstructor @AllArgsConstructor
-@Table(name = "customer")
-@Entity
-public class User extends BaseUser implements UserDetails {
-    @Column(name = "years", nullable = false)
-    private Integer years;
-
-    @Column(name = "gender", nullable = false)
-    private Gender gender;
-
-    @Column(name="ageRange")
-    private AgeRange ageRange;
-
-    @Column(name = "authority")
-    private String authority;
-
-    @ManyToMany(fetch = FetchType.EAGER)
-    private List<Tag> favouriteTags;
-
-    public User(String email, String password, Integer years, String authority,Gender gender, List<Tag> favouriteTags) {
-        super(email, password);
-        this.years = years;
-        this.gender = gender;
-        this.authority = authority;
-        this.favouriteTags = favouriteTags;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return null;
-    }
-
-    @Override
-    public String getUsername() {
-        return this.getEmail();
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/WatchedMovie.java b/gleficu/src/main/java/com/sbnz/gleficu/model/WatchedMovie.java
deleted file mode 100644
index bd47bb7..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/WatchedMovie.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.sbnz.gleficu.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "watchedMovie")
-public class WatchedMovie extends BaseEntity{
-    @OneToOne
-    public Movie movie;
-
-    @ManyToOne
-    public User user;
-
-    @Column(name = "date", nullable = false)
-    public Long dateWatched;
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/WishlistMovie.java b/gleficu/src/main/java/com/sbnz/gleficu/model/WishlistMovie.java
deleted file mode 100644
index 8efd511..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/WishlistMovie.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.sbnz.gleficu.model;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Entity
-@Table(name = "wishlistMovie")
-public class WishlistMovie extends BaseEntity{
-    @OneToOne
-    public Movie movie;
-
-    @ManyToOne
-    public User user;
-
-    @Column(name = "date", nullable = false)
-    public Long dateAddedToWishlist;
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterFilmCrewFact.java b/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterFilmCrewFact.java
index f614ecb..081dd2a 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterFilmCrewFact.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterFilmCrewFact.java
@@ -1,6 +1,6 @@
 package com.sbnz.gleficu.model.facts;
 
-import com.sbnz.gleficu.model.Movie;
+import com.sbnz.gleficu.model.movie.Movie;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterYearRatingFact.java b/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterYearRatingFact.java
index 2f978a9..fbd9abc 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterYearRatingFact.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/facts/MoviesFilterYearRatingFact.java
@@ -1,6 +1,6 @@
 package com.sbnz.gleficu.model.facts;
 
-import com.sbnz.gleficu.model.Movie;
+import com.sbnz.gleficu.model.movie.Movie;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/lists/WatchedMovie.java b/gleficu/src/main/java/com/sbnz/gleficu/model/lists/WatchedMovie.java
new file mode 100644
index 0000000..7e14c40
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/lists/WatchedMovie.java
@@ -0,0 +1,48 @@
+package com.sbnz.gleficu.model.lists;
+
+import com.sbnz.gleficu.model.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.time.OffsetDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "watchlist_items")
+public class WatchedMovie extends BaseEntity {
+    @Column(name = "created_at", nullable = true)
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at", nullable = true)
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at", nullable = true)
+    private OffsetDateTime deletedAt;
+
+    @Column(name = "user_id")
+    private Integer userId;
+
+    @Column(name = "title")
+    private String title;
+
+    @Column(name = "genre")
+    private String genre;
+
+    @Column(name = "imdb_id")
+    private String imdbId;
+
+    @Column(name = "poster")
+    private String poster;
+
+    @Column(name = "imdb_rating")
+    private String imdbRating;
+
+    @Column(name = "released")
+    private String released;
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/lists/WishlistMovie.java b/gleficu/src/main/java/com/sbnz/gleficu/model/lists/WishlistMovie.java
new file mode 100644
index 0000000..8fe32c5
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/lists/WishlistMovie.java
@@ -0,0 +1,48 @@
+package com.sbnz.gleficu.model.lists;
+
+import com.sbnz.gleficu.model.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.time.OffsetDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "wishlist_items")
+public class WishlistMovie extends BaseEntity {
+    @Column(name = "created_at", nullable = true)
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at", nullable = true)
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at", nullable = true)
+    private OffsetDateTime deletedAt;
+
+    @Column(name = "user_id")
+    private Integer userId;
+
+    @Column(name = "title")
+    private String title;
+
+    @Column(name = "genre")
+    private String genre;
+
+    @Column(name = "imdb_id")
+    private String imdbId;
+
+    @Column(name = "poster")
+    private String poster;
+
+    @Column(name = "imdb_rating")
+    private String imdbRating;
+
+    @Column(name = "released")
+    private String released;
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/movie/Movie.java b/gleficu/src/main/java/com/sbnz/gleficu/model/movie/Movie.java
new file mode 100644
index 0000000..076ea3d
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/movie/Movie.java
@@ -0,0 +1,84 @@
+package com.sbnz.gleficu.model.movie;
+
+import com.sbnz.gleficu.model.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.time.OffsetDateTime;
+
+@Getter @Setter @NoArgsConstructor @AllArgsConstructor
+@Table(name = "movie_dbs")
+@Entity
+public class Movie extends BaseEntity {
+    @Column(name = "created_at", nullable = true)
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at", nullable = true)
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at", nullable = true)
+    private OffsetDateTime deletedAt;
+
+    @Column(name="type")
+    private String type;
+
+    @Column(name="title")
+    private String title;
+
+    @Column(name="year")
+    private String year;
+
+    @Column(name="rated")
+    private String rated;
+
+    @Column(name="released")
+    private String released;
+
+    @Column(name="runtime")
+    private String runtime;
+
+    @Column(name="genre")
+    private String genre;
+
+    @Column(name="director")
+    private String director;
+
+    @Column(name="writer")
+    private String writer;
+
+    @Column(name="actors")
+    private String actors;
+
+    @Column(name="plot")
+    private String plot;
+
+    @Column(name="language")
+    private String language;
+
+    @Column(name="country")
+    private String country;
+
+    @Column(name="poster")
+    private String poster;
+
+    @Column(name="imdb_rating")
+    private String imdbRating;
+
+    @Column(name="metascore")
+    private String metascore;
+
+    @Column(name="imdb_votes")
+    private String imdbVotes;
+
+    @Column(name="imdb_id")
+    private String imdbId;
+
+    @Column(name="torrent_links")
+    private String torrentLinks;
+
+    @Column(name="title_links")
+    private String titleLinks;
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/movie/Tag.java b/gleficu/src/main/java/com/sbnz/gleficu/model/movie/Tag.java
new file mode 100644
index 0000000..a53e3a5
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/movie/Tag.java
@@ -0,0 +1,36 @@
+package com.sbnz.gleficu.model.movie;
+
+import com.sbnz.gleficu.model.BaseEntity;
+import com.sbnz.gleficu.model.enums.MovieTag;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Table(name = "tag_dbs")
+public class Tag extends BaseEntity {
+    @Column(name = "created_at", nullable = true)
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at", nullable = true)
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at", nullable = true)
+    private OffsetDateTime deletedAt;
+
+    @Column(name = "movie_id", nullable = false)
+    public Integer movieId;
+
+    @Column(name = "name", nullable = false)
+    public String name;
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterByTagsPhase.java b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterByTagsPhase.java
index 4e87e64..842e52f 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterByTagsPhase.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterByTagsPhase.java
@@ -1,7 +1,7 @@
 package com.sbnz.gleficu.model.phases;
 
 import com.sbnz.gleficu.model.Genre;
-import com.sbnz.gleficu.model.Tag;
+import com.sbnz.gleficu.model.movie.Tag;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterRatedWatchedWishlistPhase.java b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterRatedWatchedWishlistPhase.java
index b887588..1de248b 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterRatedWatchedWishlistPhase.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/GenresFilterRatedWatchedWishlistPhase.java
@@ -2,8 +2,8 @@
 
 import com.sbnz.gleficu.model.Genre;
 import com.sbnz.gleficu.model.RatedMovie;
-import com.sbnz.gleficu.model.WatchedMovie;
-import com.sbnz.gleficu.model.WishlistMovie;
+import com.sbnz.gleficu.model.lists.WatchedMovie;
+import com.sbnz.gleficu.model.lists.WishlistMovie;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -33,7 +33,7 @@ public void setGenresRated(List<RatedMovie> ratedMovies) {
     public void setGenresWatched(List<WatchedMovie> watchedMovies) {
         List<WatchedMoviePhase> watchedMoviePhases = new ArrayList<>();
         for(WatchedMovie rm : watchedMovies) {
-            watchedMoviePhases.add(new WatchedMoviePhase(rm.getId(), rm.getDateWatched()));
+            watchedMoviePhases.add(new WatchedMoviePhase(rm.getId(), rm.getCreatedAt().toEpochSecond()));
         }
         this.genresWatched = watchedMoviePhases;
     }
@@ -41,7 +41,7 @@ public void setGenresWatched(List<WatchedMovie> watchedMovies) {
     public void setGenresWishlist(List<WishlistMovie> wishlistMovies) {
         List<WishlistMoviePhase> wishlistMoviePhases = new ArrayList<>();
         for(WishlistMovie wm: wishlistMovies) {
-            wishlistMoviePhases.add(new WishlistMoviePhase(wm.getId(), wm.getDateAddedToWishlist()));
+            wishlistMoviePhases.add(new WishlistMoviePhase(wm.getId(), wm.getCreatedAt().toEpochSecond()));
         }
         this.genresWishlist = wishlistMoviePhases;
     }
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByFilmCrewPhase.java b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByFilmCrewPhase.java
index 3aab272..a10ac00 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByFilmCrewPhase.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByFilmCrewPhase.java
@@ -1,7 +1,7 @@
 package com.sbnz.gleficu.model.phases;
 
 import com.sbnz.gleficu.model.FilmCrew;
-import com.sbnz.gleficu.model.Movie;
+import com.sbnz.gleficu.model.movie.Movie;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByYearRatingPhase.java b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByYearRatingPhase.java
index f61d576..155e411 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByYearRatingPhase.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/phases/MovieFilterByYearRatingPhase.java
@@ -1,6 +1,6 @@
 package com.sbnz.gleficu.model.phases;
 
-import com.sbnz.gleficu.model.Movie;
+import com.sbnz.gleficu.model.movie.Movie;
 import com.sbnz.gleficu.model.enums.AgeRange;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/user/User.java b/gleficu/src/main/java/com/sbnz/gleficu/model/user/User.java
new file mode 100644
index 0000000..a8ab3aa
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/user/User.java
@@ -0,0 +1,17 @@
+package com.sbnz.gleficu.model.user;
+import com.sbnz.gleficu.model.enums.AgeRange;
+import com.sbnz.gleficu.model.enums.Gender;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class User {
+    private Integer age;
+    private Gender gender;
+    private AgeRange ageRange;
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/model/user/UserDb.java b/gleficu/src/main/java/com/sbnz/gleficu/model/user/UserDb.java
new file mode 100644
index 0000000..4c56b0f
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/model/user/UserDb.java
@@ -0,0 +1,46 @@
+package com.sbnz.gleficu.model.user;
+
+import com.sbnz.gleficu.model.BaseUser;
+import com.sbnz.gleficu.model.enums.Gender;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.time.OffsetDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "users")
+@Entity
+public class UserDb extends BaseUser {
+    @Column(name = "created_at", nullable = true)
+    private OffsetDateTime createdAt;
+
+    @Column(name = "updated_at", nullable = true)
+    private OffsetDateTime updatedAt;
+
+    @Column(name = "deleted_at", nullable = true)
+    private OffsetDateTime deletedAt;
+
+    @Column(name = "age", nullable = false)
+    private Integer age;
+
+    @Column(name = "gender", nullable = false)
+    private String gender;
+
+    @Column(name = "favourite_tags", nullable = true)
+    private String favouriteTags;
+
+    public UserDb(String email, String password, Integer age, Integer roleId,String gender, String favouriteTags) {
+        super(email, password, roleId, false, false);
+        this.age = age;
+        this.gender = gender;
+        this.favouriteTags = favouriteTags;
+    }
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/GenreRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/GenreRepo.java
deleted file mode 100644
index 09c8b5a..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/repository/GenreRepo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.sbnz.gleficu.repository;
-
-import com.sbnz.gleficu.model.Genre;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface GenreRepo extends JpaRepository<Genre, Integer> {
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/RequestRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/RequestRepo.java
deleted file mode 100644
index 26d060a..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/repository/RequestRepo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.sbnz.gleficu.repository;
-
-import com.sbnz.gleficu.model.RecommendRequest;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface RequestRepo extends JpaRepository<RecommendRequest, Integer> {
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/UserRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/UserRepo.java
deleted file mode 100644
index 2e9e771..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/repository/UserRepo.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.sbnz.gleficu.repository;
-
-import com.sbnz.gleficu.model.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-import java.util.Optional;
-
-@Repository
-public interface UserRepo extends JpaRepository<User, Integer> {
-    Optional<User> findByEmail(String email);
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/WatchedMovieRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/lists/WatchedMovieRepo.java
similarity index 75%
rename from gleficu/src/main/java/com/sbnz/gleficu/repository/WatchedMovieRepo.java
rename to gleficu/src/main/java/com/sbnz/gleficu/repository/lists/WatchedMovieRepo.java
index 4f9992b..2153712 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/repository/WatchedMovieRepo.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/repository/lists/WatchedMovieRepo.java
@@ -1,6 +1,6 @@
-package com.sbnz.gleficu.repository;
+package com.sbnz.gleficu.repository.lists;
 
-import com.sbnz.gleficu.model.WatchedMovie;
+import com.sbnz.gleficu.model.lists.WatchedMovie;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/WishlistMovieRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/lists/WishlistMovieRepo.java
similarity index 75%
rename from gleficu/src/main/java/com/sbnz/gleficu/repository/WishlistMovieRepo.java
rename to gleficu/src/main/java/com/sbnz/gleficu/repository/lists/WishlistMovieRepo.java
index 2379985..bccd2cc 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/repository/WishlistMovieRepo.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/repository/lists/WishlistMovieRepo.java
@@ -1,6 +1,6 @@
-package com.sbnz.gleficu.repository;
+package com.sbnz.gleficu.repository.lists;
 
-import com.sbnz.gleficu.model.WishlistMovie;
+import com.sbnz.gleficu.model.lists.WishlistMovie;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/MovieRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/movie/MovieRepo.java
similarity index 69%
rename from gleficu/src/main/java/com/sbnz/gleficu/repository/MovieRepo.java
rename to gleficu/src/main/java/com/sbnz/gleficu/repository/movie/MovieRepo.java
index 1b75cc2..a2c4759 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/repository/MovieRepo.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/repository/movie/MovieRepo.java
@@ -1,6 +1,6 @@
-package com.sbnz.gleficu.repository;
+package com.sbnz.gleficu.repository.movie;
 
-import com.sbnz.gleficu.model.Movie;
+import com.sbnz.gleficu.model.movie.Movie;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/TagRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/movie/TagRepo.java
similarity index 69%
rename from gleficu/src/main/java/com/sbnz/gleficu/repository/TagRepo.java
rename to gleficu/src/main/java/com/sbnz/gleficu/repository/movie/TagRepo.java
index ab9b529..e269e60 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/repository/TagRepo.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/repository/movie/TagRepo.java
@@ -1,6 +1,6 @@
-package com.sbnz.gleficu.repository;
+package com.sbnz.gleficu.repository.movie;
 
-import com.sbnz.gleficu.model.Tag;
+import com.sbnz.gleficu.model.movie.Tag;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/repository/user/UserRepo.java b/gleficu/src/main/java/com/sbnz/gleficu/repository/user/UserRepo.java
new file mode 100644
index 0000000..f385eae
--- /dev/null
+++ b/gleficu/src/main/java/com/sbnz/gleficu/repository/user/UserRepo.java
@@ -0,0 +1,12 @@
+package com.sbnz.gleficu.repository.user;
+
+import com.sbnz.gleficu.model.user.UserDb;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+public interface UserRepo extends JpaRepository<UserDb, Integer> {
+    Optional<UserDb> findByUsername(String username);
+}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/service/GenreRecommendByTagsService.java b/gleficu/src/main/java/com/sbnz/gleficu/service/GenreRecommendByTagsService.java
index 3af0d23..f3c0235 100644
--- a/gleficu/src/main/java/com/sbnz/gleficu/service/GenreRecommendByTagsService.java
+++ b/gleficu/src/main/java/com/sbnz/gleficu/service/GenreRecommendByTagsService.java
@@ -1,208 +1,213 @@
 package com.sbnz.gleficu.service;
 
-import com.sbnz.gleficu.model.Genre;
-import com.sbnz.gleficu.model.RecommendRequest;
-import com.sbnz.gleficu.model.User;
-import com.sbnz.gleficu.model.enums.AgeRange;
-import com.sbnz.gleficu.model.facts.*;
-import com.sbnz.gleficu.model.phases.GenresFilterAgeGenderPhase;
-import com.sbnz.gleficu.model.phases.GenresFilterByTagsPhase;
-import com.sbnz.gleficu.model.phases.GenresFilterRatedWatchedWishlistPhase;
-import com.sbnz.gleficu.repository.*;
-import org.kie.api.runtime.ClassObjectFilter;
-import org.kie.api.runtime.KieContainer;
+import com.sbnz.gleficu.model.lists.WatchedMovie;
+import com.sbnz.gleficu.model.lists.WishlistMovie;
+import com.sbnz.gleficu.model.movie.Movie;
+import com.sbnz.gleficu.model.user.UserDb;
+import com.sbnz.gleficu.repository.lists.WatchedMovieRepo;
+import com.sbnz.gleficu.repository.lists.WishlistMovieRepo;
+import com.sbnz.gleficu.repository.movie.MovieRepo;
+import com.sbnz.gleficu.repository.user.UserRepo;
 import org.kie.api.runtime.KieSession;
-import org.kie.api.runtime.rule.FactHandle;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.*;
 
 @Service
 public class GenreRecommendByTagsService {
 
     private final KieSession kieSession;
 
-    private final RequestRepo requestRepo;
-
-    private final GenreRepo genreRepo;
-
     private final UserRepo userRepo;
 
-    private final RatedMovieRepo ratedMovieRepo;
-
     private final WatchedMovieRepo watchedMovieRepo;
 
     private final WishlistMovieRepo wishlistMovieRepo;
 
+    private final MovieRepo movieRepo;
+
     @Autowired
-    public GenreRecommendByTagsService(KieSession kieSession, RequestRepo requestRepo, GenreRepo genreRepo,
-                                       UserRepo userRepo, RatedMovieRepo ratedMovieRepo,
-                                       WatchedMovieRepo watchedMovieRepo, WishlistMovieRepo wishlistMovieRepo) {
+    public GenreRecommendByTagsService(KieSession kieSession, UserRepo userRepo,
+                                       MovieRepo movieRepo, WatchedMovieRepo watchedMovieRepo,
+                                       WishlistMovieRepo wishlistMovieRepo) {
         this.kieSession = kieSession;
-        this.requestRepo = requestRepo;
-        this.genreRepo = genreRepo;
         this.userRepo = userRepo;
-        this.ratedMovieRepo = ratedMovieRepo;
         this.watchedMovieRepo = watchedMovieRepo;
         this.wishlistMovieRepo = wishlistMovieRepo;
+        this.movieRepo = movieRepo;
     }
 
-    public int recommendByInputTags(Integer requestId) {
-        RecommendRequest request = this.requestRepo.findById(requestId).orElseThrow(() ->
-                new RuntimeException("Request not found"));
-
-        // 1. inputTag & favTag
-
-        GenresFilterByTagsPhase phase = new GenresFilterByTagsPhase();
-        phase.setTags(request.getInputTags());
-        // phase.setFavTag("hero");
-        phase.setRecommendId(request.getId());
-        List<Genre> genres = genreRepo.findAll();
-        phase.setGenres(genres);
-
-        kieSession.insert(request);
-        FactHandle factHandle = kieSession.insert(phase);
-        kieSession.getAgenda().getAgendaGroup("Lista zanrova na osnovu unesenih tagova").setFocus();
-        kieSession.fireAllRules();
-
-        Collection<GenresFilterByInputTagsFact> facts = (Collection<GenresFilterByInputTagsFact>)
-                kieSession.getObjects(new ClassObjectFilter(GenresFilterByInputTagsFact.class));
-
-        kieSession.delete(factHandle);
-
-        GenresFilterByTagsPhase phase2 = new GenresFilterByTagsPhase();
-        User user = this.userRepo.findById(request.getUserId()).orElseThrow(() -> new RuntimeException("User not found"));
-        phase2.setTags(user.getFavouriteTags());
-        phase2.setRecommendId(request.getId());
-
-        List<Genre> phase2Genres = new ArrayList<>();
-        for (GenresFilterByInputTagsFact fact : facts) {
-            for (Genre g : fact.getPossibleGenres()) {
-                phase2Genres.add(g);
-                System.out.println(g.getGenre().toString());
-            }
-            System.out.println(fact.getPossibleGenres().size());
+    public int recommendByInputTags(Integer userId, String tags) {
+        System.out.println(userId);
+        System.out.println(tags);
+        // System.out.println(String.join(", ", tags));
+        for(UserDb u : userRepo.findAll()) {
+            System.out.println(u.getUsername());
         }
-        phase2.setGenres(phase2Genres);
-
-        FactHandle factHandle2 = kieSession.insert(phase2);
-        kieSession.getAgenda().getAgendaGroup("Lista zanrova na osnovu omiljenih tagova").setFocus();
-        kieSession.fireAllRules();
-
-        Collection<GenresFilterByFavTagsFact> facts2 = (Collection<GenresFilterByFavTagsFact>)
-                kieSession.getObjects(new ClassObjectFilter(GenresFilterByFavTagsFact.class));
-
-        kieSession.delete(factHandle2);
-        kieSession.dispose();
-
-        List<Genre> phase3Genres = new ArrayList<>();
-        for (GenresFilterByFavTagsFact fact : facts2) {
-            for (Genre g : fact.getPossibleGenres()) {
-                phase3Genres.add(g);
-                System.out.println(g.getGenre().toString());
-            }
-            System.out.println(fact.getPossibleGenres().size());
-        }
-
-        // Postavljanje AgeRange
-        // kieSession = KieContainer.newKieSession();
-        kieSession.insert(user);
-        kieSession.getAgenda().getAgendaGroup("Postavljanje starosne dobi").setFocus();
-        kieSession.fireAllRules();
-
-        System.out.println(user.getAgeRange());
-
-        kieSession.dispose();
-
-        // 2. age & gender
-
-        GenresFilterAgeGenderPhase phase3 = new GenresFilterAgeGenderPhase();
-        phase3.setGenres(genres);
-        phase3.setGender(user.getGender());
-        if(user.getAgeRange() == null) {
-            System.out.println("AGE RANGE not set!");
-            phase3.setAgeRange(AgeRange.YOUNG);
-        } else
-            phase3.setAgeRange(user.getAgeRange());
-
-        // kieSession = kieContainer.newKieSession();
-        kieSession.insert(user);
-        FactHandle factHandle3 = kieSession.insert(phase3);
-        kieSession.getAgenda().getAgendaGroup("Filter zanrova po polu i godinama").setFocus();
-        kieSession.fireAllRules();
-
-        Collection<GenresFilterByAgeAndGenderFact> facts3 = (Collection<GenresFilterByAgeAndGenderFact>)
-                kieSession.getObjects(new ClassObjectFilter(GenresFilterByAgeAndGenderFact.class));
-
-        kieSession.delete(factHandle3);
-        kieSession.dispose();
-
-        List<Genre> phase4Genres = new ArrayList<>();
-        for (GenresFilterByAgeAndGenderFact fact : facts3) {
-            for (Genre g : fact.getPossibleGenres()) {
-                phase4Genres.add(g);
-                System.out.println(g.getGenre().toString());
-            }
-            System.out.println(fact.getPossibleGenres().size());
+        for(WatchedMovie wm: watchedMovieRepo.findAll()){
+            System.out.println(wm.getId());
         }
-
-        // 3. rated, watched & wishlist
-
-        GenresFilterRatedWatchedWishlistPhase phase4 = new GenresFilterRatedWatchedWishlistPhase();
-        phase4.setGenres(genres);
-        phase4.setGenresRated(ratedMovieRepo.getRatedMovieByUserId(user.getId()));
-        phase4.setGenresWatched(watchedMovieRepo.findAllByUserId(user.getId()));
-        phase4.setGenresWishlist(wishlistMovieRepo.findAllByUserId(user.getId()));
-
-        // kieSession = kieContainer.newKieSession();
-        FactHandle factHandle4 = kieSession.insert(phase4);
-        kieSession.getAgenda().getAgendaGroup("Filter zanrova liste korisnickih filmova").setFocus();
-        kieSession.fireAllRules();
-
-        Collection<GenresFilterByRatedWatchedWishlist> facts4 = (Collection<GenresFilterByRatedWatchedWishlist>)
-                kieSession.getObjects(new ClassObjectFilter(GenresFilterByRatedWatchedWishlist.class));
-
-        kieSession.delete(factHandle4);
-        kieSession.dispose();
-
-        List<Genre> phase5Genres = new ArrayList<>();
-        for (GenresFilterByRatedWatchedWishlist fact : facts4) {
-            for (Genre g : fact.getPossibleGenres()) {
-                phase4Genres.add(g);
-                System.out.println(g.getGenre().toString());
-            }
-            System.out.println(fact.getPossibleGenres().size());
+        for(WishlistMovie wm : wishlistMovieRepo.findAll()) {
+            System.out.println(wm.getId());
         }
-
-        // 4. all combined -> final list of genres
-        // kieSession = kieContainer.newKieSession();
-        GenresFilterByAgeAndGenderFact agFact = facts3.stream().findFirst().orElseThrow(() ->
-                new RuntimeException("Fact not found"));
-        kieSession.insert(agFact);
-        GenresFilterByRatedWatchedWishlist rwwFact = facts4.stream().findFirst().orElseThrow(() ->
-                new RuntimeException("Fact not found"));
-        kieSession.insert(rwwFact);
-        GenresFilterByFavTagsFact favTagsFact = facts2.stream().findFirst().orElseThrow(() ->
-                new RuntimeException("Fact not found"));
-        kieSession.insert(favTagsFact);
-
-        kieSession.getAgenda().getAgendaGroup("Finalno zanrovi").setFocus();
-        kieSession.fireAllRules();
-
-        Collection<GenresFilterFinalFact> facts5 = (Collection<GenresFilterFinalFact>)
-                kieSession.getObjects(new ClassObjectFilter(GenresFilterFinalFact.class));
-
-        List<Genre> phase6Genres = new ArrayList<>();
-        for (GenresFilterFinalFact fact : facts5) {
-            System.out.println(fact.getPercentage().toString() + "% preporuka");
-            for (Genre g : fact.getGenres()) {
-                phase4Genres.add(g);
-                System.out.println(g.getGenre().toString());
-            }
-            System.out.println(fact.getGenres().size());
+        for(Movie m : movieRepo.findAll()) {
+            System.out.println(m.getId());
         }
-
-        kieSession.dispose();
-        return facts.size();
+        return 0;
+//        RecommendRequest request = this.requestRepo.findById(requestId).orElseThrow(() ->
+//                new RuntimeException("Request not found"));
+//
+//        // 1. inputTag & favTag
+//
+//        GenresFilterByTagsPhase phase = new GenresFilterByTagsPhase();
+//        phase.setTags(request.getInputTags());
+//        // phase.setFavTag("hero");
+//        phase.setRecommendId(request.getId());
+//        List<Genre> genres = genreRepo.findAll();
+//        phase.setGenres(genres);
+//
+//        kieSession.insert(request);
+//        FactHandle factHandle = kieSession.insert(phase);
+//        kieSession.getAgenda().getAgendaGroup("Lista zanrova na osnovu unesenih tagova").setFocus();
+//        kieSession.fireAllRules();
+//
+//        Collection<GenresFilterByInputTagsFact> facts = (Collection<GenresFilterByInputTagsFact>)
+//                kieSession.getObjects(new ClassObjectFilter(GenresFilterByInputTagsFact.class));
+//
+//        kieSession.delete(factHandle);
+//
+//        GenresFilterByTagsPhase phase2 = new GenresFilterByTagsPhase();
+//        User user = this.userRepo.findById(request.getUserId()).orElseThrow(() -> new RuntimeException("User not found"));
+//        phase2.setTags(user.getFavouriteTags());
+//        phase2.setRecommendId(request.getId());
+//
+//        List<Genre> phase2Genres = new ArrayList<>();
+//        for (GenresFilterByInputTagsFact fact : facts) {
+//            for (Genre g : fact.getPossibleGenres()) {
+//                phase2Genres.add(g);
+//                System.out.println(g.getGenre().toString());
+//            }
+//            System.out.println(fact.getPossibleGenres().size());
+//        }
+//        phase2.setGenres(phase2Genres);
+//
+//        FactHandle factHandle2 = kieSession.insert(phase2);
+//        kieSession.getAgenda().getAgendaGroup("Lista zanrova na osnovu omiljenih tagova").setFocus();
+//        kieSession.fireAllRules();
+//
+//        Collection<GenresFilterByFavTagsFact> facts2 = (Collection<GenresFilterByFavTagsFact>)
+//                kieSession.getObjects(new ClassObjectFilter(GenresFilterByFavTagsFact.class));
+//
+//        kieSession.delete(factHandle2);
+//        kieSession.dispose();
+//
+//        List<Genre> phase3Genres = new ArrayList<>();
+//        for (GenresFilterByFavTagsFact fact : facts2) {
+//            for (Genre g : fact.getPossibleGenres()) {
+//                phase3Genres.add(g);
+//                System.out.println(g.getGenre().toString());
+//            }
+//            System.out.println(fact.getPossibleGenres().size());
+//        }
+//
+//        // Postavljanje AgeRange
+//        // kieSession = KieContainer.newKieSession();
+//        kieSession.insert(user);
+//        kieSession.getAgenda().getAgendaGroup("Postavljanje starosne dobi").setFocus();
+//        kieSession.fireAllRules();
+//
+//        System.out.println(user.getAgeRange());
+//
+//        kieSession.dispose();
+//
+//        // 2. age & gender
+//
+//        GenresFilterAgeGenderPhase phase3 = new GenresFilterAgeGenderPhase();
+//        phase3.setGenres(genres);
+//        phase3.setGender(user.getGender());
+//        if(user.getAgeRange() == null) {
+//            System.out.println("AGE RANGE not set!");
+//            phase3.setAgeRange(AgeRange.YOUNG);
+//        } else
+//            phase3.setAgeRange(user.getAgeRange());
+//
+//        // kieSession = kieContainer.newKieSession();
+//        kieSession.insert(user);
+//        FactHandle factHandle3 = kieSession.insert(phase3);
+//        kieSession.getAgenda().getAgendaGroup("Filter zanrova po polu i godinama").setFocus();
+//        kieSession.fireAllRules();
+//
+//        Collection<GenresFilterByAgeAndGenderFact> facts3 = (Collection<GenresFilterByAgeAndGenderFact>)
+//                kieSession.getObjects(new ClassObjectFilter(GenresFilterByAgeAndGenderFact.class));
+//
+//        kieSession.delete(factHandle3);
+//        kieSession.dispose();
+//
+//        List<Genre> phase4Genres = new ArrayList<>();
+//        for (GenresFilterByAgeAndGenderFact fact : facts3) {
+//            for (Genre g : fact.getPossibleGenres()) {
+//                phase4Genres.add(g);
+//                System.out.println(g.getGenre().toString());
+//            }
+//            System.out.println(fact.getPossibleGenres().size());
+//        }
+//
+//        // 3. rated, watched & wishlist
+//
+//        GenresFilterRatedWatchedWishlistPhase phase4 = new GenresFilterRatedWatchedWishlistPhase();
+//        phase4.setGenres(genres);
+//        phase4.setGenresRated(ratedMovieRepo.getRatedMovieByUserId(user.getId()));
+//        phase4.setGenresWatched(watchedMovieRepo.findAllByUserId(user.getId()));
+//        phase4.setGenresWishlist(wishlistMovieRepo.findAllByUserId(user.getId()));
+//
+//        // kieSession = kieContainer.newKieSession();
+//        FactHandle factHandle4 = kieSession.insert(phase4);
+//        kieSession.getAgenda().getAgendaGroup("Filter zanrova liste korisnickih filmova").setFocus();
+//        kieSession.fireAllRules();
+//
+//        Collection<GenresFilterByRatedWatchedWishlist> facts4 = (Collection<GenresFilterByRatedWatchedWishlist>)
+//                kieSession.getObjects(new ClassObjectFilter(GenresFilterByRatedWatchedWishlist.class));
+//
+//        kieSession.delete(factHandle4);
+//        kieSession.dispose();
+//
+//        List<Genre> phase5Genres = new ArrayList<>();
+//        for (GenresFilterByRatedWatchedWishlist fact : facts4) {
+//            for (Genre g : fact.getPossibleGenres()) {
+//                phase4Genres.add(g);
+//                System.out.println(g.getGenre().toString());
+//            }
+//            System.out.println(fact.getPossibleGenres().size());
+//        }
+//
+//        // 4. all combined -> final list of genres
+//        // kieSession = kieContainer.newKieSession();
+//        GenresFilterByAgeAndGenderFact agFact = facts3.stream().findFirst().orElseThrow(() ->
+//                new RuntimeException("Fact not found"));
+//        kieSession.insert(agFact);
+//        GenresFilterByRatedWatchedWishlist rwwFact = facts4.stream().findFirst().orElseThrow(() ->
+//                new RuntimeException("Fact not found"));
+//        kieSession.insert(rwwFact);
+//        GenresFilterByFavTagsFact favTagsFact = facts2.stream().findFirst().orElseThrow(() ->
+//                new RuntimeException("Fact not found"));
+//        kieSession.insert(favTagsFact);
+//
+//        kieSession.getAgenda().getAgendaGroup("Finalno zanrovi").setFocus();
+//        kieSession.fireAllRules();
+//
+//        Collection<GenresFilterFinalFact> facts5 = (Collection<GenresFilterFinalFact>)
+//                kieSession.getObjects(new ClassObjectFilter(GenresFilterFinalFact.class));
+//
+//        List<Genre> phase6Genres = new ArrayList<>();
+//        for (GenresFilterFinalFact fact : facts5) {
+//            System.out.println(fact.getPercentage().toString() + "% preporuka");
+//            for (Genre g : fact.getGenres()) {
+//                phase4Genres.add(g);
+//                System.out.println(g.getGenre().toString());
+//            }
+//            System.out.println(fact.getGenres().size());
+//        }
+//
+//        kieSession.dispose();
+//        return facts.size();
     }
 }
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/service/UserService.java b/gleficu/src/main/java/com/sbnz/gleficu/service/UserService.java
deleted file mode 100644
index 8a70851..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/service/UserService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sbnz.gleficu.service;
-
-import com.sbnz.gleficu.repository.UserRepo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserService implements UserDetailsService {
-    private final UserRepo userRepo;
-
-    @Autowired
-    public UserService(UserRepo userRepo) {
-        this.userRepo = userRepo;
-    }
-
-    @Override
-    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        return this.userRepo.findByEmail(username).orElseThrow(() -> new RuntimeException("User " + username + " not found!"));
-    }
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/util/JwtFilter.java b/gleficu/src/main/java/com/sbnz/gleficu/util/JwtFilter.java
deleted file mode 100644
index 300177d..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/util/JwtFilter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.sbnz.gleficu.util;
-
-
-import io.jsonwebtoken.ExpiredJwtException;
-import io.jsonwebtoken.MalformedJwtException;
-import io.jsonwebtoken.SignatureException;
-import io.jsonwebtoken.UnsupportedJwtException;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.web.authentication.rememberme.InvalidCookieException;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@Slf4j
-@Component
-public class JwtFilter extends OncePerRequestFilter {
-
-    @Value("${jwt.header.string}")
-    public String headerString;
-
-    @Value("${jwt.token.prefix}")
-    public String tokenPrefix;
-
-    private final JwtUtil tokenUtil;
-    private final UserDetailsService userDetailsService;
-
-    protected JwtFilter(JwtUtil tokenUtil, UserDetailsService userDetailsService) {
-        this.tokenUtil = tokenUtil;
-        this.userDetailsService = userDetailsService;
-    }
-
-    @Override
-    public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException{
-        String jwt = this.getJwtFromRequestHeader(request);
-        if (jwt != null) {
-            this.validateToken(jwt);
-        }
-
-        filterChain.doFilter(request, response);
-    }
-
-    protected String getJwtFromRequestHeader(HttpServletRequest request) {
-        final String authorizationHeader = request.getHeader(headerString);
-        if (authorizationHeader == null)
-            return null;
-        else if (authorizationHeader.startsWith(tokenPrefix))
-            return authorizationHeader.replace(tokenPrefix, "");
-        return null;
-    }
-
-    protected void validateToken(String jwt) {
-        try {
-            String username = tokenUtil.extractUsernameFromToken(jwt);
-
-
-            UserDetails userDetails = userDetailsService.loadUserByUsername(username);
-
-            if (Boolean.TRUE.equals(tokenUtil.validateToken(jwt, userDetails))) {
-                TokenBasedAuth authenticationToken = new TokenBasedAuth(userDetails);
-                authenticationToken.setToken(jwt);
-                SecurityContextHolder.getContext().setAuthentication(authenticationToken);
-            }
-        } catch (IllegalArgumentException |
-                SignatureException |
-                ExpiredJwtException |
-                MalformedJwtException |
-                UnsupportedJwtException |
-                UsernameNotFoundException |
-                InvalidCookieException ignored) {
-            log.error(ignored.getMessage());
-        }
-    }
-}
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/util/JwtUtil.java b/gleficu/src/main/java/com/sbnz/gleficu/util/JwtUtil.java
deleted file mode 100644
index 49aab0f..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/util/JwtUtil.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.sbnz.gleficu.util;
-
-import com.sbnz.gleficu.model.User;
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.function.Function;
-
-@Slf4j
-@Component
-public class JwtUtil {
-
-    @Value("${jwt.token.validity}")
-    public Long tokenValidity;
-
-    @Value("${jwt.signing.key}")
-    public String signingKey;
-
-    @Value("${spring.application.name}")
-    public String appName;
-
-    public static final SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS512;
-
-    public String extractUsernameFromToken(String token) {
-        return extractClaim(token, Claims::getSubject);
-    }
-
-    public Date extractExpirationDateFromToken(String token) {
-        return extractClaim(token, Claims::getExpiration);
-    }
-
-    public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
-        final Claims claims = getAllClaimsFromToken(token);
-        return claimsResolver.apply(claims);
-    }
-
-    private Claims getAllClaimsFromToken(String token) {
-        return Jwts.parser()
-                .setSigningKey(signingKey)
-                .parseClaimsJws(token)
-                .getBody();
-    }
-
-    private Boolean isTokenExpired(String token) {
-        final Date expiration = extractExpirationDateFromToken(token);
-        return expiration.before(new Date());
-    }
-
-    public String generateToken(Authentication authentication) {
-        User user = (User) authentication.getPrincipal();
-
-        return Jwts.builder()
-                .setHeaderParam("typ", "JWT")
-                .setIssuer(appName)
-                .setSubject(authentication.getName())
-                .claim("roles", user.getAuthority())
-                .claim("userId", user.getId())
-                .setIssuedAt(new Date(System.currentTimeMillis()))
-                .setExpiration(new Date(System.currentTimeMillis() + tokenValidity))
-                .signWith(signatureAlgorithm, signingKey)
-                .compact();
-    }
-
-    public Boolean validateToken(String token, UserDetails userDetails) {
-        final String username = extractUsernameFromToken(token);
-        return (username.equals(userDetails.getUsername()) && !isTokenExpired(token));
-    }
-}
\ No newline at end of file
diff --git a/gleficu/src/main/java/com/sbnz/gleficu/util/TokenBasedAuth.java b/gleficu/src/main/java/com/sbnz/gleficu/util/TokenBasedAuth.java
deleted file mode 100644
index d45a2b5..0000000
--- a/gleficu/src/main/java/com/sbnz/gleficu/util/TokenBasedAuth.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.sbnz.gleficu.util;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.security.authentication.AbstractAuthenticationToken;
-import org.springframework.security.core.userdetails.UserDetails;
-
-@Getter
-@Setter
-public class TokenBasedAuth extends AbstractAuthenticationToken {
-
-    private static final long serialVersionUID = 1L;
-
-    private String token;
-    private final UserDetails principal;
-
-    public TokenBasedAuth(UserDetails principal) {
-        super(principal.getAuthorities());
-        this.principal = principal;
-    }
-
-    @Override
-    public boolean isAuthenticated() {
-        return true;
-    }
-
-    @Override
-    public Object getCredentials() {
-        return token;
-    }
-
-    @Override
-    public UserDetails getPrincipal() {
-        return principal;
-    }
-}
\ No newline at end of file
diff --git a/gleficu/src/main/resources/application.properties b/gleficu/src/main/resources/application.properties
index 301ba2a..6d98482 100644
--- a/gleficu/src/main/resources/application.properties
+++ b/gleficu/src/main/resources/application.properties
@@ -1,23 +1,32 @@
 # SPRING
 spring.application.name=gleficu-backend
-server.port=8081
+server.port=3004
 # DATA SOURCE
-spring.datasource.url=jdbc:postgresql://localhost:5432/gleficu
+jdbc.driverClassName=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://localhost:5432/userService
 spring.datasource.username=${DB_USERNAME:postgres}
 spring.datasource.password=${DB_PASSWORD:root}
+
+spring.second-datasource.url=jdbc:postgresql://localhost:5432/movieService
+spring.second-datasource.username=${DB_USERNAME:postgres}
+spring.second-datasource.password=${DB_PASSWORD:root}
+
+spring.third-datasource.url=jdbc:postgresql://localhost:5432/listsService
+spring.third-datasource.username=${DB_USERNAME:postgres}
+spring.third-datasource.password=${DB_PASSWORD:root}
 # HIBERNATE
-spring.jpa.hibernate.ddl-auto=create
+spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.format_sql=true
 spring.jpa.open-in-view=false
+
+user.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+user.hibernate.show_sql=false
+user.hibernate.hbm2ddl.auto=validate
 # DROOLS
 rulesDirPath=../gleficu-rules/src/main/resources/com/sbnz/rules
 rulesPomPath=../gleficu-rules/pom.xml
 rulesPomGroup=com.sbnz
 rulesPomArtifact=gleficu-rules
 # JWT
-jwt.token.validity=90000000
-jwt.signing.key=${JWT_SIGNING_KEY:signingkey}
-jwt.token.prefix=Bearer
-jwt.header.string=Authorization
\ No newline at end of file
diff --git a/gleficu/src/main/resources/templates/ageTemplate.drt b/gleficu/src/main/resources/templates/ageTemplate.drt
index 49f323d..fe09ef9 100644
--- a/gleficu/src/main/resources/templates/ageTemplate.drt
+++ b/gleficu/src/main/resources/templates/ageTemplate.drt
@@ -6,6 +6,9 @@ name
 package com.sbnz.templates;
 
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
@@ -16,7 +19,7 @@ template "ages"
         agenda-group "Postavljanje starosne dobi"
         no-loop true
         when
-            $user: User(years >= "@{minAge}", years < "@{maxAge}")
+            $user: User(age >= "@{minAge}", age < "@{maxAge}")
         then
             System.out.println("Postavljanje starosne dobi za korisnika");
             modify ($user) { setAgeRange(AgeRange.@{name}) };
diff --git a/gleficu/src/main/resources/templates/genreDistributionByGenderAndAgeTemplate.drt b/gleficu/src/main/resources/templates/genreDistributionByGenderAndAgeTemplate.drt
index 1b00eea..25824eb 100644
--- a/gleficu/src/main/resources/templates/genreDistributionByGenderAndAgeTemplate.drt
+++ b/gleficu/src/main/resources/templates/genreDistributionByGenderAndAgeTemplate.drt
@@ -6,6 +6,9 @@ package com.sbnz.templates;
 
 import java.util.Set;
 import com.sbnz.gleficu.model.facts.*;
+import com.sbnz.gleficu.model.lists.*;
+import com.sbnz.gleficu.model.movie.*;
+import com.sbnz.gleficu.model.user.*;
 import com.sbnz.gleficu.model.phases.*;
 import com.sbnz.gleficu.model.*;
 import com.sbnz.gleficu.model.enums.*;
diff --git a/scrape-movie-service/api/tags.go b/scrape-movie-service/api/tags.go
index 2e77e1c..31e63ce 100644
--- a/scrape-movie-service/api/tags.go
+++ b/scrape-movie-service/api/tags.go
@@ -2,15 +2,15 @@ package api
 
 import (
 	"encoding/json"
+	"github.com/gorilla/mux"
 	"net/http"
 )
 
 func (api *API) SearchTags(w http.ResponseWriter, request *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
-	queryParams := request.URL.Query()
 
-	// fmt.Println(queryParams)
-	name := queryParams.Get("name")
+	params := mux.Vars(request)
+	name, _ := params["name"]
 	tags := api.tags.SearchTags(name)
 
 	err := json.NewEncoder(w).Encode(tags)
diff --git a/scrape-movie-service/models/tags.go b/scrape-movie-service/models/tags.go
index eca1d12..62913dd 100644
--- a/scrape-movie-service/models/tags.go
+++ b/scrape-movie-service/models/tags.go
@@ -1,13 +1,20 @@
 package models
 
+import (
+	"fmt"
+	"github.com/jinzhu/gorm"
+	"sort"
+)
+
 type Tag struct {
 	Id   int    `gorm:"not null" json:"id"`
 	Name string `gorm:"not null" json:"name"`
 }
 
 type TagDB struct {
-	MovieId uint   `gorm:"not null" json:"movieId"`
-	Name    string `gorm:"not null" json:"name"`
+	gorm.Model `json:"-"`
+	MovieId    uint   `gorm:"not null" json:"movieId"`
+	Name       string `gorm:"not null" json:"name"`
 }
 
 type TagManager struct {
@@ -54,8 +61,18 @@ func (state *TagManager) AggMovieTags(movieId uint, tags *[]Tag) {
 	}
 }
 
-func (state *TagManager) SearchTags(name string) *[]TagDB {
+func (state *TagManager) SearchTags(name string) *[]string {
 	var tags []TagDB
-	state.db.Where("LOWER(name) LIKE ?", "%"+name+"%").Find(&tags)
-	return &tags
+	state.db.Where("LOWER(name) LIKE ?", "%"+name+"%").Find(&tags).Offset(20).Limit(20)
+	var finalTags []string
+	for _, tag := range tags {
+		sort.Strings(finalTags)
+		i := sort.Search(len(finalTags), func(i int) bool { return finalTags[i] >= tag.Name })
+		if i < len(finalTags) && finalTags[i] == tag.Name {
+			fmt.Printf("found \"%s\" at finalTags[%d]\n", finalTags[i], i)
+		} else {
+			finalTags = append(finalTags, tag.Name)
+		}
+	}
+	return &finalTags
 }
diff --git a/scrape-movie-service/routes/routes.go b/scrape-movie-service/routes/routes.go
index 7b1d69c..01c05b4 100644
--- a/scrape-movie-service/routes/routes.go
+++ b/scrape-movie-service/routes/routes.go
@@ -21,7 +21,7 @@ func CreateRoutes(api *api.API) *mux.Router {
 	u.HandleFunc("/watchMagnet", api.WatchMagnet).Methods("POST")
 	u.HandleFunc("/searchMovies", api.SearchMovies).Methods("GET")
 	u.HandleFunc("/updateMovie/{movieId}", api.UpdateMovie).Methods("PUT")
-	u.HandleFunc("/searchTags", api.SearchTags).Methods("GET")
+	u.HandleFunc("/searchTags/{name}", api.SearchTags).Methods("GET")
 
 	return muxRouter
 }