0.0.3

pom.xml

@@ -115,12 +115,4 @@
 		</plugins>
 	</build>
 
-	<distributionManagement>
-		<repository>
-			<id>reposilite</id>
-			<name>Reposilite Repository</name>
-			<url>http://192.168.0.9:15534/snapshots</url>
-		</repository>
-	</distributionManagement>
-
 </project>

src/main/java/spotifymixerapi/api/SessionDataMainPageResponse.java

@@ -1,5 +1,8 @@
 package spotifymixerapi.api;
 
+import spotifymixerapi.api.spotify.Spotify_AvailableDevicesResponse;
+import spotifymixerapi.api.spotify.Spotify_DeviceObject;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -7,6 +10,8 @@ public class SessionDataMainPageResponse {
 
     String sessionName;
     List<DisplayNameAndImage> users = new ArrayList<>();
+    List<Spotify_DeviceObject> devices;
+    Spotify_DeviceObject currentlySelectedDevice;
 
     public String getSessionName() {
         return sessionName;
@@ -23,4 +28,20 @@ public class SessionDataMainPageResponse {
     public void setUsers(List<DisplayNameAndImage> users) {
         this.users = users;
     }
+
+    public List<Spotify_DeviceObject> getDevices() {
+        return devices;
+    }
+
+    public void setDevices(List<Spotify_DeviceObject> devices) {
+        this.devices = devices;
+    }
+
+    public Spotify_DeviceObject getCurrentlySelectedDevice() {
+        return currentlySelectedDevice;
+    }
+
+    public void setCurrentlySelectedDevice(Spotify_DeviceObject currentlySelectedDevice) {
+        this.currentlySelectedDevice = currentlySelectedDevice;
+    }
 }

src/main/java/spotifymixerapi/api/redis/Redis_SessionData.java

@@ -1,8 +1,11 @@
 package spotifymixerapi.api.redis;
 
+import spotifymixerapi.api.spotify.Spotify_AvailableDevicesResponse;
+import spotifymixerapi.api.spotify.Spotify_DeviceObject;
+import spotifymixerapi.api.spotify.Spotify_PlaybackState;
+
 import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 
 public class Redis_SessionData implements Serializable {
@@ -10,14 +13,20 @@ public class Redis_SessionData implements Serializable {
     String sessionName;
     String owner;
     List<String> users = new ArrayList<>();
+    LinkedHashMap<String,List<Spotify_DeviceObject>> devices = new LinkedHashMap<>();
+    Spotify_DeviceObject selectedDevice;
+    Map<String, String> currentlyPlayedTrack;
+    LinkedHashMap<String,List<String>> sessionQueueMap = new LinkedHashMap<>();
+    Spotify_PlaybackState playbackState;
+
+    public Redis_SessionData() {
+    }
 
-    public Redis_SessionData(String sessionName, String owner, List<String> users) {
+    public Redis_SessionData(String sessionName, String owner, List<String> users,LinkedHashMap<String,List<Spotify_DeviceObject>> devices) {
         this.sessionName = sessionName;
         this.owner = owner;
         this.users = users;
-    }
+        this.devices = devices;
-
-    public Redis_SessionData() {
     }
 
     public String getSessionName() {
@@ -44,12 +53,65 @@ public class Redis_SessionData implements Serializable {
         this.users = users;
     }
 
+    public LinkedHashMap<String,List<Spotify_DeviceObject>> getDevices() {
+        return devices;
+    }
+
+    public void setDevices(LinkedHashMap<String,List<Spotify_DeviceObject>> devices) {
+        this.devices = devices;
+    }
+
+    public void addDevice(String userId, List<Spotify_DeviceObject> devices) {
+        this.devices.put(userId,devices);
+    }
+
+    public Map<String, String> getCurrentlyPlayedTrack() {
+        return currentlyPlayedTrack;
+    }
+
+    public void setCurrentlyPlayedTrack(String user, String track) {
+        this.currentlyPlayedTrack = Collections.singletonMap(user,track);
+    }
+
+    public LinkedHashMap<String, List<String>> getSessionQueueMap() {
+        return sessionQueueMap;
+    }
+
+    public void setSessionQueueMap(LinkedHashMap<String, List<String>> sessionQueueMap) {
+        this.sessionQueueMap = sessionQueueMap;
+    }
+
+    public Spotify_DeviceObject getSelectedDevice() {
+        return selectedDevice;
+    }
+
+    public void setSelectedDevice(Spotify_DeviceObject selectedDevice) {
+        this.selectedDevice = selectedDevice;
+    }
+
+    public void setCurrentlyPlayedTrack(Map<String, String> currentlyPlayedTrack) {
+        this.currentlyPlayedTrack = currentlyPlayedTrack;
+    }
+
+    public Spotify_PlaybackState getPlaybackState() {
+        return playbackState;
+    }
+
+    public void setPlaybackState(Spotify_PlaybackState playbackState) {
+        this.playbackState = playbackState;
+    }
+
     @Override
     public String toString() {
-        return "SessionData{" +
+        return "Redis_SessionData{" +
                 "sessionName='" + sessionName + '\'' +
                 ", owner='" + owner + '\'' +
                 ", users=" + users +
+                ", devices=" + devices +
+                ", selectedDevice=" + selectedDevice +
+                ", currentlyPlayedTrack=" + currentlyPlayedTrack +
+                ", sessionQueueMap=" + sessionQueueMap +
+                ", playbackState=" + playbackState +
                 '}';
     }
 }

src/main/java/spotifymixerapi/api/redis/Redis_UserData.java

@@ -1,5 +1,7 @@
 package spotifymixerapi.api.redis;
 
+import spotifymixerapi.api.AccessTokenHolder;
+import spotifymixerapi.api.spotify.Spotify_DeviceObject;
 import spotifymixerapi.api.spotify.Spotify_Playlist;
 import spotifymixerapi.api.spotify.Spotify_TrackObject;
 import spotifymixerapi.api.spotify.Spotify_UserDtoResponse;
@@ -12,23 +14,28 @@ import java.util.stream.Collectors;
 public class Redis_UserData implements Serializable {
 
     Spotify_UserDtoResponse spotifyUserDtoResponse;
-    List <String> likedTracks = new ArrayList<>(); //Spotify_TrackObject
+    List <String> likedTracks = new ArrayList<>();
-    List <String> playlistList = new ArrayList<>(); //Spotify_Playlist
+    List <String> playlistList = new ArrayList<>();
+    Boolean hasPremium = false;
+    List <Spotify_DeviceObject> devices;
     List<String> queue = new ArrayList<>();
+    String accessToken;
 
 
     public Redis_UserData() {
     }
 
-    public Redis_UserData(Spotify_UserDtoResponse spotifyUserDtoResponse, List <String> likedTracks, List <String> playlistList) {
+    public Redis_UserData(Spotify_UserDtoResponse spotifyUserDtoResponse, List <String> likedTracks, List <String> playlistList, String accessToken) {
         this.spotifyUserDtoResponse = spotifyUserDtoResponse;
         this.likedTracks = likedTracks;
         this.playlistList = playlistList;
+        this.accessToken = accessToken;
     }
 
-    public Redis_UserData(List<Spotify_TrackObject> likedTracks, List<Spotify_Playlist> playlistLists){
+    public Redis_UserData(List<Spotify_TrackObject> likedTracks, List<Spotify_Playlist> playlistLists,String accessToken){
         likedTracks.stream().forEach(l -> this.likedTracks.add(l.getId()));
         playlistLists.stream().forEach(l -> this.playlistList.add(l.getId()));
+        this.accessToken = accessToken;
     }
 
     public Spotify_UserDtoResponse getSpotifyUserDtoResponse() {
@@ -55,6 +62,22 @@ public class Redis_UserData implements Serializable {
         this.playlistList = playlistList;
     }
 
+    public Boolean getHasPremium() {
+        return hasPremium;
+    }
+
+    public void setHasPremium(Boolean hasPremium) {
+        this.hasPremium = hasPremium;
+    }
+
+    public List<Spotify_DeviceObject> getDevices() {
+        return devices;
+    }
+
+    public void setDevices(List<Spotify_DeviceObject> devices) {
+        this.devices = devices;
+    }
+
     public List<String> getQueue() {
         return queue;
     }
@@ -63,12 +86,18 @@ public class Redis_UserData implements Serializable {
         this.queue = queue;
     }
 
+    public String getAccessToken() {
+        return accessToken;
+    }
+
     @Override
     public String toString() {
         return "Redis_UserData{" +
                 "spotifyUserDtoResponse=" + spotifyUserDtoResponse +
                 ", likedTracks=" + likedTracks +
                 ", playlistList=" + playlistList +
+                ", hasPremium=" + hasPremium +
+                ", devices=" + devices +
                 ", queue=" + queue +
                 '}';
     }

src/main/java/spotifymixerapi/api/spotify/Spotify_AvailableDevicesResponse.java

@@ -0,0 +1,23 @@
+package spotifymixerapi.api.spotify;
+
+import java.util.List;
+
+public class Spotify_AvailableDevicesResponse {
+
+    List<Spotify_DeviceObject> devices;
+
+    public List<Spotify_DeviceObject> getDevices() {
+        return devices;
+    }
+
+    public void setDevices(List<Spotify_DeviceObject> devices) {
+        this.devices = devices;
+    }
+
+    @Override
+    public String toString() {
+        return "Spotify_AvailableDevicesResponse{" +
+                "devices=" + devices +
+                '}';
+    }
+}

src/main/java/spotifymixerapi/api/spotify/Spotify_DeviceObject.java

@@ -0,0 +1,81 @@
+package spotifymixerapi.api.spotify;
+
+public class Spotify_DeviceObject {
+
+    String id;
+    boolean is_active;
+    boolean is_restricted;
+    String name;
+    String type;
+    int volume_percent;
+    boolean supports_volume;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public boolean isIs_active() {
+        return is_active;
+    }
+
+    public void setIs_active(boolean is_active) {
+        this.is_active = is_active;
+    }
+
+    public boolean isIs_restricted() {
+        return is_restricted;
+    }
+
+    public void setIs_restricted(boolean is_restricted) {
+        this.is_restricted = is_restricted;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public int getVolume_percent() {
+        return volume_percent;
+    }
+
+    public void setVolume_percent(int volume_percent) {
+        this.volume_percent = volume_percent;
+    }
+
+    public boolean isSupports_volume() {
+        return supports_volume;
+    }
+
+    public void setSupports_volume(boolean supports_volume) {
+        this.supports_volume = supports_volume;
+    }
+
+    @Override
+    public String toString() {
+        return "Spotify_DeviceObject{" +
+                "id='" + id + '\'' +
+                ", is_active=" + is_active +
+                ", is_restricted=" + is_restricted +
+                ", name='" + name + '\'' +
+                ", type='" + type + '\'' +
+                ", volume_percent=" + volume_percent +
+                ", supports_volume=" + supports_volume +
+                '}';
+    }
+}

src/main/java/spotifymixerapi/api/spotify/Spotify_PlaybackState.java

@@ -0,0 +1,34 @@
+package spotifymixerapi.api.spotify;
+
+import java.io.Serializable;
+import java.lang.foreign.SegmentAllocator;
+
+public class Spotify_PlaybackState implements Serializable {
+
+    int progress_ms;
+    boolean is_playing;
+
+    public int getProgress_ms() {
+        return progress_ms;
+    }
+
+    public void setProgress_ms(int progress_ms) {
+        this.progress_ms = progress_ms;
+    }
+
+    public boolean isIs_playing() {
+        return is_playing;
+    }
+
+    public void setIs_playing(boolean is_playing) {
+        this.is_playing = is_playing;
+    }
+
+    @Override
+    public String toString() {
+        return "Spotify_PlaybackState{" +
+                "progress_ms=" + progress_ms +
+                ", is_playing=" + is_playing +
+                '}';
+    }
+}

src/main/java/spotifymixerapi/api/spotify/Spotify_StaryPlaybackRequest.java

@@ -0,0 +1,35 @@
+package spotifymixerapi.api.spotify;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spotify_StaryPlaybackRequest implements Serializable {
+
+    int position_ms = 0;
+    List<String> uris = new ArrayList<>();
+
+    public int getPosition_ms() {
+        return position_ms;
+    }
+
+    public void setPosition_ms(int position_ms) {
+        this.position_ms = position_ms;
+    }
+
+    public List<String> getUris() {
+        return uris;
+    }
+
+    public void setUris(List<String> uris) {
+        this.uris = uris;
+    }
+
+    @Override
+    public String toString() {
+        return "Spotify_StaryPlaybackRequest{" +
+                "position_ms=" + position_ms +
+                ", uris=" + uris +
+                '}';
+    }
+}

src/main/java/spotifymixerapi/api/spotify/Spotify_TransferPlaybackRequest.java

@@ -0,0 +1,24 @@
+package spotifymixerapi.api.spotify;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Spotify_TransferPlaybackRequest implements Serializable {
+    List<String> device_ids = new ArrayList<>();
+
+    public List<String> getDevice_ids() {
+        return device_ids;
+    }
+
+    public void setDevice_ids(List<String> device_ids) {
+        this.device_ids = device_ids;
+    }
+
+    @Override
+    public String toString() {
+        return "Spotify_TransferPlaybackRequest{" +
+                "device_ids=" + device_ids +
+                '}';
+    }
+}

src/main/java/spotifymixerapi/api/spotify/Spotify_UserDtoResponse.java

@@ -9,18 +9,11 @@ public class Spotify_UserDtoResponse implements Serializable {
     Spotify_ImageObjectDto[] images;
     String uri;
     String id;
+    String product;
 
     public Spotify_UserDtoResponse() {
     }
 
-    public Spotify_ImageObjectDto[] getImages() {
-        return images;
-    }
-
-    public void setImages(Spotify_ImageObjectDto[] images) {
-        this.images = images;
-    }
-
     public String getDisplay_name() {
         return display_name;
     }
@@ -29,6 +22,14 @@ public class Spotify_UserDtoResponse implements Serializable {
         this.display_name = display_name;
     }
 
+    public Spotify_ImageObjectDto[] getImages() {
+        return images;
+    }
+
+    public void setImages(Spotify_ImageObjectDto[] images) {
+        this.images = images;
+    }
+
     public String getUri() {
         return uri;
     }
@@ -45,6 +46,13 @@ public class Spotify_UserDtoResponse implements Serializable {
         this.id = id;
     }
 
+    public String getProduct() {
+        return product;
+    }
+
+    public void setProduct(String product) {
+        this.product = product;
+    }
 
     @Override
     public String toString() {
@@ -53,6 +61,7 @@ public class Spotify_UserDtoResponse implements Serializable {
                 ", images=" + Arrays.toString(images) +
                 ", uri='" + uri + '\'' +
                 ", id='" + id + '\'' +
+                ", product='" + product + '\'' +
                 '}';
     }
 }