From bfa1b06a839028e5ba08f826ff14378d1aee9473 Mon Sep 17 00:00:00 2001 From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com> Date: Thu, 15 Jan 2026 16:46:37 -0600 Subject: [PATCH] refactor: remove paging types from apps endpoint - remove `PagingRequest`, `PagingOption`, and `Page` struct from `apps.go` - remove unused `strconv` import --- apps.go | 23 ----------------------- page.go | 9 +++++++++ pagingRequest.go | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 page.go create mode 100644 pagingRequest.go diff --git a/apps.go b/apps.go index 50d7805..9d9fb95 100644 --- a/apps.go +++ b/apps.go @@ -3,7 +3,6 @@ package onspring import ( "context" "net/http" - "strconv" ) const ( @@ -14,28 +13,6 @@ type AppsEndpoint struct { client *Client } -type PagingRequest struct { - pageSize int - pageNumber int -} - -func (pr *PagingRequest) ToParams() map[string]string { - return map[string]string{ - "pageSize": strconv.Itoa(pr.pageNumber), - "pageNumber": strconv.Itoa(pr.pageSize), - } -} - -type PagingOption func(*PagingRequest) - -type Page[T any] struct { - PageNumber int `json:"pageNumber"` - PageSize int `json:"pageSize"` - TotalPages int `json:"totalPages"` - TotalRecords int `json:"totalRecords"` - Items []T `json:"items"` -} - type App struct { Href string `json:"href"` Id int `json:"id"` diff --git a/page.go b/page.go new file mode 100644 index 0000000..644a49b --- /dev/null +++ b/page.go @@ -0,0 +1,9 @@ +package onspring + +type Page[T any] struct { + PageNumber int `json:"pageNumber"` + PageSize int `json:"pageSize"` + TotalPages int `json:"totalPages"` + TotalRecords int `json:"totalRecords"` + Items []T `json:"items"` +} diff --git a/pagingRequest.go b/pagingRequest.go new file mode 100644 index 0000000..67924f4 --- /dev/null +++ b/pagingRequest.go @@ -0,0 +1,17 @@ +package onspring + +import "strconv" + +type PagingRequest struct { + pageSize int + pageNumber int +} + +func (pr *PagingRequest) ToParams() map[string]string { + return map[string]string{ + "pageSize": strconv.Itoa(pr.pageNumber), + "pageNumber": strconv.Itoa(pr.pageSize), + } +} + +type PagingOption func(*PagingRequest)