improve paginations

Author: ad3n

dics/core.go

@@ -522,6 +522,9 @@ var Core = []dingo.Def{
 	{
 		Name:  "core:pagination:paginator",
 		Build: (*paginations.Pagination)(nil),
+	}, {
+		Name:  "core:pagination:request",
+		Build: (*paginations.Request)(nil),
 	},
 	{
 		Name:  "core:service:repository",

generators/templates/module.tpl

@@ -28,6 +28,7 @@ type Module struct {
 	Validator     *validations.{{.Module}}
 	Cache         *utils.Cache
 	Paginator     *paginations.Pagination
+	Request       *paginations.Request
 }
 
 func NewModule(
@@ -41,6 +42,7 @@ func NewModule(
 	validator *validations.{{.Module}},
 	cache *utils.Cache,
 	paginator *paginations.Pagination,
+	request *paginations.Request,
 ) *Module {
 	return &Module{
 		Context:       context,
@@ -52,6 +54,7 @@ func NewModule(
 		Validator:     validator,
 		Cache:         cache,
 		Paginator:     paginator,
+		Request:       request,
 	}
 }
 
@@ -61,7 +64,8 @@ func (m *Module) GetPaginated(c context.Context, r *grpcs.Pagination) (*grpcs.{{
 	model := models.{{.Module}}{}
 	m.Paginator.Model = model.TableName()
 
-	m.Paginator.Handle(r)
+    copier.Copy(m.Request, r)
+	m.Paginator.Handle(m.Request)
 
 	metadata, result := m.Handler.Paginate(*m.Paginator)
 	for _, v := range result {

handlers/handler.go

@@ -25,7 +25,7 @@ type Handler struct {
 	Repository    *services.Repository
 }
 
-func (h *Handler) Paginate(paginator paginations.Pagination) (paginations.PaginationMeta, []interface{}) {
+func (h *Handler) Paginate(paginator paginations.Pagination) (paginations.Metadata, []interface{}) {
 	query := elastic.NewBoolQuery()
 
 	h.Dispatcher.Dispatch(PAGINATION_EVENT, &events.Pagination{
@@ -45,7 +45,7 @@ func (h *Handler) Paginate(paginator paginations.Pagination) (paginations.Pagina
 		next = -1
 	}
 
-	return paginations.PaginationMeta{
+	return paginations.Metadata{
 		Record:   len(result),
 		Page:     paginator.Page,
 		Previous: paginator.Page - 1,

paginations/filter.go

@@ -0,0 +1,6 @@
+package paginations
+
+type Filter struct {
+	Field string
+	Value string
+}

paginations/metadata.go

@@ -0,0 +1,10 @@
+package paginations
+
+type Metadata struct {
+	Record   int
+	Page     int
+	Previous int
+	Next     int
+	Limit    int
+	Total    int
+}

paginations/pagination.go

@@ -3,16 +3,10 @@ package paginations
 import (
 	"strings"
 
-	grpcs "github.com/crowdeco/skeleton/protos/builds"
 	paginator "github.com/vcraescu/go-paginator/v2"
 )
 
 type (
-	Filter struct {
-		Field string
-		Value string
-	}
-
 	Pagination struct {
 		Limit      int
 		Page       int
@@ -23,42 +17,33 @@ type (
 		Pager      paginator.Paginator
 		Model      string
 	}
-
-	PaginationMeta struct {
-		Record   int
-		Page     int
-		Previous int
-		Next     int
-		Limit    int
-		Total    int
-	}
 )
 
-func (p *Pagination) Handle(pagination *grpcs.Pagination) {
-	if 0 == pagination.Page {
-		pagination.Page = 1
+func (p *Pagination) Handle(request *Request) {
+	if 0 == request.Page {
+		request.Page = 1
 	}
 
-	if 0 == pagination.Limit {
-		pagination.Limit = 17
+	if 0 == request.Limit {
+		request.Limit = 17
 	}
 
 	p.Filters = nil
-	if len(pagination.Fields) == len(pagination.Values) {
-		for k, v := range pagination.Fields {
+	if len(request.Fields) == len(request.Values) {
+		for k, v := range request.Fields {
 			if v != "" {
-				p.Filters = append(p.Filters, Filter{Field: strings.Title(v), Value: pagination.Values[k]})
+				p.Filters = append(p.Filters, Filter{Field: strings.Title(v), Value: request.Values[k]})
 			}
 		}
 	}
 
-	if pagination.Counter > 0 {
+	if request.Counter > 0 {
 		p.UseCounter = true
-		p.Counter = pagination.Counter
+		p.Counter = request.Counter
 	}
 
-	p.Limit = int(pagination.Limit)
-	p.Page = int(pagination.Page)
+	p.Limit = int(request.Limit)
+	p.Page = int(request.Page)
 }
 
 func (p *Pagination) Paginate(adapter paginator.Adapter) *Pagination {

paginations/request.go

@@ -0,0 +1,9 @@
+package paginations
+
+type Request struct {
+	Page    int32
+	Counter uint64
+	Limit   int32
+	Fields  []string
+	Values  []string
+}