Skip to content

fix(bunpaginate): fix missing unmarshal method for options #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2024
Merged

fix(bunpaginate): fix missing unmarshal method for options #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions bun/bunpaginate/pagination_query_options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package bunpaginate

import (
"encoding/json"

"github.com/formancehq/go-libs/query"
)

Expand All @@ -10,6 +12,29 @@ type PaginatedQueryOptions[T any] struct {
Options T `json:"options"`
}

func (pqo *PaginatedQueryOptions[T]) UnmarshalJSON(data []byte) error {
type base struct {
PageSize uint64 `json:"pageSize"`
Options T `json:"options"`
}
var b base
if err := json.Unmarshal(data, &b); err != nil {
return err
}
pqo.PageSize = b.PageSize
pqo.Options = b.Options
var dataMap map[string]json.RawMessage
if err := json.Unmarshal(data, &dataMap); err != nil {
return err
}
qb, err := query.ParseJSON(string(dataMap["qb"]))
if err != nil {
return err
}
pqo.QueryBuilder = qb
return nil
}

func (opts PaginatedQueryOptions[T]) WithQueryBuilder(qb query.Builder) PaginatedQueryOptions[T] {
opts.QueryBuilder = qb

Expand Down