Skip to content
Open
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
29 changes: 27 additions & 2 deletions src/main/java/com/team/buddyya/feed/repository/FeedRepository.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,41 @@
import com.team.buddyya.feed.domain.Feed;
import com.team.buddyya.student.domain.Student;
import com.team.buddyya.student.domain.University;

import java.time.LocalDateTime;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;

@Repository
public interface FeedRepository extends JpaRepository<Feed, Long> {

Page<Feed> findAllByUniversityAndCategory(University university, Category category, Pageable pageable);
@Query("""
SELECT f
FROM Feed f
WHERE f.university = :university
AND f.category = :category
ORDER BY f.pinned DESC, f.createdDate DESC
""")
Page<Feed> findFeedsByUnivAndCategory(@Param("university") University university,
@Param("category") Category category,
Pageable pageable);


@Query("""
SELECT f
FROM Feed f
WHERE f.university = :university
AND f.category = :category
ORDER BY f.likeCount DESC, f.createdDate DESC
""")
Page<Feed> findPopularFeedsByUnivAndCategory(@Param("university") University university,
@Param("category") Category category,
Pageable pageable);

Page<Feed> findAllByStudent(Student student, Pageable pageable);

Expand All @@ -29,4 +54,4 @@ Page<Feed> findByLikeCountGreaterThanEqualAndUniversity(
University university,
Pageable pageable
);
}
}
11 changes: 8 additions & 3 deletions src/main/java/com/team/buddyya/feed/service/FeedService.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,15 @@ Page<Feed> getFeedsByUniversityAndCategory(FeedListRequest request, Pageable pag
Category category = categoryService.getCategory(request.category());
Pageable customPageable = PageRequest.of(
pageable.getPageNumber(),
pageable.getPageSize(),
getSortBy(category)
pageable.getPageSize()
);
return feedRepository.findAllByUniversityAndCategory(university, category, customPageable);
Page<Feed> feeds;
if (category.getName().equals("POPULAR")) {
feeds = feedRepository.findPopularFeedsByUnivAndCategory(university, category, customPageable);
} else {
feeds = feedRepository.findFeedsByUnivAndCategory(university, category, customPageable);
}
return feeds;
}

@Transactional(readOnly = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CREATE INDEX idx_feed_uni_cat_order
ON feed (university_id, category_id, pinned DESC, created_date DESC);