Update SortOrder type alias and make ListParams JSON serializable (…

…#288)
warrant-dev · Jan 19, 2024 · 3270675 · 3270675
1 parent 9d92981
commit 3270675
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 25 deletions.
diff --git a/pkg/authz/warrant/list.go b/pkg/authz/warrant/list.go
@@ -23,13 +23,13 @@ import (
 )
 
 type FilterParams struct {
-	ObjectType      []string
-	ObjectId        []string
-	Relation        []string
-	SubjectType     []string
-	SubjectId       []string
-	SubjectRelation []string
-	Policy          Policy
+	ObjectType      []string `json:"objectType,omitempty"`
+	ObjectId        []string `json:"objectId,omitempty"`
+	Relation        []string `json:"relation,omitempty"`
+	SubjectType     []string `json:"subjectType,omitempty"`
+	SubjectId       []string `json:"subjectId,omitempty"`
+	SubjectRelation []string `json:"subjectRelation,omitempty"`
+	Policy          Policy   `json:"policy,omitempty"`
 }
 
 func (fp FilterParams) String() string {

diff --git a/pkg/object/spec.go b/pkg/object/spec.go
@@ -22,7 +22,7 @@ import (
 )
 
 type FilterOptions struct {
-	ObjectType string
+	ObjectType string `json:"objectType,omitempty"`
 }
 
 type ObjectSpec struct {

diff --git a/pkg/service/list.go b/pkg/service/list.go
@@ -42,19 +42,15 @@ const (
 	defaultPage              = 1
 	contextKeyListParams key = iota
 
-	SortOrderAsc  SortOrder = iota
-	SortOrderDesc SortOrder = iota
+	SortOrderAsc  SortOrder = "ASC"
+	SortOrderDesc SortOrder = "DESC"
 )
 
-type SortOrder int
+type SortOrder string
 
 func (so SortOrder) String() string {
-	if so == SortOrderAsc {
-		return "ASC"
-	}
-
-	if so == SortOrderDesc {
-		return "DESC"
+	if so == SortOrderAsc || so == SortOrderDesc {
+		return string(so)
 	}
 
 	return ""
@@ -155,18 +151,18 @@ type ListParamParser interface {
 }
 
 type ListParams struct {
-	Page          int
-	Limit         int
-	Query         *string
-	SortBy        string
-	SortOrder     SortOrder
-	NextCursor    *Cursor
-	PrevCursor    *Cursor
+	Page          int       `json:"-"`
+	Limit         int       `json:"limit,omitempty"`
+	Query         *string   `json:"q,omitempty"`
+	SortBy        string    `json:"sortBy,omitempty"`
+	SortOrder     SortOrder `json:"sortOrder,omitempty"`
+	PrevCursor    *Cursor   `json:"prevCursor,omitempty"`
+	NextCursor    *Cursor   `json:"nextCursor,omitempty"`
 	defaultSortBy string
 }
 
 func (lp ListParams) String() string {
-	s := fmt.Sprintf("page=%d&limit=%d&sortBy=%s&sortOrder=%d&defaultSortBy=%s",
+	s := fmt.Sprintf("page=%d&limit=%d&sortBy=%s&sortOrder=%s&defaultSortBy=%s",
 		lp.Page,
 		lp.Limit,
 		lp.SortBy,