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

Merge branch 'BE/userinfo' into 'backend'

Browse Source 
feat: qna 수정

See merge request s11-webmobile1-sub2/S11P12A701!94
This commit is contained in:
박정민 2024-08-07 17:46:19 +09:00
commit 5bdd170f1f
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/com/edufocus/edufocus/qna/controller/QnaController.java
View File

@ -71,6 +71,7 @@ public class QnaController {
User findUser = userRepository.findById(userId).orElse(null); User findUser = userRepository.findById(userId).orElse(null);
if (findUser.getRole() != UserRole.ADMIN) { if (findUser.getRole() != UserRole.ADMIN) {
System.out.println("role 안맞음");
throw new RuntimeException("update 실패"); throw new RuntimeException("update 실패");
} }
@ -88,6 +89,7 @@ public class QnaController {
Long userId = Long.parseLong(jwtUtil.getUserId(token)); Long userId = Long.parseLong(jwtUtil.getUserId(token));
User findUser = userRepository.findById(userId).orElse(null); User findUser = userRepository.findById(userId).orElse(null);
System.out.println("delete answer");
if (findUser.getRole() != UserRole.ADMIN) { if (findUser.getRole() != UserRole.ADMIN) {
throw new RuntimeException(); throw new RuntimeException();
} }

8
backend/src/main/java/com/edufocus/edufocus/qna/service/QnaServiceImpl.java
View File

@ -55,11 +55,13 @@ public class QnaServiceImpl implements QnaService {
@Override @Override
public QnaResponseDto updateQna(Long id, QnaRequestDto qnaRequestDto, Long userId) { public QnaResponseDto updateQna(Long id, QnaRequestDto qnaRequestDto, Long userId) {
System.out.println("userId:" + userId);
Qna qna = qnaRepository.findById(id).orElse(null); Qna qna = qnaRepository.findById(id).orElse(null);
System.out.println("quesiton에 있는거: " + qna.getUser().getId());
User user = userRepository.findById(userId).orElse(null); User user = userRepository.findById(userId).orElse(null);
if (qna.getUser().getId() == userId) {
qnaRepository.delete(qna); if (qna.getUser().getId() != userId) {
} else {
throw new RuntimeException(); throw new RuntimeException();
} }