WIP/FIXUP - expand tests

query/graphql/parser/query.go

@@ -208,7 +208,8 @@ func parseSelect(rootType parserTypes.SelectionType, field *ast.Field, index int
 
 	// parse arguments
 	for _, argument := range field.Arguments {
-		prop, astValue := getArgumentKeyValue(field, argument)
+		prop := argument.Name.Value
+		astValue := argument.Value
 
 		// parse filter
 		if prop == parserTypes.FilterClause {
@@ -302,22 +303,6 @@ func parseSelect(rootType parserTypes.SelectionType, field *ast.Field, index int
 	return slct, err
 }
 
-// getArgumentKeyValue returns the relevant arguement name and value for the given field-argument
-// Note: this function will likely need some rework when adding more aggregate options (e.g. limit)
-func getArgumentKeyValue(field *ast.Field, argument *ast.Argument) (string, ast.Value) {
-	if _, isAggregate := parserTypes.Aggregates[field.Name.Value]; isAggregate {
-		switch innerProps := argument.Value.(type) {
-		case *ast.ObjectValue:
-			for _, innerV := range innerProps.Fields {
-				if innerV.Name.Value == parserTypes.FilterClause {
-					return parserTypes.FilterClause, innerV.Value
-				}
-			}
-		}
-	}
-	return argument.Name.Value, argument.Value
-}
-
 func getFieldAlias(field *ast.Field) string {
 	if field.Alias == nil {
 		return field.Name.Value

tests/integration/query/simple/with_count_filter_test.go

@@ -0,0 +1,49 @@
+// Copyright 2022 Democratized Data Foundation
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+package simple
+
+import (
+	"testing"
+
+	testUtils "github.com/sourcenetwork/defradb/tests/integration"
+)
+
+func TestQuerySimpleWithCountWithFilter(t *testing.T) {
+	test := testUtils.QueryTestCase{
+		Description: "Simple query, count with filter",
+		Query: `query {
+					_count(users: {filter: {Age: {_gt: 26}}})
+				}`,
+		Docs: map[int][]string{
+			0: {
+				`{
+					"Name": "John",
+					"Age": 21
+				}`,
+				`{
+					"Name": "Bob",
+					"Age": 30
+				}`,
+				`{
+					"Name": "Alice",
+					"Age": 32
+				}`,
+			},
+		},
+		Results: []map[string]interface{}{
+			{
+				"_count": 2,
+			},
+		},
+	}
+
+	executeTestCase(t, test)
+}

tests/integration/query/simple/with_sum_filter_test.go

@@ -0,0 +1,49 @@
+// Copyright 2022 Democratized Data Foundation
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+package simple
+
+import (
+	"testing"
+
+	testUtils "github.com/sourcenetwork/defradb/tests/integration"
+)
+
+func TestQuerySimpleWithSumWithFilter(t *testing.T) {
+	test := testUtils.QueryTestCase{
+		Description: "Simple query, sum with filter",
+		Query: `query {
+					_sum(users: {field: Age, filter: {Age: {_gt: 26}}})
+				}`,
+		Docs: map[int][]string{
+			0: {
+				`{
+					"Name": "John",
+					"Age": 21
+				}`,
+				`{
+					"Name": "Bob",
+					"Age": 30
+				}`,
+				`{
+					"Name": "Alice",
+					"Age": 32
+				}`,
+			},
+		},
+		Results: []map[string]interface{}{
+			{
+				"_sum": int64(62),
+			},
+		},
+	}
+
+	executeTestCase(t, test)
+}