fix query result type conversion

TanmoySG · May 14, 2024 · acf98fe · acf98fe
1 parent 2ad9a8f
commit acf98fe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/internal/data/data.go b/internal/data/data.go
@@ -10,6 +10,7 @@ import (
 	"github.com/TanmoySG/wunderDB/pkg/schema"
 	"github.com/TanmoySG/wunderDB/pkg/utils/maps"
 	er "github.com/TanmoySG/wunderDB/pkg/wdb/errors"
+	wdbErrors "github.com/TanmoySG/wunderDB/pkg/wdb/errors"
 	"github.com/spyzhov/ajson"
 )
 
@@ -171,9 +172,16 @@ func (d Data) Query(query string, mode QueryType) (interface{}, *er.WdbError) {
 	for _, node := range queryResultNodes {
 		marshaledNode, err := ajson.Marshal(node)
 		if err != nil {
-			return nil, nil
+			return nil, &wdbErrors.QueryResultProcessingError
 		}
-		queryResults = append(queryResults, string(marshaledNode))
+
+		var result interface{}
+		err = json.Unmarshal(marshaledNode, &result)
+		if err != nil {
+			return nil, &wdbErrors.QueryResultProcessingError
+		}
+
+		queryResults = append(queryResults, result)
 	}
 
 	return queryResults, nil

diff --git a/pkg/wdb/errors/errors.go b/pkg/wdb/errors/errors.go
@@ -147,6 +147,12 @@ var (
 		HttpStatusCode: 400,
 	}
 
+	QueryResultProcessingError = WdbError{
+		ErrCode:        "queryResultProcessingError",
+		ErrMessage:     "json path result processing failed",
+		HttpStatusCode: 400,
+	}
+
 	// Safe Name Error
 	CollectionNameFormatError = WdbError{
 		ErrCode:        "entityNameFormatError",