PR: Fix - handle the filter type error and update genTypeQueryableFi…

…eldList according to Johns suggestion. Update the schema tests that also fixes an order field.

query/graphql/schema/generate.go

@@ -19,7 +19,6 @@ import (
 
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/errors"
-	"github.com/sourcenetwork/defradb/logging"
 
 	gql "github.com/graphql-go/graphql"
 	gqlp "github.com/graphql-go/graphql/language/parser"
@@ -1135,8 +1134,13 @@ func (g *Generator) genTypeFilterArgInput(obj *gql.Object) *gql.InputObject {
 						Type: operatorType,
 					}
 				} else { // objects (relations)
+					genName := genTypeName(field.Type, "FilterArg")
+					filterType, isFilterable := g.manager.schema.TypeMap()[genName]
+					if !isFilterable {
+						filterType = &gql.InputObjectField{}
+					}
 					fields[field.Name] = &gql.InputObjectFieldConfig{
-						Type: g.manager.schema.TypeMap()[genTypeName(field.Type, "FilterArg")],
+						Type: filterType,
 					}
 				}
 			}
@@ -1261,32 +1265,9 @@ func (g *Generator) genTypeQueryableFieldList(
 	name := obj.Name()
 
 	// add the generated types to the type map
-	if err := g.manager.schema.AppendType(config.filter); err != nil {
-		log.ErrorE(
-			ctx,
-			"Failed to append runtime schema with filter",
-			err,
-			logging.NewKV("SchemaItem", config.filter),
-		)
-	}
-
-	if err := g.manager.schema.AppendType(config.groupBy); err != nil {
-		log.ErrorE(
-			ctx,
-			"Failed to append runtime schema with groupBy",
-			err,
-			logging.NewKV("SchemaItem", config.groupBy),
-		)
-	}
-
-	if err := g.manager.schema.AppendType(config.order); err != nil {
-		log.ErrorE(
-			ctx,
-			"Failed to append runtime schema with order",
-			err,
-			logging.NewKV("SchemaItem", config.order),
-		)
-	}
+	g.manager.schema.TypeMap()[config.filter.Name()] = config.filter
+	g.manager.schema.TypeMap()[config.groupBy.Name()] = config.groupBy
+	g.manager.schema.TypeMap()[config.order.Name()] = config.order
 
 	field := &gql.Field{
 		// @todo: Handle collection name from @collection directive

tests/integration/schema/filter_test.go

@@ -281,7 +281,7 @@ var defaultBookArgsWithoutFilter = trimFields(
 		buildOrderArg("book", []argDef{
 			{
 				fieldName: "author",
-				typeName:  "",
+				typeName:  "authorOrderArg",
 			},
 			{
 				fieldName: "author_id",