Implement song queue management for clients, including adding songs to preferred queue and retrieving the queue for a radio station

backend/src/main/java/com/serena/backend/controller/SongController.java

@@ -1,8 +1,8 @@
 package com.serena.backend.controller;
 
 import com.serena.backend.dto.ApiResponse;
-import com.serena.backend.dto.ConnectClientRequest;
-import com.serena.backend.dto.AddSongRequest;
+import com.serena.backend.dto.AddSongToClientQueueRequest;
+import com.serena.backend.model.Song;
 import com.serena.backend.service.RadioStationService;
 import com.serena.backend.service.JwtService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,8 +10,11 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Optional;
+import java.util.Queue;
+
 @RestController
-@RequestMapping("/api/songs/")
+@RequestMapping("/api/songs")
 @CrossOrigin(origins = "*")
 public class SongController {
 
@@ -21,20 +24,33 @@ public class SongController {
   @Autowired
   private JwtService jwtService;
 
-  @PostMapping
-  public ResponseEntity<ApiResponse<Void>> addSong(@RequestBody AddSongRequest request) {
-    if (request.getSong() == null || request.getRadioStationId() == null) {
+  @PostMapping("/queue")
+  public ResponseEntity<ApiResponse<Void>> addSongToClientQueue(@RequestBody AddSongToClientQueueRequest request) {
+    if (request.getSong() == null || request.getClientId() == null) {
       return ResponseEntity.badRequest()
-          .body(new ApiResponse<>(false, "Song data and radio station ID are required", null));
+          .body(new ApiResponse<>(false, "Song data and client ID are required", null));
     }
 
-    boolean success = radioStationService.addSongToQueue(request.getRadioStationId(), request.getSong());
+    boolean success = radioStationService.addSongToClientQueue(request.getClientId(), request.getSong());
 
     if (success) {
-      return ResponseEntity.ok(new ApiResponse<>(true, "Song added to queue successfully", null));
+      return ResponseEntity.ok(new ApiResponse<>(true, "Song added to client's preferred queue successfully", null));
     } else {
       return ResponseEntity.status(HttpStatus.NOT_FOUND)
-          .body(new ApiResponse<>(false, "Radio station not found or inactive", null));
+          .body(new ApiResponse<>(false, "Client not found", null));
+    }
+  }
+
+  @GetMapping("/queue")
+  public ResponseEntity<ApiResponse<Queue<Song>>> getRadioStationQueue(@RequestParam String radioStationId) {
+    Optional<com.serena.backend.model.RadioStation> station = radioStationService.getRadioStation(radioStationId);
+
+    if (station.isPresent()) {
+      Queue<Song> queue = station.get().getSongQueue();
+      return ResponseEntity.ok(new ApiResponse<>(true, "Queue retrieved successfully", queue));
+    } else {
+      return ResponseEntity.status(HttpStatus.NOT_FOUND)
+          .body(new ApiResponse<>(false, "Radio station not found", null));
     }
   }
 }

backend/src/main/java/com/serena/backend/dto/AddSongRequest.java

@@ -6,7 +6,8 @@ public class AddSongRequest {
   private Song song;
   private String radioStationId;
 
-  public AddSongRequest() {}
+  public AddSongRequest() {
+  }
 
   public AddSongRequest(Song song, String radioStationId) {
     this.song = song;

backend/src/main/java/com/serena/backend/dto/AddSongToClientQueueRequest.java

@@ -0,0 +1,41 @@
+package com.serena.backend.dto;
+
+import com.serena.backend.model.Song;
+
+public class AddSongToClientQueueRequest {
+  private Song song;
+  private String clientId;
+  private String radioStationId;
+
+  public AddSongToClientQueueRequest() {}
+
+  public AddSongToClientQueueRequest(Song song, String clientId, String radioStationId) {
+    this.song = song;
+    this.clientId = clientId;
+    this.radioStationId = radioStationId;
+  }
+
+  public Song getSong() {
+    return song;
+  }
+
+  public void setSong(Song song) {
+    this.song = song;
+  }
+
+  public String getClientId() {
+    return clientId;
+  }
+
+  public void setClientId(String clientId) {
+    this.clientId = clientId;
+  }
+
+  public String getRadioStationId() {
+    return radioStationId;
+  }
+
+  public void setRadioStationId(String radioStationId) {
+    this.radioStationId = radioStationId;
+  }
+}

backend/src/main/java/com/serena/backend/model/Client.java

@@ -2,16 +2,20 @@ package com.serena.backend.model;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
+import java.util.LinkedList;
+import java.util.Queue;
 
 public class Client {
   private String id;
   private String username;
   private String radioStationId;
   private LocalDateTime connectedAt;
+  private Queue<Song> preferredQueue;
 
   public Client() {
     this.id = UUID.randomUUID().toString();
     this.connectedAt = LocalDateTime.now();
+    this.preferredQueue = new LinkedList<>();
   }
 
   public Client(String username, String radioStationId) {
@@ -53,4 +57,20 @@ public class Client {
     this.connectedAt = connectedAt;
   }
 
+  public Queue<Song> getPreferredQueue() {
+    return preferredQueue;
+  }
+
+  public void setPreferredQueue(Queue<Song> preferredQueue) {
+    this.preferredQueue = preferredQueue;
+  }
+
+  public void addSongToPreferredQueue(Song song) {
+    this.preferredQueue.offer(song);
+  }
+
+  public Song getNextPreferredSong() {
+    return this.preferredQueue.poll();
+  }
+
 }

backend/src/main/java/com/serena/backend/model/RadioStation.java

@@ -15,7 +15,7 @@ public class RadioStation {
   private String ownerId;
   private String joinCode;
   private LocalDateTime createdAt;
-  private List<String> connectedClients;
+  private List<Client> connectedClients;
   private Queue<Song> songQueue;
 
   public RadioStation() {
@@ -93,11 +93,11 @@ public class RadioStation {
     this.createdAt = createdAt;
   }
 
-  public List<String> getConnectedClients() {
+  public List<Client> getConnectedClients() {
     return connectedClients;
   }
 
-  public void setConnectedClients(List<String> connectedClients) {
+  public void setConnectedClients(List<Client> connectedClients) {
     this.connectedClients = connectedClients;
   }
 

backend/src/main/java/com/serena/backend/service/RadioStationService.java

@@ -54,9 +54,10 @@ public class RadioStationService {
     RadioStation station = radioStations.get(stationId);
     if (station != null) {
       // Disconnect all clients
+      for (Client client : station.getConnectedClients()) {
+        clients.remove(client.getId());
+      }
       station.getConnectedClients().clear();
-      // Remove from clients map
-      clients.entrySet().removeIf(entry -> stationId.equals(entry.getValue().getRadioStationId()));
       radioStations.remove(stationId);
       return true;
     }
@@ -69,7 +70,7 @@ public class RadioStationService {
     if (station != null && station.getJoinCode().equals(joinCode)) {
       Client client = new Client(username, radioStationId);
       clients.put(client.getId(), client);
-      station.getConnectedClients().add(client.getId());
+      station.getConnectedClients().add(client);
       return Optional.of(client);
     }
     return Optional.empty();
@@ -81,7 +82,7 @@ public class RadioStationService {
       RadioStation station = stationOpt.get();
       Client client = new Client(username, station.getId());
       clients.put(client.getId(), client);
-      station.getConnectedClients().add(client.getId());
+      station.getConnectedClients().add(client);
       return Optional.of(client);
     }
     return Optional.empty();
@@ -92,7 +93,7 @@ public class RadioStationService {
     if (client != null) {
       RadioStation station = radioStations.get(client.getRadioStationId());
       if (station != null) {
-        station.getConnectedClients().remove(clientId);
+        station.getConnectedClients().removeIf(c -> c.getId().equals(clientId));
       }
       clients.remove(clientId);
       return true;
@@ -107,10 +108,7 @@ public class RadioStationService {
   public List<Client> getConnectedClients(String radioStationId) {
     RadioStation station = radioStations.get(radioStationId);
     if (station != null) {
-      return station.getConnectedClients().stream()
-          .map(clients::get)
-          .filter(client -> client != null)
-          .toList();
+      return new ArrayList<>(station.getConnectedClients());
     }
     return new ArrayList<>();
   }
@@ -132,4 +130,22 @@ public class RadioStationService {
     return Optional.empty();
   }
 
+  // Client Queue Management
+  public boolean addSongToClientQueue(String clientId, Song song) {
+    Client client = clients.get(clientId);
+    if (client != null) {
+      client.addSongToPreferredQueue(song);
+      return true;
+    }
+    return false;
+  }
+
+  public Optional<Song> getNextClientSong(String clientId) {
+    Client client = clients.get(clientId);
+    if (client != null) {
+      return Optional.ofNullable(client.getNextPreferredSong());
+    }
+    return Optional.empty();
+  }
+
 }