fix follower/following pagination

Author: miladrahimi

internal/http/server/handlers/v1/likes.go

@@ -11,7 +11,7 @@ import (
 
 func LikesIndex(ctr *container.Container) echo.HandlerFunc {
 	return func(ctx echo.Context) error {
-		posts, err := ctr.LikeService.IndexByPostIDWithUser(
+		posts, err := ctr.LikeService.IndexByPostId(
 			utils.StringToID(ctx.Param("postId"), 0),
 			utils.StringToID(ctx.QueryParams().Get("lastId"), ^uint64(0)),
 			utils.StringToInt(ctx.QueryParams().Get("count"), 100, 10),

internal/services/followship/service.go

@@ -19,30 +19,24 @@ func (s *Service) FindByIds(followerID, followeeID uint64) (*models.Followship,
 	return &followship, errors.Wrapf(r.Error, "followerId: %v, followeeId: %v", followerID, followeeID)
 }
 
-func (s *Service) IndexFollowers(userId uint64, lastId uint64, count int) ([]*models.Followship, error) {
+func (s *Service) IndexFollowers(userId uint64, lastUserId uint64, count int) ([]*models.Followship, error) {
 	var followships []*models.Followship
-	if count > 100 {
-		count = 100
-	}
 	r := s.database.Handler().
 		Preload("Follower").
 		Where("followee_id = ?", userId).
-		Where("id < ? ORDER BY id DESC LIMIT ?", lastId, count).
+		Where("follower_id < ? ORDER BY follower_id DESC LIMIT ?", lastUserId, count).
 		Find(&followships)
-	return followships, errors.Wrapf(r.Error, "userId: %v, lastId: %v, count: %v", userId, lastId, count)
+	return followships, errors.Wrapf(r.Error, "userId: %v, lastUserId: %v, count: %v", userId, lastUserId, count)
 }
 
-func (s *Service) IndexFollowings(userId uint64, lastId uint64, count int) ([]*models.Followship, error) {
+func (s *Service) IndexFollowings(userId uint64, lastUserId uint64, count int) ([]*models.Followship, error) {
 	var followships []*models.Followship
-	if count > 100 {
-		count = 100
-	}
 	r := s.database.Handler().
 		Preload("Followee").
 		Where("follower_id = ?", userId).
-		Where("id < ? ORDER BY id DESC LIMIT ?", lastId, count).
+		Where("followee_id < ? ORDER BY followee_id DESC LIMIT ?", lastUserId, count).
 		Find(&followships)
-	return followships, errors.Wrapf(r.Error, "userId: %v, lastId: %v, count: %v", userId, lastId, count)
+	return followships, errors.Wrapf(r.Error, "userId: %v, lastUserId: %v, count: %v", userId, lastUserId, count)
 }
 
 func (s *Service) CountFollowers(userId uint64) (int64, error) {

internal/services/like/service.go

@@ -11,11 +11,8 @@ type Service struct {
 	database *database.Database
 }
 
-func (s *Service) IndexByPostIDWithUser(postId uint64, lastId uint64, count int) ([]*models.Like, error) {
+func (s *Service) IndexByPostId(postId uint64, lastId uint64, count int) ([]*models.Like, error) {
 	var likes []*models.Like
-	if count > 100 {
-		count = 100
-	}
 	r := s.database.Handler().
 		Preload("User").
 		Where("post_id = ?", postId).

internal/services/post/service.go

@@ -34,9 +34,6 @@ func (s *Service) Index(userId uint64, lastId uint64, count int) ([]*models.Post
 
 func (s *Service) Feed(userId uint64, lastId uint64, count int) ([]*models.Post, error) {
 	var posts []*models.Post
-	if count > 100 {
-		count = 100
-	}
 	r := s.database.Handler().
 		Where("id < ? ORDER BY id DESC LIMIT ?", lastId, count).
 		Preload("Audio").
@@ -61,9 +58,6 @@ func (s *Service) Feed(userId uint64, lastId uint64, count int) ([]*models.Post,
 
 func (s *Service) Search(q string, userId uint64, lastId uint64, count int) ([]*models.Post, error) {
 	var posts []*models.Post
-	if count > 100 {
-		count = 100
-	}
 	r := s.database.Handler().
 		Where("(title LIKE ? OR description LIKE ?)", "%"+q+"%", "%"+q+"%").
 		Where("id < ? ORDER BY id DESC LIMIT ?", lastId, count).

internal/services/user/service.go

@@ -24,9 +24,6 @@ func (s *Service) FindBy(field string, value interface{}) (*models.User, error)
 
 func (s *Service) Search(q string, lastId uint64, count int) ([]*models.User, error) {
 	var users []*models.User
-	if count > 100 {
-		count = 100
-	}
 	r := s.database.Handler().
 		Where("(name LIKE ? OR username LIKE ?)", "%"+q+"%", "%"+q+"%").
 		Where("id < ? ORDER BY id DESC LIMIT ?", lastId, count).