Added variable substitution to FacetsFilter

gql/parser.go

@@ -413,6 +413,11 @@ func substituteVariables(gq *GraphQuery, vmap varMap) error {
 			return err
 		}
 	}
+	if gq.FacetsFilter != nil {
+		if err := substituteVariablesFilter(gq.FacetsFilter, vmap); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

gql/parser_test.go

@@ -2032,6 +2032,23 @@ func TestParseStringVarInFilter(t *testing.T) {
 	require.Equal(t, "v0.7.3/beta", res.Query[0].Children[0].Filter.Func.Args[0].Value)
 }
 
+func TestParseVarInFacet(t *testing.T) {
+	query := `
+query works($since: string = "2018") {
+  q(func: has(works_in)) @cascade {
+    name
+    works_in @facets @facets(gt(since, $since)) {
+      name
+    }
+  }
+}`
+
+	res, err := Parse(Request{Str: query})
+	require.NoError(t, err)
+	require.NotNil(t, res.Query[0])
+	require.Equal(t, "2018", res.Query[0].Children[1].FacetsFilter.Func.Args[0].Value)
+}
+
 func TestParseVariablesError1(t *testing.T) {
 	query := `
 	query testQuery($a: string, $b: int!){

query/query_facets_test.go

@@ -77,6 +77,89 @@ func populateClusterWithFacets() {
 	facetSetupDone = true
 }
 
+func TestFacetsVarAllofterms(t *testing.T) {
+	populateClusterWithFacets()
+	query := `
+		{
+			me(func: uid(31)) {
+				name
+				friend @facets(allofterms(games, "football basketball hockey")) {
+					name
+					uid
+				}
+			}
+		}
+	`
+
+	js := processQueryNoErr(t, query)
+	require.JSONEq(t,
+		`{"data": {"me":[{"friend":[{"name":"Daryl Dixon","uid":"0x19"}],"name":"Andrea"}]}}`,
+		js)
+}
+
+func TestFacetsWithVarEq(t *testing.T) {
+	populateClusterWithFacets()
+	// find family of 1
+	query := `
+		query works($family : bool = true){
+			me(func: uid(1)) {
+				name
+				friend @facets(eq(family, $family)) {
+					name
+					uid
+				}
+			}
+		}
+	`
+
+	js := processQueryNoErr(t, query)
+	require.JSONEq(t,
+		`{"data": {"me":[{"friend":[{"uid":"0x18","name":"Glenn Rhee"},{"uid":"0x19", "name": "Daryl Dixon"}],"name":"Michonne"}]}}`,
+		js)
+}
+
+func TestFacetWithVarLe(t *testing.T) {
+	populateClusterWithFacets()
+
+	query := `
+		query works($age : int = 35) {
+			me(func: uid(0x1)) {
+				name
+				friend @facets(le(age, $age)) {
+					name
+					uid
+				}
+			}
+		}
+	`
+
+	js := processQueryNoErr(t, query)
+	require.JSONEq(t,
+		`{"data": {"me":[{"friend":[{"uid":"0x65"}],"name":"Michonne"}]}}`,
+		js)
+}
+
+func TestFacetWithVarGt(t *testing.T) {
+	populateClusterWithFacets()
+
+	query := `
+		query works($age : int = "32") {
+			me(func: uid(0x1)) {
+				name
+				friend @facets(gt(age, $age)) {
+					name
+					uid
+				}
+			}
+		}
+	`
+
+	js := processQueryNoErr(t, query)
+	require.JSONEq(t,
+		`{"data": {"me":[{"friend":[{"uid":"0x65"}],"name":"Michonne"}]}}`,
+		js)
+}
+
 func TestRetrieveFacetsSimple(t *testing.T) {
 	populateClusterWithFacets()
 	query := `

wiki/content/query-language/index.md

@@ -3155,6 +3155,16 @@ query test($a: int = 2, $b: int!, $aName: string, $bName: string) {
 }
 {{< /runnable >}}
 
+We also support variable substituion in facets now.
+{{< runnable vars="{\"$name\": \"Alice\"}" >}}
+query test($name: string = "Alice") {
+  data(func: eq(name, $name)) {
+    friend @facets(eq(close, true)) {
+      name
+    }
+  }
+}
+{{</ runnable >}}
 
 {{% notice "note" %}}
 If you want to input a list of uids as a GraphQL variable value, you can have the variable as string type and