Skip to content

Commit ffd647d

Browse files
authored
Fix: 과릿 1.3.3 (#401)
* Hotfix: 알림 리스트 반환 시, 게시글 id 반환하도록 수정 (#395) * Hotfix: Null 반환하지 않도록 수정 #394 * Hotfix: NotificationRes DTO 수정 #394 * Hotfix: DTO 변경에 따른 쿼리 수정 #394 * Fix: 선생님이 삭제 가능하도록 권한 수정 #398
1 parent 8993bff commit ffd647d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/main/java/com/selfrunner/gwalit/domain/board/service/BoardService.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public BoardReplyRes updateBoard(Member member, Long boardId, List<MultipartFile
117117
public void deleteBoard(Member member, Long boardId) {
118118
// Validation
119119
Board board = boardRepository.findById(boardId).orElseThrow(() -> new BoardException(ErrorCode.NOT_FOUND_EXCEPTION));
120-
if(!board.getMember().getMemberId().equals(member.getMemberId())) {
120+
MemberAndLecture memberAndLecture = memberAndLectureRepository.findMemberAndLectureByMemberAndLectureLectureId(member, board.getLecture().getLectureId()).orElseThrow(() -> new BoardException(ErrorCode.UNAUTHORIZED_EXCEPTION));
121+
if(!board.getMember().getMemberId().equals(member.getMemberId()) && !memberAndLecture.getIsTeacher()) {
121122
throw new BoardException(ErrorCode.UNAUTHORIZED_EXCEPTION);
122123
}
123124

@@ -233,8 +234,9 @@ public ReplyRes registerReply(Member member, Long boardId, List<MultipartFile> m
233234
public void deleteReply(Member member, Long boardId, Long replyId) {
234235
// Validation
235236
Reply reply = replyRepository.findById(replyId).orElseThrow(() -> new BoardException(ErrorCode.NOT_FOUND_EXCEPTION));
237+
MemberAndLecture memberAndLecture = memberAndLectureRepository.findMemberAndLectureByMemberAndLectureLectureId(member, reply.getBoard().getLecture().getLectureId()).orElseThrow(() -> new BoardException(ErrorCode.UNAUTHORIZED_EXCEPTION));
236238
// 댓글 작성자가 아니거나 다른 게시글 ID로 요청했는지 확인하는 조건문
237-
if(!reply.getMember().getMemberId().equals(member.getMemberId()) || !reply.getBoard().getBoardId().equals(boardId)) {
239+
if((!reply.getMember().getMemberId().equals(member.getMemberId()) && !memberAndLecture.getIsTeacher()) || !reply.getBoard().getBoardId().equals(boardId)) {
238240
throw new BoardException(ErrorCode.UNAUTHORIZED_EXCEPTION);
239241
}
240242

0 commit comments

Comments
 (0)