refactor: change primitive helper arg to object

siyul-park · Nov 24, 2023 · f30a0a0 · f30a0a0
1 parent 777e57b
commit f30a0a0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/pkg/database/filter.go b/pkg/database/filter.go
@@ -168,7 +168,8 @@ func (ft *Filter) String() (string, error) {
 		return ft.Key + " " + string(ft.OP), nil
 	}
 
-	b, err := json.Marshal(primitive.Interface(ft.Value))
+	v, _ := ft.Value.(primitive.Object)
+	b, err := json.Marshal(primitive.Interface(v))
 	if err != nil {
 		return "", err
 	}

diff --git a/pkg/database/memdb/filter.go b/pkg/database/memdb/filter.go
@@ -38,32 +38,40 @@ func ParseFilter(filter *database.Filter) func(*primitive.Map) bool {
 		return func(m *primitive.Map) bool {
 			if o, ok := primitive.Get[primitive.Object](m, filter.Key); !ok {
 				return false
+			} else if v, ok := filter.Value.(primitive.Object); !ok {
+				return false
 			} else {
-				return util.Compare(primitive.Interface(o), primitive.Interface(filter.Value)) < 0
+				return util.Compare(primitive.Interface(o), primitive.Interface(v)) < 0
 			}
 		}
 	case database.LTE:
 		return func(m *primitive.Map) bool {
 			if o, ok := primitive.Get[primitive.Object](m, filter.Key); !ok {
 				return false
+			} else if v, ok := filter.Value.(primitive.Object); !ok {
+				return false
 			} else {
-				return util.Compare(primitive.Interface(o), primitive.Interface(filter.Value)) <= 0
+				return util.Compare(primitive.Interface(o), primitive.Interface(v)) <= 0
 			}
 		}
 	case database.GT:
 		return func(m *primitive.Map) bool {
 			if o, ok := primitive.Get[primitive.Object](m, filter.Key); !ok {
 				return false
+			} else if v, ok := filter.Value.(primitive.Object); !ok {
+				return false
 			} else {
-				return util.Compare(primitive.Interface(o), primitive.Interface(filter.Value)) > 0
+				return util.Compare(primitive.Interface(o), primitive.Interface(v)) > 0
 			}
 		}
 	case database.GTE:
 		return func(m *primitive.Map) bool {
 			if o, ok := primitive.Get[primitive.Object](m, filter.Key); !ok {
 				return false
+			} else if v, ok := filter.Value.(primitive.Object); !ok {
+				return false
 			} else {
-				return util.Compare(primitive.Interface(o), primitive.Interface(filter.Value)) >= 0
+				return util.Compare(primitive.Interface(o), primitive.Interface(v)) >= 0
 			}
 		}
 	case database.IN:

diff --git a/pkg/database/memdb/index.go b/pkg/database/memdb/index.go
@@ -156,7 +156,7 @@ func (iv *IndexView) findMany(_ context.Context, examples []*primitive.Map) ([]p
 				var i int
 				var k string
 				for i, k = range model.Keys {
-					if obj, ok := primitive.Get[any](example, k); ok {
+					if obj, ok := primitive.Get[primitive.Object](example, k); ok {
 						v := primitive.Interface(obj)
 
 						hash, err := util.Hash(v)

diff --git a/pkg/primitive/object.go b/pkg/primitive/object.go
@@ -45,12 +45,9 @@ func Equal(x, y Object) bool {
 	}
 }
 
-
-func Interface(v any) any {
+func Interface(v Object) any {
 	if v == nil {
 		return nil
-	} else if v, ok := v.(Object); !ok {
-		return nil
 	} else {
 		return v.Interface()
 	}