sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Adding restAPI deletrack for playlist

Browse Source
This commit is contained in:
Sebastien 2018-03-09 15:41:59 +01:00
parent 20e8750085
commit 72deefb166
3 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/Broken/RestApi/Data/Playlist/DeleteTrackData.java Normal file
View File

@ -0,0 +1,6 @@
package net.Broken.RestApi.Data.Playlist;
public class DeleteTrackData {
public int id;
public int playlistId;
}

14
src/main/java/net/Broken/RestApi/PlaylistAPIController.java
View File

@ -6,15 +6,11 @@ import net.Broken.DB.Entity.UserEntity;
import net.Broken.DB.Repository.PlaylistRepository; import net.Broken.DB.Repository.PlaylistRepository;
import net.Broken.DB.Repository.TrackRepository; import net.Broken.DB.Repository.TrackRepository;
import net.Broken.DB.Repository.UserRepository; import net.Broken.DB.Repository.UserRepository;
import net.Broken.MainBot;
import net.Broken.RestApi.Data.CommandPostData;
import net.Broken.RestApi.Data.CommandResponseData;
import net.Broken.RestApi.Data.Playlist.AddToPlaylistData; import net.Broken.RestApi.Data.Playlist.AddToPlaylistData;
import net.Broken.RestApi.Data.Playlist.CreatePlaylistData; import net.Broken.RestApi.Data.Playlist.CreatePlaylistData;
import net.Broken.RestApi.Data.Playlist.DeleteTrackData;
import net.Broken.RestApi.Data.Playlist.PlaylistResponseData; import net.Broken.RestApi.Data.Playlist.PlaylistResponseData;
import net.Broken.audio.Playlist.PlaylistManager; import net.Broken.audio.Playlist.PlaylistManager;
import net.Broken.audio.WebLoadUtils;
import net.dv8tion.jda.core.entities.User;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -86,5 +82,13 @@ public class PlaylistAPIController {
} }
@RequestMapping("/dellTrack")
public ResponseEntity<PlaylistResponseData> dellTrack(@CookieValue(value = "token", defaultValue = "") String token, @RequestBody DeleteTrackData data){
PlaylistManager playlistManager = PlaylistManager.getINSTANCE();
return playlistManager.removeTrack(token, data);
}
} }

47
src/main/java/net/Broken/audio/Playlist/PlaylistManager.java
View File

@ -9,6 +9,7 @@ import net.Broken.DB.Repository.UserRepository;
import net.Broken.MainBot; import net.Broken.MainBot;
import net.Broken.RestApi.Data.CommandResponseData; import net.Broken.RestApi.Data.CommandResponseData;
import net.Broken.RestApi.Data.Playlist.AddToPlaylistData; import net.Broken.RestApi.Data.Playlist.AddToPlaylistData;
import net.Broken.RestApi.Data.Playlist.DeleteTrackData;
import net.Broken.RestApi.Data.Playlist.PlaylistResponseData; import net.Broken.RestApi.Data.Playlist.PlaylistResponseData;
import net.Broken.SpringContext; import net.Broken.SpringContext;
import net.Broken.Tools.UserManager.Exceptions.UnknownTokenException; import net.Broken.Tools.UserManager.Exceptions.UnknownTokenException;
@ -92,6 +93,51 @@ public class PlaylistManager {
} }
public ResponseEntity<PlaylistResponseData> removeTrack(String token, DeleteTrackData data){
UserUtils userUtils = UserUtils.getInstance();
try {
UserEntity user = userUtils.getUserWithApiToken(userRepository, token);
PlaylistEntity playlist = getPlaylist(data.playlistId);
List<TrackEntity> tracks = trackRepository.findDistinctByPlaylistOrderByPos(playlist);
TrackEntity toDelete = trackRepository.findOne(data.id);
if(toDelete == null){
logger.warn("Track not found in DB, id: "+ data.id);
return TRACK_NOT_FOUND;
}
int toDeleteIndex = tracks.indexOf(toDelete);
logger.debug("To delete index: " + toDeleteIndex);
if(toDeleteIndex == -1){
logger.warn("Track not found in playlist, id: " + data.id + " playlist: " + data.playlistId);
return TRACK_NOT_FOUND;
}
for(int i = toDeleteIndex + 1; i< tracks.size(); i++){
tracks.get(i).setPos(tracks.get(i).getPos() - 1);
trackRepository.save(tracks.get(i));
}
tracks.remove(toDelete);
trackRepository.delete(toDelete);
playlist.setTracks(tracks);
playlist = playlistRepository.save(playlist);
return new ResponseEntity<>(new PlaylistResponseData("Ok", playlist),HttpStatus.OK);
} catch (UnknownTokenException e) {
logger.warn("Unknown token: "+ token);
return TOKEN_ERROR;
} catch (PlaylistNotFoundException e) {
logger.debug("Playlist not found: "+ data.playlistId);
return PLAYLIST_NOT_FOUND;
}
}
private PlaylistEntity getPlaylist(int id) throws PlaylistNotFoundException{ private PlaylistEntity getPlaylist(int id) throws PlaylistNotFoundException{
@ -103,6 +149,7 @@ public class PlaylistManager {
} }
private PlaylistEntity insert(PlaylistEntity playlistEntity, TrackEntity trackEntity){ private PlaylistEntity insert(PlaylistEntity playlistEntity, TrackEntity trackEntity){
List<TrackEntity> tracks = trackRepository.findDistinctByPlaylistOrderByPos(playlistEntity); List<TrackEntity> tracks = trackRepository.findDistinctByPlaylistOrderByPos(playlistEntity);