fix(GraphQL): AND/OR filters now accept an array while also accepting objects. #6801

pawanrawal · 2020-10-27T07:37:26Z

Fixes GRAPHQL-743

addMutation also accepts an object along with an array. This is in accordance with https://spec.graphql.org/June2018/#sec-Type-System.List.

If the value passed as an input to a list type is not a list and not the null value, then the result of input coercion is a list of size one, where the single item value is the result of input coercion for the list’s item type on the provided value (note this may apply recursively for nested lists).

Seems like the input coercion fails when the value for the input is supplied through GraphQL variables because of vektah/gqlparser#137.

This change is

Docs Preview:

…ting objects

…ql-743

…pawan/graphql-743

…ql-743

pawanrawal

Reviewable status: 0 of 80 files reviewed, 14 unresolved discussions (waiting on @manishrjain, @MichaelJCompton, and @vvbalaji-dgraph)

go.sum, line 7 at r4 (raw file):

contrib.go.opencensus.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg=
contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A=
github.com/99designs/gqlgen v0.13.0/go.mod h1:NV130r6f4tpRWuAI+zsrSdooO/eWUv+Gyyoi3rEfXIk=

can you try and delete this line and see if it still comes back after running go mod tidy?n

graphql/e2e/common/common.go, line 354 at r4 (raw file):

	t.Run("alias works for queries", queryWithAlias)
	t.Run("cascade directive", queryWithCascade)
	t.Run("Filter Queries", filterQueries)

The cases above start with a small case so any reason to start this one with capital?

Also, this should be more descriptive, say filters queries with array for AND/OR

graphql/e2e/common/common.go, line 406 at r4 (raw file):

	t.Run("Geo - Polygon type", mutationPolygonType)
	t.Run("Geo - MultiPolygon type", mutationMultiPolygonType)
	t.Run("Mutation With Filter", mutationWithFilter)

mutation with array for AND/OR filter

graphql/e2e/common/common.go, line 407 at r4 (raw file):

	t.Run("Geo - MultiPolygon type", mutationMultiPolygonType)
	t.Run("Mutation With Filter", mutationWithFilter)
	t.Run("update With Filter", updateWithFilter)

update with array for AND/OR filter

graphql/e2e/common/mutation.go, line 4430 at r4 (raw file):

			name: "Single Statement in Filter on Mutation",
			query: `mutation {
			          addpost1(input: [{title: "Dgraph", numLikes: 100}]) {

Why test this? This should have been working even before the change.

graphql/e2e/common/mutation.go, line 4458 at r4 (raw file):

						}
					}`,
			variables: map[string]interface{}{"filter": map[string]interface{}{"title": map[string]interface{}{"eq": "Dgraph"}}},

Why test this? This should have been working even before the change.

graphql/e2e/common/mutation.go, line 4492 at r4 (raw file):

		},
		{
			name: "Single Statement in Filter on Mutation using variables",

No idea about the test case from this name. Could you fix all names here?

This could be called Filter with only OR key at top level

graphql/e2e/common/mutation.go, line 4514 at r4 (raw file):

		},
		{
			name: "Single and Statement in Filter on Mutation",

Filter with only AND key at top level

Fix all other names as well

graphql/e2e/common/mutation.go, line 4587 at r4 (raw file):

                      }
		           }`,
			variables: map[string]interface{}{"filter": map[string]interface{}{"and": []interface{}{map[string]interface {

Instead of all this, might have been better if you defined the JSON representation of variables here and unmarshalled into a map before calling execute. A JSON is easier to read than this Go map.

graphql/e2e/common/mutation.go, line 4640 at r4 (raw file):

			name: "Single Statement in Filter on Update",
			query: `mutation updatepost1{
                    	updatepost1(input:{filter:{title:{eq:"Dgraph"}},set:{numLikes:150}}){

What's the point of this test if it doesn't use AND or OR?

graphql/e2e/common/mutation.go, line 4659 at r4 (raw file):

		},
		{
			name: "Single Statement in Filter on Update with variable",

Again this test also doesn't use AND/OR so why add it?

graphql/e2e/common/query.go, line 2315 at r5 (raw file):

		respData  string
	}{{
		name: "Single Statement in Filter",

Wasn't this working before? Why do we need another test for this?

graphql/e2e/common/query.go, line 2340 at r5 (raw file):

	},
		{
			name: "Single Statement in Filter using variables",

test not useful

graphql/e2e/common/query.go, line 2637 at r5 (raw file):

						  ]
						}`,
			variables: map[string]interface{}{"filter": map[string]interface{}{"and": []interface{}{map[string]interface{}{"name": map[string]interface{}{"eq": "George"}}, map[string]interface{}{"reputation": map[string]interface{}{"eq": 4.5}}, map[string]interface{}{"qualification": map[string]interface{}{"eq": "Phd in CSE"}}}}},

Fix these variables to be a JSON and unamarshal it below.nn

JatinDev543

Reviewable status: 0 of 80 files reviewed, 14 unresolved discussions (waiting on @manishrjain, @MichaelJCompton, @pawanrawal, and @vvbalaji-dgraph)

go.sum, line 7 at r4 (raw file):