Merge pull request #715 from caelum/removingMusicOwner

[jungle] removing legacy MusicOwner

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/controller/MusicController.java

@@ -37,11 +37,12 @@
 import br.com.caelum.vraptor.Post;
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.musicjungle.dao.MusicDao;
+import br.com.caelum.vraptor.musicjungle.dao.UserDao;
 import br.com.caelum.vraptor.musicjungle.files.Musics;
 import br.com.caelum.vraptor.musicjungle.interceptor.Public;
 import br.com.caelum.vraptor.musicjungle.interceptor.UserInfo;
 import br.com.caelum.vraptor.musicjungle.model.Music;
-import br.com.caelum.vraptor.musicjungle.model.MusicOwner;
+import br.com.caelum.vraptor.musicjungle.model.User;
 import br.com.caelum.vraptor.observer.download.Download;
 import br.com.caelum.vraptor.observer.download.FileDownload;
 import br.com.caelum.vraptor.observer.upload.UploadedFile;
@@ -70,12 +71,13 @@ public class MusicController {
 	private final UserInfo userInfo;
 	private final MusicDao musicDao;
 	private final Musics musics;
+	private final UserDao userDao;
 
 	/**
 	 * @deprecated CDI eyes only
 	 */
 	protected MusicController() {
-		this(null, null, null, null, null);
+		this(null, null, null, null, null, null);
 	}
 
 
@@ -86,15 +88,17 @@ protected MusicController() {
 	 * @param result VRaptor result handler.
 	 * @param validator VRaptor validator.
 	 * @param factory dao factory.
+	 * @param userDao
 	 */
 	@Inject
 	public MusicController(MusicDao musicDao, UserInfo userInfo, 
-				Result result, Validator validator, Musics musics) {
+				Result result, Validator validator, Musics musics, UserDao userDao) {
 		this.musicDao = musicDao;
 		this.result = result;
         this.validator = validator;
         this.userInfo = userInfo;
 		this.musics = musics;
+		this.userDao = userDao;
 	}
 
 	/**
@@ -115,7 +119,11 @@ public void add(final @NotNull @Valid Music music, UploadedFile file) {
 		validator.onErrorForwardTo(UsersController.class).home();
 
 		musicDao.add(music);
-		musicDao.add(new MusicOwner(userInfo.getUser(), music));
+
+		User currentUser = userInfo.getUser();
+		userDao.refresh(currentUser);
+
+		currentUser.add(music);
 
 		// is there a file?
 		if (file != null) {

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/controller/UsersController.java

@@ -23,12 +23,17 @@
 import br.com.caelum.vraptor.Get;
 import br.com.caelum.vraptor.Path;
 import br.com.caelum.vraptor.Post;
+import br.com.caelum.vraptor.Put;
 import br.com.caelum.vraptor.Result;
+import br.com.caelum.vraptor.musicjungle.dao.MusicDao;
 import br.com.caelum.vraptor.musicjungle.dao.UserDao;
 import br.com.caelum.vraptor.musicjungle.enums.MusicType;
 import br.com.caelum.vraptor.musicjungle.interceptor.Public;
+import br.com.caelum.vraptor.musicjungle.interceptor.UserInfo;
+import br.com.caelum.vraptor.musicjungle.model.Music;
 import br.com.caelum.vraptor.musicjungle.model.User;
 import br.com.caelum.vraptor.musicjungle.validation.LoginAvailable;
+import br.com.caelum.vraptor.validator.SimpleMessage;
 import br.com.caelum.vraptor.validator.Validator;
 
 /**
@@ -41,12 +46,14 @@ public class UsersController {
 	private final Validator validator;
 	private final Result result;
 	private final UserDao userDao;
+	private final UserInfo userInfo;
+	private final MusicDao musicDao;
 
 	/**
 	 * @deprecated CDI eyes only
 	 */
 	protected UsersController() {
-		this(null, null, null);
+		this(null, null, null, null, null);
 	}
 
 	/**
@@ -56,12 +63,17 @@ protected UsersController() {
 	 * @param userInfo info on the logged user.
 	 * @param result VRaptor result handler.
 	 * @param validator VRaptor validator.
+	 * @param userInfo 
 	 */
 	@Inject
-	public UsersController(UserDao dao, Result result, Validator validator) {
+	public UsersController(UserDao dao, Result result, Validator validator, 
+			UserInfo userInfo, MusicDao musicDao) {
+
 		this.userDao = dao;
 		this.result = result;
 		this.validator = validator;
+		this.userInfo = userInfo;
+		this.musicDao = musicDao;
 	}
 
 	/**
@@ -141,4 +153,40 @@ public void show(User user) {
 	    result.forwardTo("/WEB-INF/jsp/users/view.jsp");
 
 	}
+
+	/**
+     * Accepts HTTP PUT requests. <br>
+     * 
+     * <strong>URL:</strong> /users/login/musics/id (for example, 
+     * /users/john/musics/3 adds the music with id 3 to the john's 
+     * collection)<br>
+     * 
+     * <strong>View:</strong> redirects to user's home <br>
+     *
+     * You can use more than one variable on URI. Since the browsers 
+     * don't support PUT method you have to pass an additional parameter: 
+     * <strong>_method=PUT</strong> for calling this method.<br>
+     *
+     * This method adds a music to a user's collection.
+     */
+    @Path("/users/{user.login}/musics/{music.id}")
+    @Put
+	public void addToMyList(User user, Music music) {
+    	User currentUser = userInfo.getUser();
+	    userDao.refresh(currentUser);
+
+	    validator.check(user.getLogin().equals(currentUser.getLogin()), 
+	            new SimpleMessage("user", "you_cant_add_to_others_list"));
+
+	    validator.check(!currentUser.getMusics().contains(music), 
+	            new SimpleMessage("music", "you_already_have_this_music"));
+
+		validator.onErrorUsePageOf(UsersController.class).home();
+
+		music = musicDao.load(music);
+		currentUser.add(music);
+
+		result.redirectTo(UsersController.class).home();
+	}
+
 }

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/DefaultMusicDao.java

@@ -22,7 +22,6 @@
 import javax.persistence.EntityManager;
 
 import br.com.caelum.vraptor.musicjungle.model.Music;
-import br.com.caelum.vraptor.musicjungle.model.MusicOwner;
 
 /**
  * Default implementation for MusicDao.
@@ -56,11 +55,6 @@ public void add(Music music) {
 		entityManager.persist(music);
 	}
 
-	@Override
-	public void add(MusicOwner copy) {
-		entityManager.persist(copy);
-	}
-
 	@Override
 	public List<Music> searchSimilarTitle(String title) {
 		List<Music> musics = entityManager

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/DefaultUserDao.java

@@ -93,9 +93,8 @@ public void add(User user) {
 	}
 
 	@Override
-	public User refresh(User user) {
+	public void refresh(User user) {
 		getSession().refresh(user); // You still can use Hibernate Session
-		return user;
 	}
 
 	@Override

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/MusicDao.java

@@ -19,7 +19,6 @@
 import java.util.List;
 
 import br.com.caelum.vraptor.musicjungle.model.Music;
-import br.com.caelum.vraptor.musicjungle.model.MusicOwner;
 
 /**
  * Data Access Object for the Music entity.
@@ -34,11 +33,6 @@ public interface MusicDao {
 	 */
 	void add(Music music);
 
-	/**
-	 * Adds a copy of the music
-	 */
-	void add(MusicOwner copy);
-
 	/**
 	 * Load the music from database
 	 */

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/dao/UserDao.java

@@ -56,7 +56,7 @@ public interface UserDao {
 	 * Any not saved modification on user will be overwritten.
 	 * @return 
 	 */
-	User refresh(User user);
+	void refresh(User user);
 
 	/**
 	 * Update the user on database.

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/interceptor/AuthorizationInterceptor.java

@@ -57,9 +57,9 @@ public boolean accepts(ControllerMethod method) {
 	@AroundCall
 	public void intercept(SimpleInterceptorStack stack) {
 
-		User current = null;
+		User current = info.getUser();
 		try {
-			current = dao.refresh(info.getUser());
+			dao.refresh(current);
 		} catch (Exception e) {
 			// could happen if the user does not exist in the database or if there's no user logged in.
 		}
@@ -74,7 +74,6 @@ public void intercept(SimpleInterceptorStack stack) {
 			result.redirectTo(HomeController.class).login();
 			return;
 		}
-
 		stack.next();
 	}
 

vraptor-musicjungle/src/main/java/br/com/caelum/vraptor/musicjungle/model/Music.java

@@ -16,14 +16,15 @@
  */
 package br.com.caelum.vraptor.musicjungle.model;
 
+import java.util.HashSet;
 import java.util.Set;
 
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import javax.persistence.ManyToMany;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -51,8 +52,8 @@ public class Music {
     @Size(min = 6)
 	private String description;
 
-	@OneToMany(mappedBy = "music")
-	private Set<MusicOwner> musicOwners;
+	@ManyToMany(mappedBy = "musics")
+	private Set<User> owners = new HashSet<>();
 
 	@NotNull
 	@Enumerated(EnumType.STRING)
@@ -89,13 +90,9 @@ public MusicType getType() {
 	public void setType(MusicType type) {
 		this.type = type;
 	}
-
-	public Set<MusicOwner> getMusicOwners() {
-		return musicOwners;
-	}
-
-	public void setMusicOwners(Set<MusicOwner> copies) {
-		this.musicOwners = copies;
+
+	public Set<User> getOwners() {
+		return owners;
 	}
 
 	@Override