fix(SPV-000): enhance DefaultsIfNil to check for empty QueryParams (#816

)
bitcoin-sv · Dec 17, 2024 · cabd218 · cabd218
1 parent c9fe3f6
commit cabd218
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/actions/admin/contact_old.go b/actions/admin/contact_old.go
@@ -41,7 +41,7 @@ func contactsSearchOld(c *gin.Context, _ *reqctx.AdminContext) {
 		return
 	}
 
-	reqParams.DefaultsIfNil()
+	reqParams.DefaultsIfNilOrEmpty()
 
 	contacts, err := engine.GetContacts(
 		c.Request.Context(),

diff --git a/actions/contacts/search.go b/actions/contacts/search.go
@@ -43,7 +43,7 @@ func search(c *gin.Context, userContext *reqctx.UserContext) {
 		return
 	}
 
-	reqParams.DefaultsIfNil()
+	reqParams.DefaultsIfNilOrEmpty()
 
 	contacts, err := engine.GetContactsByXpubID(
 		c.Request.Context(),
@@ -197,7 +197,7 @@ func searchContacts(c *gin.Context, reqXPubID string, paymail string) ([]*engine
 		return nil, 0
 	}
 
-	reqParams.DefaultsIfNil()
+	reqParams.DefaultsIfNilOrEmpty()
 
 	contacts, err := engine.GetContactsByXpubID(
 		c.Request.Context(),

diff --git a/models/filter/generics.go b/models/filter/generics.go
@@ -16,9 +16,13 @@ type SearchModel[TFilter any] struct {
 	QueryParams *QueryParams `json:"params,omitempty" swaggertype:"object,string" example:"page:1,page_size:10,order_by_field:created_at,order_by_direction:desc"`
 }
 
-// DefaultsIfNil fills empty but necessary fields with default values
-func (sm *SearchModel[TFilter]) DefaultsIfNil() {
-	if sm.QueryParams == nil {
+// DefaultsIfNilOrEmpty fills empty but necessary fields with default values
+func (sm *SearchModel[TFilter]) DefaultsIfNilOrEmpty() {
+	if sm.QueryParams == nil || sm.QueryParams.isEmpty() {
 		sm.QueryParams = DefaultQueryParams()
 	}
 }
+
+func (qp QueryParams) isEmpty() bool {
+	return qp == (QueryParams{})
+}