diff --git a/domain/page/endpoint.go b/domain/page/endpoint.go index 13f05453..40872709 100644 --- a/domain/page/endpoint.go +++ b/domain/page/endpoint.go @@ -339,7 +339,7 @@ func (h *Handler) DeletePages(w http.ResponseWriter, r *http.Request) { return } - model := new([]page.PageLevelRequest) + model := new([]page.LevelRequest) err = json.Unmarshal(body, &model) if err != nil { response.WriteBadRequestError(w, method, "JSON marshal") @@ -591,7 +591,7 @@ func (h *Handler) ChangePageSequence(w http.ResponseWriter, r *http.Request) { return } - model := new([]page.PageSequenceRequest) + model := new([]page.SequenceRequest) err = json.Unmarshal(body, &model) if err != nil { response.WriteBadRequestError(w, method, err.Error()) @@ -652,7 +652,7 @@ func (h *Handler) ChangePageLevel(w http.ResponseWriter, r *http.Request) { return } - model := new([]page.PageLevelRequest) + model := new([]page.LevelRequest) err = json.Unmarshal(body, &model) if err != nil { response.WriteBadRequestError(w, method, err.Error()) diff --git a/model/page/numbering.go b/model/page/numbering.go index 0140927d..51a8d530 100644 --- a/model/page/numbering.go +++ b/model/page/numbering.go @@ -16,10 +16,8 @@ import ( ) // Numberize calculates numbers for pages, e.g. 1, 1.1, 2.2.1 -// that form a document's Table of Contents. -// +// for the document's Table of Contents. func Numberize(pages []Page) { - // index := 1 var prevPageLevel uint64 parts := []int{1} // we store 1, 1, 2, and then generate numbering as "1.1.2" @@ -29,14 +27,6 @@ func Numberize(pages []Page) { p.Level = 1 } - // increment level numbers each time we encounter age level of 1 - // if p.Level == 1 { - // index++ - // parts = []int{index} - // } else if p.Level == prevPageLevel { - // parts[len(parts)-1]++ - // } - if i != 0 { // we ... if p.Level > prevPageLevel { diff --git a/model/page/page.go b/model/page/page.go index 2b8ea341..e5168650 100644 --- a/model/page/page.go +++ b/model/page/page.go @@ -103,14 +103,14 @@ type NewPage struct { Meta Meta `json:"meta"` } -// PageSequenceRequest details a page ID and its sequence within the document. -type PageSequenceRequest struct { +// SequenceRequest details a page ID and its sequence within the document. +type SequenceRequest struct { PageID string `json:"pageId"` Sequence float64 `json:"sequence"` } -// PageLevelRequest details a page ID and level. -type PageLevelRequest struct { +// LevelRequest details a page ID and level. +type LevelRequest struct { PageID string `json:"pageId"` Level int `json:"level"` }