Skip to content

Commit 1f03fd5

Browse files
committed
fix(article): solved the issue of not being exposed
1 parent e37c063 commit 1f03fd5

File tree

3 files changed

+16
-23
lines changed

3 files changed

+16
-23
lines changed

backend/src/main/java/wooteco/prolog/article/application/ArticleService.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,7 @@ public void likeArticle(final Long id, final LoginMember loginMember, final Bool
8585
public List<ArticleResponse> getFilteredArticles(final LoginMember member,
8686
final ArticleFilterType course,
8787
final boolean onlyBookmarked) {
88-
if (member.isMember()) {
89-
return articleRepository.findArticlesByCourseAndMember(course.getPartName(),
90-
member.getId(), onlyBookmarked).stream()
91-
.map(article -> ArticleResponse.of(article, member.getId()))
92-
.collect(toList());
93-
}
94-
95-
return articleRepository.findArticlesByCourse(course.getPartName()).stream()
88+
return articleRepository.findAllByOrderByCreatedAtDesc().stream()
9689
.map(article -> ArticleResponse.of(article, member.getId()))
9790
.collect(toList());
9891
}

backend/src/main/java/wooteco/prolog/article/domain/repository/ArticleRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public interface ArticleRepository extends JpaRepository<Article, Long> {
1818
Optional<Article> findFetchLikeById(@Param("id") final Long id);
1919

2020
@Query("SELECT DISTINCT a FROM Article a " +
21-
"JOIN DepartmentMember dm ON dm.member.id = dm.member.id " +
21+
"JOIN DepartmentMember dm ON a.member.id = dm.member.id " +
2222
"JOIN dm.department d " +
2323
"WHERE d.part = :course " +
2424
"ORDER by a.createdAt desc")

frontend/src/pages/ArticleListPage/index.tsx

+14-14
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ const ArticleListPage = () => {
5656
return (
5757
<div css={[MainContentStyle]}>
5858
<Container>
59-
<FilteringWrapper>
60-
<SelectBoxWrapper>
61-
<SelectBox
62-
isClearable={false}
63-
value={selectedCourse}
64-
defaultOption={selectedCourse}
65-
options={CATEGORY_OPTIONS}
66-
onChange={changeFilterOption}
67-
/>
68-
</SelectBoxWrapper>
69-
{isLoggedIn && (
70-
<ArticleBookmarkFilter checked={checked} handleCheckBookmark={handleCheckBookmark} />
71-
)}
72-
</FilteringWrapper>
59+
{/*<FilteringWrapper>*/}
60+
{/* <SelectBoxWrapper>*/}
61+
{/* <SelectBox*/}
62+
{/* isClearable={false}*/}
63+
{/* value={selectedCourse}*/}
64+
{/* defaultOption={selectedCourse}*/}
65+
{/* options={CATEGORY_OPTIONS}*/}
66+
{/* onChange={changeFilterOption}*/}
67+
{/* />*/}
68+
{/* </SelectBoxWrapper>*/}
69+
{/* {isLoggedIn && (*/}
70+
{/* <ArticleBookmarkFilter checked={checked} handleCheckBookmark={handleCheckBookmark} />*/}
71+
{/* )}*/}
72+
{/*</FilteringWrapper>*/}
7373
{authorized && (
7474
<Button
7575
type="button"

0 commit comments

Comments
 (0)