Skip to content

[FIX] #50 스터디룸 불필요 로직 제거 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lehojun merged 1 commit into from
Jun 17, 2025
Merged

[FIX] #50 스터디룸 불필요 로직 제거 #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/main/java/com/example/be/web/controller/OpenviduController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import com.example.be.repository.RoomRepository;
import com.example.be.web.dto.OpenviduDTO;
import io.livekit.server.*;
import livekit.LivekitModels;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand All @@ -13,6 +15,7 @@

import livekit.LivekitWebhook.WebhookEvent;

@Slf4j
@CrossOrigin(origins = "*")
@RestController
@RequestMapping("/api/v1/video")
Expand Down Expand Up @@ -51,10 +54,11 @@ public ResponseEntity<String> receiveWebhook(@RequestHeader("Authorization") Str
try {
WebhookEvent event = webhookReceiver.receive(body, authHeader);
String roomName = event.getRoom().getName();
int roomParticipantCount = event.getRoom().getNumParticipants();
long createAt = event.getRoom().getCreationTime();

System.out.println("LiveKit Webhook Event: " + event.getEvent());
System.out.println("Room Name: " + roomName);
log.info("LiveKit Webhook Event: {}", event.getEvent());
log.info("Room Name:{}", roomName);

// 이벤트 타입에 따른 처리 - event.getEvent() 사용
String eventType = event.getEvent();
Expand All @@ -67,39 +71,35 @@ public ResponseEntity<String> receiveWebhook(@RequestHeader("Authorization") Str
Room newRoom = Room.builder()
.title(roomName)
.createDate(createAt)
.participantCount(0)
.participantCount(roomParticipantCount)
.maxParticipants(10) // 기본값 설정
.build();
roomRepository.save(newRoom);
System.out.println("Room created: " + roomName);
}
}
case "participant_joined" -> {
Room room = roomRepository.findByTitle(roomName);
if (room != null) {
room.setParticipantCount(room.getParticipantCount() + 1);
room.setParticipantCount(roomParticipantCount);
roomRepository.save(room);
System.out.println("Participant joined. Current count: " + room.getParticipantCount());
log.info("Participant joined. Current count: {}", roomParticipantCount);
}
}
case "participant_left" -> {
Room room = roomRepository.findByTitle(roomName);
if (room != null) {
room.setParticipantCount(room.getParticipantCount() - 1);
roomRepository.save(room);
}
if (room != null && room.getParticipantCount() > 0) {
if (room != null && roomParticipantCount > 0) {
room.setParticipantCount(roomParticipantCount);
roomRepository.save(room);
System.out.println("Participant left. Current count: " + room.getParticipantCount());
log.info("Participant left now. Current count: {}", roomParticipantCount);
}
else if (room != null && room.getParticipantCount() == 0) {
else if (room != null && roomParticipantCount == 0) {
roomRepository.delete(room);
System.out.println("Room deleted: " + roomName);
log.info("Room deleted: {}", roomName);
}
}
}
} catch (Exception e) {
System.err.println("Error validating webhook event: " + e.getMessage());
log.info("Error validating webhook event: {}", e.getMessage());
e.printStackTrace();
return ResponseEntity.badRequest().body("Invalid webhook");
}
Expand Down