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,makeroom,deleteroom 수정

See merge request s11-webmobile1-sub2/S11P12A701!55
This commit is contained in:
박정민 2024-08-05 17:12:31 +09:00
commit 7201e0aa5c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ public class Controller {
return ResponseEntity.ok(Map.of("token", token.toJwt())); return ResponseEntity.ok(Map.of("token", token.toJwt()));
} else { } else {
return ResponseEntity.status(HttpStatus.BAD_REQUEST) return ResponseEntity.status(HttpStatus.NOT_FOUND)
.body(Map.of("error", "방에 들어갈 수 없습니다.")); .body(Map.of("error", "방에 들어갈 수 없습니다."));
} }
@ -108,6 +108,8 @@ public class Controller {
return ResponseEntity.ok(Map.of("token", token.toJwt())); return ResponseEntity.ok(Map.of("token", token.toJwt()));
} else {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Map.of("error", "자신의 강의가 아닙니다."));
} }
@ -124,12 +126,15 @@ public class Controller {
Long userId = Long.parseLong(jwtUtil.getUserId(userToken)); Long userId = Long.parseLong(jwtUtil.getUserId(userToken));
User findUser = userRepository.findById(userId).orElse(null); User findUser = userRepository.findById(userId).orElse(null);
if (findUser.getRole() == UserRole.ADMIN) { if (findUser.getRole() == UserRole.ADMIN && videoSertvice.checkAdmin(userId, id)) {
videoSertvice.startOnline(userId, id); videoSertvice.startOnline(userId, id);
} else {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(Map.of("error", "들어갈수없는 계정입니다"));
} }
return ResponseEntity.ok(Map.of("token", " ")); return ResponseEntity.ok(Map.of("token", " "));
@ -146,7 +151,7 @@ public class Controller {
if (findUser.getRole() == UserRole.ADMIN) { if (findUser.getRole() == UserRole.ADMIN) {
videoSertvice.startOnline(userId, id); videoSertvice.stopOnline(userId, id);
} }