Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

인코딩 문제가 생길까봐 영어가 나을것 같습니다
한글로 쓰면 한 눈에 알아보기에는 좋을 것 같아요

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package in.koreatech.koin.domain.community.model;

import lombok.Getter;

@Getter
public enum BoardTag {
자유게시판("FA001"),
취업게시판("JA001"),
익명게시판("AA001"),
공지사항("NA000"),
일반공지("NA001"),
장학공지("NA002"),
학사공지("NA003"),
취업공지("NA004"),
코인공지("NA005"),
질문게시판("QA001"),
홍보게시판("EA001"),
;

private final String tag;

BoardTag(String tag) {
this.tag = tag;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Optional;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.repository.Repository;

Expand All @@ -14,16 +15,14 @@ public interface ArticleRepository extends Repository<Article, Long> {

Article save(Article article);

Page<Article> findByBoardId(Long boardId, Pageable pageable);

default Page<Article> getByBoardId(Long boardId, Pageable pageable) {
return findByBoardId(boardId, pageable);
}
Page<Article> findByIsNotice(Boolean isNotice, Pageable pageable);

Optional<Article> findById(Long articleId);

List<Article> findAll(Pageable pageable);

Page<Article> findByBoardId(Long boardId, PageRequest pageRequest);

default Article getById(Long articleId) {
return findById(articleId).orElseThrow(
() -> ArticleNotFoundException.withDetail(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import in.koreatech.koin.domain.community.model.Article;
import in.koreatech.koin.domain.community.model.ArticleViewLog;
import in.koreatech.koin.domain.community.model.Board;
import in.koreatech.koin.domain.community.model.BoardTag;
import in.koreatech.koin.domain.community.model.Criteria;
import in.koreatech.koin.domain.community.repository.ArticleRepository;
import in.koreatech.koin.domain.community.repository.ArticleViewLogRepository;
Expand Down Expand Up @@ -74,7 +75,13 @@ public ArticlesResponse getArticles(Long boardId, Long page, Long limit) {
Criteria criteria = Criteria.of(page, limit);
Board board = boardRepository.getById(boardId);
PageRequest pageRequest = PageRequest.of(criteria.getPage(), criteria.getLimit(), ARTICLES_SORT);
Page<Article> articles = articleRepository.getByBoardId(boardId, pageRequest);

if (board.getIsNotice() && board.getTag().equals(BoardTag.공지사항.getTag())) {
Page<Article> articles = articleRepository.findByIsNotice(board.getIsNotice(), pageRequest);
return ArticlesResponse.of(articles.getContent(), board, (long)articles.getTotalPages());
}

Page<Article> articles = articleRepository.findByBoardId(boardId, pageRequest);
return ArticlesResponse.of(articles.getContent(), board, (long)articles.getTotalPages());
}

Expand Down