fix is and not is test

sev-2 · Oct 17, 2024 · 0a51aff · 0a51aff
1 parent c7376a1
commit 0a51aff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/pkg/db/where.go b/pkg/db/where.go
@@ -405,7 +405,9 @@ func (q *Query) OrIlike(column string, value string) *Query {
 
 func (q *Query) Is(column string, value any) *Query {
 
-	isValueWhitelist(value)
+	if !isValueWhitelist(value) {
+		panic("isValueWhitelist: only \"true\", \"false\", \"null\", or \"unknown\" are allowed")
+	}
 
 	if q.IsList == nil {
 		q.IsList = &[]string{}
@@ -421,7 +423,9 @@ func (q *Query) Is(column string, value any) *Query {
 
 func (q *Query) NotIs(column string, value string) *Query {
 
-	isValueWhitelist(value)
+	if !isValueWhitelist(value) {
+		panic("isValueWhitelist: only \"true\", \"false\", \"null\", or \"unknown\" are allowed")
+	}
 
 	if q.IsList == nil {
 		q.IsList = &[]string{}
@@ -479,7 +483,7 @@ func isValueWhitelist(value any) bool {
 		return true
 	case "unknown":
 		return true
+	default:
+		return false
 	}
-
-	panic("isValueWhitelist: only \"true\", \"false\", \"null\", or \"unknown\" are allowed")
 }
diff --git a/pkg/db/where_test.go b/pkg/db/where_test.go
@@ -363,7 +363,7 @@ func TestOrIlike(t *testing.T) {
 func TestIs(t *testing.T) {
 	q := NewQuery(&mockRaidenContext).Model(articleMockModel).Is("is_featured", "true")
 
-	if q.WhereOrList == nil {
+	if q.IsList == nil {
 		t.Error("Expected where clause not to be nil")
 	}
 
@@ -373,7 +373,7 @@ func TestIs(t *testing.T) {
 func TestNotIs(t *testing.T) {
 	q := NewQuery(&mockRaidenContext).Model(articleMockModel).NotIs("is_featured", "true")
 
-	if q.WhereOrList == nil {
+	if q.IsList == nil {
 		t.Error("Expected where clause not to be nil")
 	}