Skip to content

fix(bunpaginate): time columns #94

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 23, 2024
Merged

fix(bunpaginate): time columns #94

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
32 changes: 25 additions & 7 deletions bun/bunpaginate/pagination_column.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,40 @@ func findPaginationFieldPath(v any, paginationColumn string) []reflect.StructFie
field := typeOfT.Field(i)
switch field.Type.Kind() {
case reflect.Struct:
fields := findPaginationFieldPath(reflect.New(field.Type).Elem().Interface(), paginationColumn)
if len(fields) > 0 {
return fields
if field.Type.AssignableTo(reflect.TypeOf(time.Time{})) ||
field.Type.AssignableTo(reflect.TypeOf(&time.Time{})) ||
field.Type.AssignableTo(reflect.TypeOf(libtime.Time{})) ||
field.Type.AssignableTo(reflect.TypeOf(&libtime.Time{})) {

if fields := checkTag(field, paginationColumn); len(fields) > 0 {
return fields
}
} else {
fields := findPaginationFieldPath(reflect.New(field.Type).Elem().Interface(), paginationColumn)
if len(fields) > 0 {
return fields
}
}
default:
tag := field.Tag.Get("bun")
column := strings.Split(tag, ",")[0]
if column == paginationColumn {
return []reflect.StructField{field}
if fields := checkTag(field, paginationColumn); len(fields) > 0 {
return fields
}
}
}

return nil
}

func checkTag(field reflect.StructField, paginationColumn string) []reflect.StructField {
tag := field.Tag.Get("bun")
column := strings.Split(tag, ",")[0]
if column == paginationColumn {
return []reflect.StructField{field}
}

return nil
}

func findPaginationField(v any, fields ...reflect.StructField) *big.Int {
vOf := reflect.ValueOf(v)
field := vOf.FieldByName(fields[0].Name)
Expand Down