WIP:Filter by page instead of offset

Signed-off-by: Jerrico Dela Cruz <[email protected]>
Avanade · Nov 29, 2024 · c48ef0b · c48ef0b
1 parent f364c1e
commit c48ef0b
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 83 deletions.
diff --git a/src/goapp/controller/item/item-controller-dto.go b/src/goapp/controller/item/item-controller-dto.go
@@ -26,8 +26,10 @@ type RespondePageData struct {
 }
 
 type GetItemsByApproverResponse struct {
-	Data  []Item `json:"data"`
-	Total int    `json:"total"`
+	Data   []Item `json:"data"`
+	Page   int    `json:"page"`
+	Filter int    `json:"filter"`
+	Total  int    `json:"total"`
 }
 
 type Item struct {

diff --git a/src/goapp/controller/item/item-controller.go b/src/goapp/controller/item/item-controller.go
@@ -124,14 +124,14 @@ func (c *itemController) GetItemsByApprover(w http.ResponseWriter, r *http.Reque
 		organization = params["organization"][0]
 	}
 
-	if params.Has("offset") {
-		filterOptions.Offset, err = strconv.Atoi(params["offset"][0])
+	filterOptions.Page = 0 // Default page is 1 which is 0 in the database
+	if params.Has("page") {
+		filterOptions.Page, err = strconv.Atoi(params["page"][0])
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-	} else {
-		filterOptions.Offset = 0
+		filterOptions.Page = filterOptions.Page - 1
 	}
 
 	if params.Has("filter") {
@@ -141,7 +141,7 @@ func (c *itemController) GetItemsByApprover(w http.ResponseWriter, r *http.Reque
 			return
 		}
 	} else {
-		filterOptions.Filter = 100
+		filterOptions.Filter = 10
 	}
 
 	result, total, err := c.Service.Item.GetByApprover(user.Email, requestType, organization, filterOptions)
@@ -165,6 +165,8 @@ func (c *itemController) GetItemsByApprover(w http.ResponseWriter, r *http.Reque
 
 		response.Data = append(response.Data, itemResponse)
 	}
+	response.Page = filterOptions.Page
+	response.Filter = filterOptions.Filter
 	response.Total = total
 
 	// Return the result

diff --git a/src/goapp/model/common.go b/src/goapp/model/common.go
@@ -2,7 +2,7 @@ package model
 
 type FilterOptions struct {
 	Filter    int
-	Offset    int
+	Page      int
 	Search    string
 	Orderby   string
 	Ordertype string

diff --git a/src/goapp/repository/item/item-repository.go b/src/goapp/repository/item/item-repository.go
@@ -114,8 +114,9 @@ func (r *itemRepository) GetItemsByApprover(approver, requestType, organization
 		params = append(params, sql.Named("Filter", filterOptions.Filter))
 	}
 
-	if filterOptions.Offset != 0 {
-		params = append(params, sql.Named("Offset", filterOptions.Offset))
+	if filterOptions.Page != 0 {
+		offset := filterOptions.Page * filterOptions.Filter
+		params = append(params, sql.Named("Offset", offset))
 	}
 
 	params = append(params, sql.Named("Approver", approver))