Skip to content

A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.

feat(search): Refactor pagination in search syncer

LinkinStarsa5f74a656f9c
diff --git a/internal/repo/search_sync/search_sync.go b/internal/repo/search_sync/search_sync.go
index 7f938f99..3f3bff35 100644
--- a/internal/repo/search_sync/search_sync.go
+++ b/internal/repo/search_sync/search_sync.go
@@ -3,7 +3,6 @@ package search_sync
import (
"context"
"github.com/answerdev/answer/internal/base/data"
- "github.com/answerdev/answer/internal/base/pager"
"github.com/answerdev/answer/internal/entity"
"github.com/answerdev/answer/plugin"
)
@@ -16,14 +15,16 @@ type PluginSyncer struct {
data *data.Data
}
-func (p *PluginSyncer) GetAnswersPage(ctx context.Context, page, pageSize int) (answerList []*entity.Answer, total int64, err error) {
+func (p *PluginSyncer) GetAnswersPage(ctx context.Context, page, pageSize int) (answerList []*entity.Answer, err error) {
answerList = make([]*entity.Answer, 0)
- total, err = pager.Help(page, pageSize, answerList, &entity.Answer{}, p.data.DB.Context(ctx))
- return answerList, total, err
+ startNum := (page - 1) * pageSize
+ err = p.data.DB.Context(ctx).Limit(pageSize, startNum).Find(&answerList)
+ return answerList, err
}
-func (p *PluginSyncer) GetQuestionsPage(ctx context.Context, page, pageSize int) (questionList []*entity.Question, total int64, err error) {
+func (p *PluginSyncer) GetQuestionsPage(ctx context.Context, page, pageSize int) (questionList []*entity.Question, err error) {
questionList = make([]*entity.Question, 0)
- total, err = pager.Help(page, pageSize, questionList, &entity.Question{}, p.data.DB.Context(ctx))
- return questionList, total, err
+ startNum := (page - 1) * pageSize
+ err = p.data.DB.Context(ctx).Limit(pageSize, startNum).Find(&questionList)
+ return questionList, err
}
diff --git a/plugin/search.go b/plugin/search.go
index bfab0c8e..115be2c8 100644
--- a/plugin/search.go
+++ b/plugin/search.go
@@ -99,8 +99,8 @@ type SearchDesc struct {
}
type SearchSyncer interface {
- GetAnswersPage(ctx context.Context, page, pageSize int) (answerList []*entity.Answer, total int64, err error)
- GetQuestionsPage(ctx context.Context, page, pageSize int) (questionList []*entity.Question, total int64, err error)
+ GetAnswersPage(ctx context.Context, page, pageSize int) (answerList []*entity.Answer, err error)
+ GetQuestionsPage(ctx context.Context, page, pageSize int) (questionList []*entity.Question, err error)
}
var (