Skip to content

Commit bb9bc08

Browse files
authored
Merge pull request #126 from team-gogo/revert-124-fix/stage-community-board-error
Revert "[community] 커뮤니티 게시글 좋아요, 불러오기 문제"
2 parents 812a129 + 20c689e commit bb9bc08

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

src/main/kotlin/gogo/gogostage/domain/community/root/application/CommunityServiceImpl.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ class CommunityServiceImpl(
4545
val student = userUtil.getCurrentStudent()
4646
val board = boardReader.read(boardId)
4747
stageValidator.validStage(student, board.community.stage.id)
48-
stageValidator.validProfanityFilter(student, board)
4948
val isActiveProfanityFilter = student.isActiveProfanityFilter
5049
return communityReader.readBoardInfo(isActiveProfanityFilter, board, student)
5150
}

src/main/kotlin/gogo/gogostage/domain/community/root/persistence/CommunityCustomRepositoryImpl.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ class CommunityCustomRepositoryImpl(
3434
predicate.and(community.category.eq(it))
3535
}
3636

37-
if (isActiveProfanityFilter) {
38-
predicate.and(board.isFiltered.eq(false))
39-
}
37+
predicate.and(board.isFiltered.eq(isActiveProfanityFilter))
4038

4139
val boards = queryFactory
4240
.selectFrom(board)
@@ -112,13 +110,11 @@ class CommunityCustomRepositoryImpl(
112110

113111
val boardAuthorDto = AuthorDto(boardAuthor.studentId, boardAuthor.name, boardAuthor.classNumber, boardAuthor.studentNumber)
114112

115-
val isAuthorBoardLike = boardLikeRepository.existsByStudentIdAndBoardId(student.studentId, board.id)
113+
val isAuthorBoardLike = boardLikeRepository.existsByStudentIdAndBoardId(boardAuthorDto.studentId, board.id)
116114

117115
val predicate = BooleanBuilder()
118116

119-
if (isActiveProfanityFilter) {
120-
predicate.and(comment.isFiltered.eq(false))
121-
}
117+
predicate.and(comment.isFiltered.eq(isActiveProfanityFilter))
122118

123119
predicate.and(comment.board.id.eq(board.id))
124120

src/main/kotlin/gogo/gogostage/domain/stage/root/application/StageValidator.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package gogo.gogostage.domain.stage.root.application
22

3-
import gogo.gogostage.domain.community.board.persistence.Board
43
import gogo.gogostage.domain.game.persistence.GameRepository
54
import gogo.gogostage.domain.stage.participant.root.persistence.StageParticipantRepository
65
import gogo.gogostage.domain.stage.root.application.dto.CreateFastStageDto
@@ -86,12 +85,6 @@ class StageValidator(
8685
}
8786
}
8887

89-
fun validProfanityFilter(student: StudentByIdStub, board: Board) {
90-
if (board.isFiltered && student.isActiveProfanityFilter) {
91-
throw StageException("해당 게시글은 욕설 필터가 켜져있어 볼 수 없습니다.", HttpStatus.BAD_REQUEST.value())
92-
}
93-
}
94-
9588
private fun validShop(dto: CreateOfficialStageDto) {
9689
if (dto.shop.coinToss.isActive && (dto.shop.coinToss.price == null || dto.shop.coinToss.quantity == null)) {
9790
throw StageException("CoinToss 미니게임의 티켓 가격, 수량을 입력하세요.", HttpStatus.BAD_REQUEST.value())

0 commit comments

Comments
 (0)