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

Merge branch 'BE/userinfo' into 'backend'

Browse Source 
feat: joinroom 수정

See merge request s11-webmobile1-sub2/S11P12A701!51
This commit is contained in:
박정민 2024-08-05 16:34:10 +09:00
commit d494e1f1b9
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/edufocus/edufocus/lecture/service/LectureServiceImpl.java
View File

@ -237,9 +237,7 @@ public class LectureServiceImpl implements LectureService {
Lecture l; Lecture l;
l = lecture.get(); l = lecture.get();
if (l.isOnline()) { if (l.isOnline() == false) {
l.setOnline(false);
} else {
l.setOnline(true); l.setOnline(true);
} }

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

@ -121,14 +121,17 @@ public class Controller {
@PostMapping(value = "/makeroom/{lecture_id}") @PostMapping(value = "/makeroom/{lecture_id}")
public ResponseEntity<Map<String, String>> makeRoom(@PathVariable("lecture_id") Long id, HttpServletRequest request) throws Exception { public ResponseEntity<Map<String, String>> makeRoom(@PathVariable("lecture_id") Long id, HttpServletRequest request) throws Exception {
String userToken = request.getHeader("Authorization"); String userToken = request.getHeader("Authorization");
Long userId = Long.parseLong(jwtUtil.getUserId(userToken)); Long userId = Long.parseLong(jwtUtil.getUserId(userToken));
User findUser = userRepository.findById(userId).orElse(null);
if (findUser.getRole() == UserRole.ADMIN) {
videoSertvice.startOnline(userId, id); videoSertvice.startOnline(userId, id);
}
return ResponseEntity.ok(Map.of("token", " ")); return ResponseEntity.ok(Map.of("token", " "));
} }

2
backend/src/main/java/com/edufocus/edufocus/video/service/VideoServiceImpl.java
View File

@ -36,7 +36,7 @@ public class VideoServiceImpl implements VideoSertvice {
public boolean isRoomAccessible(Long lectureId, Long userId) { public boolean isRoomAccessible(Long lectureId, Long userId) {
LectureDetailResponse lecture = lectureService.findLectureById(userId, userId); LectureDetailResponse lecture = lectureService.findLectureById(userId, lectureId);
RegistrationStatus registrationStatus = registrationService.getStatus(userId, lectureId); RegistrationStatus registrationStatus = registrationService.getStatus(userId, lectureId);