Merge branch 'development' of https://github.com/somiljain2006/SpaceHub-Backend into development

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: MonuChaudhary14

src/main/java/org/spacehub/controller/voiceRoom/VoiceRoomController.java

@@ -12,7 +12,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.fasterxml.jackson.databind.JsonNode;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -62,11 +64,10 @@ public ResponseEntity<?> joinVoiceRoom(
       String sessionId = janusService.createSession();
       String handleId = janusService.attachAudioBridgePlugin(sessionId);
 
-      JsonNode janusResponse = janusService.joinAudioRoom(sessionId, handleId, janusRoomId, displayName);
-
-      JsonNode participantsNode = janusResponse.path("plugindata").path("data").path("participants");
+      janusService.joinAudioRoom(sessionId, handleId, janusRoomId, displayName);
+      JsonNode participantsNode = janusService.listParticipants(sessionId, handleId, janusRoomId);
 
-      Map<String, Object> responseData = new java.util.HashMap<>();
+      Map<String, Object> responseData = new HashMap<>();
       responseData.put("message", "Joined voice room successfully");
       responseData.put("janusRoomId", janusRoomId);
       responseData.put("sessionId", sessionId);

src/main/java/org/spacehub/service/VoiceRoom/JanusService.java

@@ -111,17 +111,53 @@ public void createAudioRoom(String sessionId, String handleId, int roomId) {
     restTemplate.postForEntity(handleUrl, request, JsonNode.class);
   }
 
-  public JsonNode joinAudioRoom(String sessionId, String handleId, int roomId, String displayName) {
-    Map<String, Object> body = Map.of(
-      "request", "join", "room", roomId, "display", displayName
-    );
-    Map<String, Object> request = Map.of(
-      "janus", "message", "transaction", UUID.randomUUID().toString(), "body", body
-    );
+  public void joinAudioRoom(String sessionId, String handleId, int roomId, String displayName) {
+    Map<String, Object> body = Map.of("request", "join", "room", roomId, "display", displayName);
+    Map<String, Object> request = Map.of("janus", "message", "transaction", UUID.randomUUID().toString(), "body", body);
     String handleUrl = String.format("%s/%s/%s", janusUrl, sessionId, handleId);
 
     ResponseEntity<JsonNode> response = restTemplate.postForEntity(handleUrl, request, JsonNode.class);
-    logger.info("Janus join response: {}", response.getBody());
+    JsonNode respBody = response.getBody();
+    logger.info("Janus join response: {}", respBody);
+
+    JsonNode participantsNode = respBody != null
+      ? respBody.path("plugindata").path("data").path("participants")
+      : null;
+    if (participantsNode != null && !participantsNode.isMissingNode() && participantsNode.isArray()) {
+      return;
+    }
+
+    JsonNode listResp;
+    int attempts = 3;
+    for (int i = 0; i < attempts; i++) {
+      try {
+        listResp = listParticipants(sessionId, handleId, roomId);
+        if (listResp != null) {
+          JsonNode listParticipantsNode = listResp.path("plugindata").path("data").path("participants");
+          if (listParticipantsNode != null && listParticipantsNode.isArray() && !listParticipantsNode.isEmpty()) {
+            logger.info("Found participants via listparticipants on attempt {}", i + 1);
+            return;
+          }
+        }
+      } catch (Exception ex) {
+        logger.warn("listparticipants attempt {} failed: {}", i + 1, ex.getMessage());
+      }
+      try {
+        Thread.sleep(200L);
+      } catch (InterruptedException ie) {
+        Thread.currentThread().interrupt();
+        break;
+      }
+    }
+    logger.info("Returning join response without participants.");
+  }
+
+  public JsonNode listParticipants(String sessionId, String handleId, int roomId) {
+    String handleUrl = String.format("%s/%s/%s", janusUrl, sessionId, handleId);
+    Map<String, Object> body = Map.of("request", "listparticipants", "room", roomId);
+    Map<String, Object> request = Map.of("janus", "message", "transaction", UUID.randomUUID().toString(), "body", body);
+    ResponseEntity<JsonNode> response = restTemplate.postForEntity(handleUrl, request, JsonNode.class);
+    logger.info("Janus listparticipants response: {}", response.getBody());
     return response.getBody();
   }