fix(article): solved the issue of not being exposed

woowacourse · May 24, 2024 · 1f03fd5 · 1f03fd5
1 parent e37c063
commit 1f03fd5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 23 deletions.
diff --git a/backend/src/main/java/wooteco/prolog/article/application/ArticleService.java b/backend/src/main/java/wooteco/prolog/article/application/ArticleService.java
@@ -85,14 +85,7 @@ public void likeArticle(final Long id, final LoginMember loginMember, final Bool
     public List<ArticleResponse> getFilteredArticles(final LoginMember member,
                                                      final ArticleFilterType course,
                                                      final boolean onlyBookmarked) {
-        if (member.isMember()) {
-            return articleRepository.findArticlesByCourseAndMember(course.getPartName(),
-                    member.getId(), onlyBookmarked).stream()
-                .map(article -> ArticleResponse.of(article, member.getId()))
-                .collect(toList());
-        }
-
-        return articleRepository.findArticlesByCourse(course.getPartName()).stream()
+        return articleRepository.findAllByOrderByCreatedAtDesc().stream()
             .map(article -> ArticleResponse.of(article, member.getId()))
             .collect(toList());
     }

diff --git a/backend/src/main/java/wooteco/prolog/article/domain/repository/ArticleRepository.java b/backend/src/main/java/wooteco/prolog/article/domain/repository/ArticleRepository.java
@@ -18,7 +18,7 @@ public interface ArticleRepository extends JpaRepository<Article, Long> {
     Optional<Article> findFetchLikeById(@Param("id") final Long id);
 
     @Query("SELECT DISTINCT a FROM Article a " +
-        "JOIN DepartmentMember dm ON dm.member.id = dm.member.id " +
+        "JOIN DepartmentMember dm ON a.member.id = dm.member.id " +
         "JOIN dm.department d " +
         "WHERE d.part = :course " +
         "ORDER by a.createdAt desc")

diff --git a/frontend/src/pages/ArticleListPage/index.tsx b/frontend/src/pages/ArticleListPage/index.tsx
@@ -56,20 +56,20 @@ const ArticleListPage = () => {
   return (
     <div css={[MainContentStyle]}>
       <Container>
-        <FilteringWrapper>
-          <SelectBoxWrapper>
-            <SelectBox
-              isClearable={false}
-              value={selectedCourse}
-              defaultOption={selectedCourse}
-              options={CATEGORY_OPTIONS}
-              onChange={changeFilterOption}
-            />
-          </SelectBoxWrapper>
-          {isLoggedIn && (
-            <ArticleBookmarkFilter checked={checked} handleCheckBookmark={handleCheckBookmark} />
-          )}
-        </FilteringWrapper>
+        {/*<FilteringWrapper>*/}
+        {/*  <SelectBoxWrapper>*/}
+        {/*    <SelectBox*/}
+        {/*      isClearable={false}*/}
+        {/*      value={selectedCourse}*/}
+        {/*      defaultOption={selectedCourse}*/}
+        {/*      options={CATEGORY_OPTIONS}*/}
+        {/*      onChange={changeFilterOption}*/}
+        {/*    />*/}
+        {/*  </SelectBoxWrapper>*/}
+        {/*  {isLoggedIn && (*/}
+        {/*    <ArticleBookmarkFilter checked={checked} handleCheckBookmark={handleCheckBookmark} />*/}
+        {/*  )}*/}
+        {/*</FilteringWrapper>*/}
         {authorized && (
           <Button
             type="button"