jhynsoo/edufocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: video 수정

Browse Source
This commit is contained in:
박정민 2024-08-02 13:15:52 +09:00
parent fe26e1760c
commit f0ef0a397d
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backend/src/main/java/com/edufocus/edufocus/video/controller/Controller.java
View File

@ -14,7 +14,10 @@ import com.edufocus.edufocus.user.model.entity.UserRole;
import com.edufocus.edufocus.user.model.repository.UserRepository; import com.edufocus.edufocus.user.model.repository.UserRepository;
import com.edufocus.edufocus.user.model.service.UserService; import com.edufocus.edufocus.user.model.service.UserService;
import com.edufocus.edufocus.user.util.JWTUtil; import com.edufocus.edufocus.user.util.JWTUtil;
import com.edufocus.edufocus.video.dto.IdentityData;
import com.edufocus.edufocus.video.service.VideoSertvice; import com.edufocus.edufocus.video.service.VideoSertvice;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.livekit.server.*; import io.livekit.server.*;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -45,6 +48,7 @@ public class Controller {
@Value("${livekit.api.secret}") @Value("${livekit.api.secret}")
private String LIVEKIT_API_SECRET; private String LIVEKIT_API_SECRET;
private static final ObjectMapper objectMapper = new ObjectMapper();
/** /**
* @param params JSON object with roomName and participantName * @param params JSON object with roomName and participantName
@ -82,7 +86,9 @@ public class Controller {
return new ResponseEntity<>("방만들기 성공",HttpStatus.OK); return new ResponseEntity<>("방만들기 성공",HttpStatus.OK);
} }
public static String serializeIdentityData(IdentityData identityData) throws JsonProcessingException, JsonProcessingException {
return objectMapper.writeValueAsString(identityData);
}
@PostMapping(value = "/joinroom/{lecture_id}") @PostMapping(value = "/joinroom/{lecture_id}")
public ResponseEntity<Map<String, String>> joinRoom(@PathVariable("lecture_id") Long id, HttpServletRequest request) throws Exception public ResponseEntity<Map<String, String>> joinRoom(@PathVariable("lecture_id") Long id, HttpServletRequest request) throws Exception
@ -114,14 +120,20 @@ public class Controller {
String roomName = lecture.getTitle(); String roomName = lecture.getTitle();
String participantName = userService.getUserName(userId); String participantName = userService.getUserName(userId);
AccessToken token = new AccessToken(LIVEKIT_API_KEY, LIVEKIT_API_SECRET); AccessToken token = new AccessToken(LIVEKIT_API_KEY, LIVEKIT_API_SECRET);
IdentityData identityData = new IdentityData(participantName, "강사");
String jsonIdentity = serializeIdentityData(identityData);
token.setIdentity(jsonIdentity);
token.setName(participantName); token.setName(participantName);
token.setIdentity("강사"+randStr);
token.addGrants(new RoomJoin(true), new RoomName(roomName), new RoomCreate(true)); token.addGrants(new RoomJoin(true), new RoomName(roomName), new RoomCreate(true));
videoSertvice.startOnline(userId, id); videoSertvice.startOnline(userId, id);
return ResponseEntity.ok(Map.of("token", token.toJwt())); return ResponseEntity.ok(Map.of("joinroom token", token.toJwt()));
} }
else if(findUser.getRole()==UserRole.STUDENT )// && lecture.isOnline() ) else if(findUser.getRole()==UserRole.STUDENT )// && lecture.isOnline() )
@ -133,8 +145,9 @@ public class Controller {
System.out.println(participantName); System.out.println(participantName);
AccessToken token = new AccessToken(LIVEKIT_API_KEY, LIVEKIT_API_SECRET); AccessToken token = new AccessToken(LIVEKIT_API_KEY, LIVEKIT_API_SECRET);
token.setName(participantName);
token.setIdentity("학생"+participantName+randStr); token.setIdentity("학생"+participantName+randStr);
token.setName(participantName);
token.addGrants(new RoomJoin(true), new RoomName(roomName)); token.addGrants(new RoomJoin(true), new RoomName(roomName));

17
backend/src/main/java/com/edufocus/edufocus/video/dto/IdentityData.java Normal file
View File

@ -0,0 +1,17 @@
package com.edufocus.edufocus.video.dto;
public class IdentityData {
private String name;
private String role;
public IdentityData(String name, String role) {
this.name = name;
this.role = role;
}
// Getters and setters
public String getName() { return name; }
public void setName(String name) { this.name = name; }
public String getRole() { return role; }
public void setRole(String role) { this.role = role; }
}