Rename PageDto to Page

ybkuroki · May 3, 2020 · df8c8e8 · df8c8e8
1 parent a012da5
commit df8c8e8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/model/book.go b/model/book.go
@@ -42,23 +42,23 @@ func (b *Book) FindAll(rep *repository.Repository) (*[]Book, error) {
 }
 
 // FindAllByPage is
-func (b *Book) FindAllByPage(rep *repository.Repository, page int, size int) (*PageDto, error) {
+func (b *Book) FindAllByPage(rep *repository.Repository, page int, size int) (*Page, error) {
 	var books []Book
 
-	pagedto := NewPageDto()
-	pagedto.Page = page
-	pagedto.Size = size
-	pagedto.NumberOfElements = pagedto.Size
+	p := NewPage()
+	p.Page = page
+	p.Size = size
+	p.NumberOfElements = p.Size
 
-	rep.Preload("Category").Preload("Format").Find(&books).Count(&pagedto.TotalElements)
-	pagedto.TotalPages = int(math.Ceil(float64(pagedto.TotalElements) / float64(pagedto.Size)))
+	rep.Preload("Category").Preload("Format").Find(&books).Count(&p.TotalElements)
+	p.TotalPages = int(math.Ceil(float64(p.TotalElements) / float64(p.Size)))
 
-	if error := rep.Preload("Category").Preload("Format").Offset(page * pagedto.Size).Limit(size).Find(&books).Error; error != nil {
+	if error := rep.Preload("Category").Preload("Format").Offset(page * p.Size).Limit(size).Find(&books).Error; error != nil {
 		return nil, error
 	}
 
-	pagedto.Content = &books
-	return pagedto, nil
+	p.Content = &books
+	return p, nil
 }
 
 // Save is

diff --git a/model/page.go b/model/page.go
@@ -1,7 +1,7 @@
 package model
 
-// PageDto is
-type PageDto struct {
+// Page is
+type Page struct {
 	Content          *[]Book `json:"content"`
 	Last             bool    `json:"last"`
 	TotalElements    int     `json:"totalElements"`
@@ -11,7 +11,7 @@ type PageDto struct {
 	NumberOfElements int     `json:"numberOfElements"`
 }
 
-// NewPageDto is constructor
-func NewPageDto() *PageDto {
-	return &PageDto{}
+// NewPage is constructor
+func NewPage() *Page {
+	return &Page{}
 }
diff --git a/service/book.go b/service/book.go
@@ -15,7 +15,7 @@ func FindAllBooks() *[]model.Book {
 }
 
 // FindAllBooksByPage is
-func FindAllBooksByPage(page int, size int) *model.PageDto {
+func FindAllBooksByPage(page int, size int) *model.Page {
 	rep := repository.GetRepository()
 	book := model.Book{}
 	result, _ := book.FindAllByPage(rep, page, size)