entgql: fixed edge filter

Co-authored-by: Amr Tamimi <amrnt0@gmail.com>
ent · Jun 27, 2022 · a97f9a0 · a97f9a0
1 parent 76ba448
commit a97f9a0
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/entgql/internal/todo/ent/gql_edge.go b/entgql/internal/todo/ent/gql_edge.go
diff --git a/entgql/internal/todogotype/ent/gql_edge.go b/entgql/internal/todogotype/ent/gql_edge.go
diff --git a/entgql/internal/todopulid/ent/gql_edge.go b/entgql/internal/todopulid/ent/gql_edge.go
diff --git a/entgql/internal/todouuid/ent/gql_edge.go b/entgql/internal/todouuid/ent/gql_edge.go
diff --git a/entgql/template/edge.tmpl b/entgql/template/edge.tmpl
@@ -51,16 +51,19 @@ import "context"
 		{{- if and (hasTemplate "gql_where_input") (hasWhereInput $e) }}where *{{ $whereInput }},{{ end }}
 		opts ...{{ $opt }},
 	) (*{{ $conn }}, error) {
+		{{- if orderFields $e.Type }}
+			opts = append(opts, {{ print "With" $order }}(orderBy))
+		{{- end }}
+		{{- if and (hasTemplate "gql_where_input") (hasWhereInput $e) }}
+			opts = append(opts, {{ print "With" $names.Node "Filter" }}(where.Filter))
+		{{- end }}
 		{{- /* May be nil if the totalCount was not loaded. */}}
 		totalCount := {{ $r }}.Edges.totalCount[{{ $i }}]
 		if nodes, err := {{ $r }}.Edges.{{ $e.StructField }}OrErr(); err == nil {
 			conn := &{{ $conn }}{Edges: []*{{ $edge }}{}}
 			if totalCount != nil {
 				conn.TotalCount = *totalCount
 			}
-			{{- if orderFields $e.Type }}
-				opts = append(opts, {{ print "With" $order }}(orderBy))
-			{{- end }}
 			pager, err := {{ $newPager }}(opts)
 			if err != nil {
 				return nil, err