fix: handle nil pagination responses when HTTP status is 200 (#222)

Finch-API · Jul 31, 2024 · cf14c8d · cf14c8d
1 parent 06f83cf
commit cf14c8d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/hrisdirectory.go b/hrisdirectory.go
@@ -131,6 +131,9 @@ func (r *IndividualsPage) GetNextPage() (res *IndividualsPage, err error) {
 }
 
 func (r *IndividualsPage) SetPageConfig(cfg *requestconfig.RequestConfig, res *http.Response) {
+	if r == nil {
+		r = &IndividualsPage{}
+	}
 	r.cfg = cfg
 	r.res = res
 }

diff --git a/internal/pagination/pagination.go b/internal/pagination/pagination.go
@@ -54,6 +54,9 @@ func (r *SinglePage[T]) GetNextPage() (res *SinglePage[T], err error) {
 }
 
 func (r *SinglePage[T]) SetPageConfig(cfg *requestconfig.RequestConfig, res *http.Response) {
+	if r == nil {
+		r = &SinglePage[T]{}
+	}
 	r.cfg = cfg
 	r.res = res
 }
@@ -146,6 +149,9 @@ func (r *ResponsesPage[T]) GetNextPage() (res *ResponsesPage[T], err error) {
 }
 
 func (r *ResponsesPage[T]) SetPageConfig(cfg *requestconfig.RequestConfig, res *http.Response) {
+	if r == nil {
+		r = &ResponsesPage[T]{}
+	}
 	r.cfg = cfg
 	r.res = res
 }
@@ -240,6 +246,9 @@ func (r *Page[T]) GetNextPage() (res *Page[T], err error) {
 }
 
 func (r *Page[T]) SetPageConfig(cfg *requestconfig.RequestConfig, res *http.Response) {
+	if r == nil {
+		r = &Page[T]{}
+	}
 	r.cfg = cfg
 	r.res = res
 }

diff --git a/internal/requestconfig/requestconfig.go b/internal/requestconfig/requestconfig.go
@@ -443,7 +443,7 @@ func (cfg *RequestConfig) Execute() (err error) {
 
 	err = json.NewDecoder(bytes.NewReader(contents)).Decode(cfg.ResponseBodyInto)
 	if err != nil {
-		err = fmt.Errorf("error parsing response json: %w", err)
+		return fmt.Errorf("error parsing response json: %w", err)
 	}
 
 	return nil