Merge branch 'master' of github.com:Shipu/artifact

Shipu · Aug 22, 2024 · e4973f6 · e4973f6
2 parents 2d452b8 + 3e79061
commit e4973f6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/cmd/generate/stubs/relational/service.stub b/cmd/generate/stubs/relational/service.stub
@@ -19,7 +19,7 @@ func All{{TitleName}}(requestFilter map[string]interface{}) ([]models.{{TitleNam
 
     paginationInstance := artifact.NewPaginator({{PluralLowerName}}, requestFilter)
 
-    models.{{TitleName}}Model.Where(filter).Scopes(paginationInstance.PaginateScope()).Find(&{{PluralLowerName}})
+    models.{{TitleName}}Model.Where(filter).Scopes(paginationInstance.PaginateScope(requestFilter["page"].(int), requestFilter["limit"].(int))).Find(&{{PluralLowerName}})
 
     return {{PluralLowerName}}, paginationInstance.Meta, nil
 
@@ -84,4 +84,4 @@ func DeleteA{{TitleName}}({{SingularLowerName}}Id string) bool {
 	}
 
 	return true
-}
+}
diff --git a/pagination.go b/pagination.go
@@ -10,24 +10,41 @@ import (
 var Pagination paginator.Paginator
 
 type PaginationMeta struct {
-	CurrentPage int `json:"current_page"`
-	PerPage     int `json:"per_page"`
-	LastPage    int `json:"last_page"`
-	Total       int `json:"total"`
+	CurrentPage int   `json:"current_page"`
+	PerPage     int   `json:"per_page"`
+	LastPage    int   `json:"last_page"`
+	Total       int64 `json:"total"`
 }
 
 type Paginator struct {
 	Meta PaginationMeta `json:"meta"`
+	db   *gorm.DB
 	*paginator.Paginator
+	model  interface{}
+	filter map[string]interface{}
 }
 
-func (paginator *Paginator) PaginateScope() func(db *gorm.DB) *gorm.DB {
+func (paginator *Paginator) PaginateScope(page int, limit int) func(db *gorm.DB) *gorm.DB {
+	if page == 0 {
+		page = 1
+	}
+	if limit == 0 {
+		limit = 10
+	}
+	var totalRows int64
+
+	paginator.Meta.CurrentPage = page
+	paginator.Meta.PerPage = limit
+
+	DB.Model(paginator.model).Where(paginator.filter).Count(&totalRows)
+	paginator.Meta.Total = totalRows
+	paginator.Meta.LastPage = int(math.Ceil(float64(totalRows) / float64(limit)))
+
 	return func(db *gorm.DB) *gorm.DB {
 		offset := (paginator.Meta.CurrentPage - 1) * paginator.Meta.PerPage
 		return db.Offset(offset).Limit(paginator.Meta.PerPage)
 	}
 }
-
 func (paginator *Paginator) CursorPaginate(query *gorm.DB, v interface{}) (*gorm.DB, paginator.Cursor, error) {
 	return paginator.Paginate(query, v)
 }
@@ -57,11 +74,11 @@ func (paginator *Paginator) updateMeta(v interface{}, request map[string]interfa
 
 	var totalRows int64
 	DB.Model(v).Count(&totalRows)
-	paginator.Meta.Total = int(totalRows)
+	paginator.Meta.Total = totalRows
 	paginator.Meta.LastPage = int(math.Ceil(float64(totalRows) / float64(limit)))
 }
 
-func NewPaginator(v interface{}, request map[string]interface{}) *Paginator {
+func NewPaginator(v interface{}, queryFilter map[string]interface{}) *Paginator {
 	opts := []paginator.Option{
 		&paginator.Config{
 			Order: paginator.ASC,
@@ -70,8 +87,6 @@ func NewPaginator(v interface{}, request map[string]interface{}) *Paginator {
 
 	p := paginator.New(opts...)
 
-	newInstance := &Paginator{Meta: PaginationMeta{}, Paginator: p}
-	newInstance.updateMeta(v, request)
-
+	newInstance := &Paginator{Meta: PaginationMeta{}, Paginator: p, model: v, filter: queryFilter}
 	return newInstance
 }