From e9627fa59a20c9ed4dadbb8bdd659051a1da58ca Mon Sep 17 00:00:00 2001 From: Quentin Rouland Date: Thu, 1 Dec 2016 10:14:43 +0100 Subject: [PATCH] clean controller --- .../controller/MainController.java.orig | 197 ------------------ 1 file changed, 197 deletions(-) delete mode 100644 src/main/java/com/camillepradel/movierecommender/controller/MainController.java.orig diff --git a/src/main/java/com/camillepradel/movierecommender/controller/MainController.java.orig b/src/main/java/com/camillepradel/movierecommender/controller/MainController.java.orig deleted file mode 100644 index 5cc5996..0000000 --- a/src/main/java/com/camillepradel/movierecommender/controller/MainController.java.orig +++ /dev/null @@ -1,197 +0,0 @@ -package com.camillepradel.movierecommender.controller; - -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.bind.annotation.RequestMethod; - -import com.camillepradel.movierecommender.model.Genre; -import com.camillepradel.movierecommender.model.Movie; -<<<<<<< HEAD -import com.mongodb.BasicDBObject; -import com.mongodb.client.MongoCollection; -import com.mongodb.client.MongoCursor; -import com.mongodb.client.MongoDatabase; -import java.util.ArrayList; -import org.bson.Document; -======= ->>>>>>> a72a92de3cdc61c123708e0446b315525a3fc276 -import com.camillepradel.movierecommender.model.Rating; - -@Controller -public class MainController { - String message = "Welcome to Spring MVC!"; - - @RequestMapping("/hello") - public ModelAndView showMessage( - @RequestParam(value = "name", required = false, defaultValue = "World") String name) { - System.out.println("in controller"); - ModelAndView mv = new ModelAndView("helloworld"); - mv.addObject("message", message); - mv.addObject("name", name); - return mv; - } - - @RequestMapping("/movies") - public ModelAndView showMovies( - @RequestParam(value = "user_id", required = false) Integer userId) { - -<<<<<<< HEAD - List movies = Neo4JController.getMoviesNeo4JByUser(userId); - //List movies = getMoviesMongoDBByUser(userId); -======= - //List movies = getMoviesNeo4JByUser(userId); - List movies = MongoDBController.getMoviesMongoDBByUser(userId); ->>>>>>> a72a92de3cdc61c123708e0446b315525a3fc276 - - ModelAndView mv = new ModelAndView("movies"); - mv.addObject("userId", userId); - mv.addObject("movies", movies); - return mv; - } -<<<<<<< HEAD - - - - - - - public ListgetMoviesMongoDBByUser(Integer user_id){ - ArrayList listMovies= new ArrayList(); - MongoCursor cursor; - - MongoDatabase db = MongoDBConnector.getInstance().getConnexion(); - MongoCollection movies = db.getCollection("movies"); - if(user_id != null) - { - MongoCollection users = db.getCollection("users"); - BasicDBObject whereQuery = new BasicDBObject(); - whereQuery.put("_id", user_id); - - cursor = users.find(whereQuery).iterator(); - Document user; - try { - user = cursor.next(); - } catch(Exception e) - { - return new ArrayList(); - } - ArrayList user_movies; - user_movies = (ArrayList) user.get("movies"); - BasicDBObject inQuery = new BasicDBObject(); - List list = new ArrayList(); - for(Document movie : user_movies) - list.add(movie.getInteger("movieid")); - - inQuery.put("_id", new BasicDBObject("$in", list)); - cursor = movies.find(inQuery).iterator(); - } - else - { - cursor = movies.find().iterator(); - } - - while (cursor.hasNext()) { - Document movie = cursor.next(); - String[] genres; - genres = movie.getString("genres").split("\\|"); - ArrayList listGenres = new ArrayList(); - for(String genre : genres){ - listGenres.add(new Genre(1,genre)); - } - - listMovies.add(new Movie(movie.getInteger("_id"), movie.getString("title"), listGenres)); - } - return listMovies; - } -======= ->>>>>>> a72a92de3cdc61c123708e0446b315525a3fc276 - - @RequestMapping(value = "/movieratings", method = RequestMethod.GET) - public ModelAndView showMoviesRattings( - @RequestParam(value = "user_id", required = true) Integer userId) { - System.out.println("GET /movieratings for user " + userId); - -<<<<<<< HEAD - // TODO: write query to retrieve all movies from DB - List allMovies = new LinkedList(); - Genre genre0 = new Genre(0, "genre0"); - Genre genre1 = new Genre(1, "genre1"); - Genre genre2 = new Genre(2, "genre2"); - allMovies.add(new Movie(0, "Titre 0", Arrays.asList(new Genre[] {genre0, genre1}))); - allMovies.add(new Movie(1, "Titre 1", Arrays.asList(new Genre[] {genre0, genre2}))); - allMovies.add(new Movie(2, "Titre 2", Arrays.asList(new Genre[] {genre1}))); - allMovies.add(new Movie(3, "Titre 3", Arrays.asList(new Genre[] {genre0, genre1, genre2}))); - - // TODO: write query to retrieve all ratings from the specified user - List ratings = new LinkedList(); - //ratings.add(new Rating(new Movie(0, "Titre 0", Arrays.asList(new Genre[] {genre0, genre1})), userId, 3)); - //ratings.add(new Rating(new Movie(2, "Titre 2", Arrays.asList(new Genre[] {genre1})), userId, 4)); -======= - // write query to retrieve all movies from DB - List allMovies = MongoDBController.getMoviesMongoDBByUser(null); - - // write query to retrieve all ratings from the specified user - List ratings = MongoDBController.getRatingMongoDBByUser(userId); ->>>>>>> a72a92de3cdc61c123708e0446b315525a3fc276 - - ratings=Neo4JController.GetMoviesRatingNeo4JByUser(userId); - ModelAndView mv = new ModelAndView("movieratings"); - mv.addObject("userId", userId); - mv.addObject("allMovies", allMovies); - mv.addObject("ratings", ratings); - - return mv; - } - - @RequestMapping(value = "/movieratings", method = RequestMethod.POST) - public String saveOrUpdateRating(@ModelAttribute("rating") Rating rating) { - System.out.println("POST /movieratings for user " + rating.getUserId() - + ", movie " + rating.getMovie().getId() - + ", score " + rating.getScore()); - - // TODO: add query which - // - add rating between specified user and movie if it doesn't exist - // - update it if it does exist - - return "redirect:/movieratings?user_id=" + rating.getUserId(); - } - - @RequestMapping(value = "/recommendations", method = RequestMethod.GET) - public ModelAndView ProcessRecommendations( - @RequestParam(value = "user_id", required = true) Integer userId, - @RequestParam(value = "processing_mode", required = false, defaultValue = "0") Integer processingMode){ - System.out.println("GET /movieratings for user " + userId); - - // TODO: process recommendations for specified user exploiting other users ratings - // use different methods depending on processingMode parameter - Genre genre0 = new Genre(0, "genre0"); - Genre genre1 = new Genre(1, "genre1"); - Genre genre2 = new Genre(2, "genre2"); - List recommendations = new LinkedList(); - String titlePrefix; - if (processingMode.equals(0)) - titlePrefix = "0_"; - else if (processingMode.equals(1)) - titlePrefix = "1_"; - else if (processingMode.equals(2)) - titlePrefix = "2_"; - else - titlePrefix = "default_"; - recommendations.add(new Rating(new Movie(0, titlePrefix + "Titre 0", Arrays.asList(new Genre[] {genre0, genre1})), userId, 5)); - recommendations.add(new Rating(new Movie(1, titlePrefix + "Titre 1", Arrays.asList(new Genre[] {genre0, genre2})), userId, 5)); - recommendations.add(new Rating(new Movie(2, titlePrefix + "Titre 2", Arrays.asList(new Genre[] {genre1})), userId, 4)); - recommendations.add(new Rating(new Movie(3, titlePrefix + "Titre 3", Arrays.asList(new Genre[] {genre0, genre1, genre2})), userId, 3)); - - ModelAndView mv = new ModelAndView("recommendations"); - mv.addObject("recommendations", recommendations); - - return mv; - } -}