Integrate Gql auto schema generation with auto query generation

DataGateway.Config/Action.cs

@@ -31,7 +31,7 @@ public enum Operation
         Upsert, Create,
 
         // Sql operations
-        Insert, Update,
+        Insert, Update, UpdateGraphQL,
 
         // Additional
         UpsertIncremental, UpdateIncremental

DataGateway.Config/DataSource.cs

@@ -10,14 +10,11 @@ namespace Azure.DataGateway.Config
     /// will use to connect to the backend database.</param>
     public record DataSource(
         [property: JsonPropertyName(DataSource.DATABASE_PROPERTY_NAME)]
-        DatabaseType DatabaseType,
-        [property: JsonPropertyName(DataSource.RESOLVER_JSON_PROPERTY_NAME)]
-        string? ResolverConfigFile)
+        DatabaseType DatabaseType)
     {
         public const string JSON_PROPERTY_NAME = "data-source";
         public const string DATABASE_PROPERTY_NAME = "database-type";
         public const string CONNSTRING_PROPERTY_NAME = "connection-string";
-        public const string RESOLVER_JSON_PROPERTY_NAME = "resolver-config-file";
 
         public string GetDatabaseTypeNotSupportedMessage()
         {
@@ -32,8 +29,12 @@ public string GetDatabaseTypeNotSupportedMessage()
     /// <summary>
     /// Options for CosmosDb database.
     /// </summary>
-    public record CosmosDbOptions(string Database)
+    public record CosmosDbOptions(
+        string Database,
+        [property: JsonPropertyName(CosmosDbOptions.RESOLVER_JSON_PROPERTY_NAME)]
+        string ResolverConfigFile)
     {
+        public const string RESOLVER_JSON_PROPERTY_NAME = "resolver-config-file";
         public const string JSON_PROPERTY_NAME = nameof(DatabaseType.cosmos);
     }
 

DataGateway.Config/DatabaseObject.cs

@@ -11,13 +11,38 @@ public class DatabaseObject
 
         public TableDefinition TableDefinition { get; set; } = null!;
 
+        public DatabaseObject(string schemaName, string tableName)
+        {
+            SchemaName = schemaName;
+            Name = tableName;
+        }
+
+        public DatabaseObject() { }
+
         public string FullName
         {
             get
             {
                 return string.IsNullOrEmpty(SchemaName) ? Name : $"{SchemaName}.{Name}";
             }
         }
+
+        public override bool Equals(object? other)
+        {
+            return Equals(other as DatabaseObject);
+        }
+
+        public bool Equals(DatabaseObject? other)
+        {
+            return other is not null &&
+                   SchemaName.Equals(other.SchemaName) &&
+                   Name.Equals(other.Name);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(SchemaName, Name);
+        }
     }
 
     public class TableDefinition
@@ -26,10 +51,34 @@ public class TableDefinition
         /// The list of columns that together form the primary key of the table.
         /// </summary>
         public List<string> PrimaryKey { get; set; } = new();
-        public Dictionary<string, ColumnDefinition> Columns { get; set; } =
+
+        /// <summary>
+        /// The list of columns in this table.
+        /// </summary>
+        public Dictionary<string, ColumnDefinition> Columns { get; private set; } =
             new(StringComparer.InvariantCultureIgnoreCase);
-        public Dictionary<string, ForeignKeyDefinition> ForeignKeys { get; set; } = new();
-        public Dictionary<string, AuthorizationRule> HttpVerbs { get; set; } = new();
+
+        /// <summary>
+        /// A dictionary mapping all the source entities to their relationship metadata.
+        /// All these entities share this table definition
+        /// as their underlying database object 
+        /// </summary>
+        public Dictionary<string, RelationshipMetadata> SourceEntityRelationshipMap { get; private set; } =
+            new(StringComparer.InvariantCultureIgnoreCase);
+
+        public Dictionary<string, AuthorizationRule> HttpVerbs { get; private set; } = new();
+    }
+
+    /// <summary>
+    /// Class encapsulating foreign keys corresponding to target entities.
+    /// </summary>
+    public class RelationshipMetadata
+    {
+        /// <summary>
+        /// Dictionary of target entity name to ForeignKeyDefinition.
+        /// </summary>
+        public Dictionary<string, List<ForeignKeyDefinition>> TargetEntityToFkDefinitionMap { get; private set; }
+            = new(StringComparer.InvariantCultureIgnoreCase);
     }
 
     public class ColumnDefinition
@@ -46,7 +95,10 @@ public class ColumnDefinition
 
     public class ForeignKeyDefinition
     {
-        public string ReferencedTable { get; set; } = string.Empty;
+        /// <summary>
+        /// The referencing and referenced table pair.
+        /// </summary>
+        public RelationShipPair Pair { get; set; } = new();
 
         /// <summary>
         /// The list of columns referenced in the reference table.
@@ -70,15 +122,50 @@ public override bool Equals(object? other)
         public bool Equals(ForeignKeyDefinition? other)
         {
             return other != null &&
-                   ReferencedTable.Equals(other.ReferencedTable) &&
+                   Pair.Equals(other.Pair) &&
                    ReferencedColumns.SequenceEqual(other.ReferencedColumns) &&
                    ReferencingColumns.SequenceEqual(other.ReferencingColumns);
         }
 
         public override int GetHashCode()
         {
             return HashCode.Combine(
-                    ReferencedTable, ReferencedColumns, ReferencingColumns);
+                    Pair, ReferencedColumns, ReferencingColumns);
+        }
+    }
+
+    public class RelationShipPair
+    {
+        public RelationShipPair() { }
+
+        public RelationShipPair(
+            DatabaseObject referencingDbObject,
+            DatabaseObject referencedDbObject)
+        {
+            ReferencingDbObject = referencingDbObject;
+            ReferencedDbObject = referencedDbObject;
+        }
+
+        public DatabaseObject ReferencingDbObject { get; set; } = new();
+
+        public DatabaseObject ReferencedDbObject { get; set; } = new();
+
+        public override bool Equals(object? other)
+        {
+            return Equals(other as RelationShipPair);
+        }
+
+        public bool Equals(RelationShipPair? other)
+        {
+            return other != null &&
+                   ReferencedDbObject.Equals(other.ReferencedDbObject) &&
+                   ReferencingDbObject.Equals(other.ReferencingDbObject);
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(
+                    ReferencedDbObject, ReferencingDbObject);
         }
     }
 

DataGateway.Service.GraphQLBuilder/Mutations/CreateMutationBuilder.cs

@@ -196,7 +196,7 @@ private static ITypeNode GenerateListType(ITypeNode type, ITypeNode fieldType)
 
         private static NameNode GenerateInputTypeName(string typeName, Entity entity)
         {
-            return new($"Create{FormatNameForObject(typeName, entity)}Input");
+            return new($"{Operation.Create}{FormatNameForObject(typeName, entity)}Input");
         }
 
         /// <summary>

DataGateway.Service.GraphQLBuilder/Mutations/DeleteMutationBuilder.cs

@@ -10,20 +10,34 @@ internal static class DeleteMutationBuilder
     {
         public static FieldDefinitionNode Build(NameNode name, ObjectTypeDefinitionNode objectTypeDefinitionNode, Entity configEntity)
         {
-            FieldDefinitionNode idField = FindPrimaryKeyField(objectTypeDefinitionNode);
+            List<FieldDefinitionNode> idFields = FindPrimaryKeyFields(objectTypeDefinitionNode);
+            string description;
+            if (idFields.Count > 1)
+            {
+                description = "One of the ids of the item being deleted.";
+            }
+            else
+            {
+                description = "The ID of the item being deleted.";
+            }
+
+            List<InputValueDefinitionNode> inputValues = new();
+            foreach (FieldDefinitionNode idField in idFields)
+            {
+                inputValues.Add(new InputValueDefinitionNode(
+                    location: null,
+                    idField.Name,
+                    new StringValueNode(description),
+                    new NonNullTypeNode(idField.Type.NamedType()),
+                    defaultValue: null,
+                    new List<DirectiveNode>()));
+            }
+
             return new(
                 null,
                 new NameNode($"delete{FormatNameForObject(name, configEntity)}"),
                 new StringValueNode($"Delete a {name}"),
-                new List<InputValueDefinitionNode> {
-                new InputValueDefinitionNode(
-                    null,
-                    idField.Name,
-                    new StringValueNode($"Id of the item to delete"),
-                    new NonNullTypeNode(idField.Type.NamedType()),
-                    null,
-                    new List<DirectiveNode>())
-                },
+                inputValues,
                 new NamedTypeNode(FormatNameForObject(name, configEntity)),
                 new List<DirectiveNode>()
             );

DataGateway.Service.GraphQLBuilder/Mutations/MutationBuilder.cs

@@ -33,5 +33,15 @@ public static DocumentNode Build(DocumentNode root, DatabaseType databaseType, I
             definitionNodes.AddRange(inputs.Values);
             return new(definitionNodes);
         }
+
+        public static Operation DetermineMutationOperationTypeBasedOnInputType(string inputTypeName)
+        {
+            return inputTypeName switch
+            {
+                string s when s.StartsWith(Operation.Create.ToString(), StringComparison.OrdinalIgnoreCase) => Operation.Create,
+                string s when s.StartsWith(Operation.Update.ToString(), StringComparison.OrdinalIgnoreCase) => Operation.UpdateGraphQL,
+                _ => Operation.Delete
+            };
+        }
     }
 }

DataGateway.Service.GraphQLBuilder/Mutations/UpdateMutationBuilder.cs

@@ -137,7 +137,7 @@ private static InputValueDefinitionNode GetComplexInputType(
 
         private static NameNode GenerateInputTypeName(string typeName, Entity entity)
         {
-            return new($"Update{FormatNameForObject(typeName, entity)}Input");
+            return new($"{Operation.Update}{FormatNameForObject(typeName, entity)}Input");
         }
 
         /// <summary>
@@ -158,29 +158,42 @@ public static FieldDefinitionNode Build(
             DatabaseType databaseType)
         {
             InputObjectTypeDefinitionNode input = GenerateUpdateInputType(inputs, objectTypeDefinitionNode, name, root.Definitions.Where(d => d is HotChocolate.Language.IHasName).Cast<HotChocolate.Language.IHasName>(), entity, databaseType);
+            List<FieldDefinitionNode> idFields = FindPrimaryKeyFields(objectTypeDefinitionNode);
+            string description;
+            if (idFields.Count() > 1)
+            {
+                description = "One of the ids of the item being updated.";
+            }
+            else
+            {
+                description = "The ID of the item being updated.";
+            }
 
-            FieldDefinitionNode idField = FindPrimaryKeyField(objectTypeDefinitionNode);
-
-            return new(
-                location: null,
-                new NameNode($"update{FormatNameForObject(name, entity)}"),
-                new StringValueNode($"Updates a {name}"),
-                new List<InputValueDefinitionNode> {
-                new InputValueDefinitionNode(
+            List<InputValueDefinitionNode> inputValues = new();
+            foreach (FieldDefinitionNode idField in idFields)
+            {
+                inputValues.Add(new InputValueDefinitionNode(
                     location: null,
                     idField.Name,
-                    new("The ID of the item being updated"),
+                    new StringValueNode(description),
                     new NonNullTypeNode(idField.Type.NamedType()),
                     defaultValue: null,
-                    new List<DirectiveNode>()),
-                new InputValueDefinitionNode(
+                    new List<DirectiveNode>()));
+            }
+
+            inputValues.Add(new InputValueDefinitionNode(
                     location: null,
                     new NameNode(INPUT_ARGUMENT_NAME),
                     new StringValueNode($"Input representing all the fields for updating {name}"),
                     new NonNullTypeNode(new NamedTypeNode(input.Name)),
                     defaultValue: null,
-                    new List<DirectiveNode>())
-                },
+                    new List<DirectiveNode>()));
+
+            return new(
+                location: null,
+                new NameNode($"update{FormatNameForObject(name, entity)}"),
+                new StringValueNode($"Updates a {name}"),
+                inputValues,
                 new NamedTypeNode(FormatNameForObject(name, entity)),
                 new List<DirectiveNode>()
             );

DataGateway.Service.GraphQLBuilder/Queries/QueryBuilder.cs

@@ -10,7 +10,8 @@ namespace Azure.DataGateway.Service.GraphQLBuilder.Queries
     public static class QueryBuilder
     {
         public const string PAGINATION_FIELD_NAME = "items";
-        public const string PAGINATION_TOKEN_FIELD_NAME = "after";
+        public const string PAGINATION_TOKEN_FIELD_NAME = "endCursor";
+        public const string PAGINATION_TOKEN_ARGUMENT_NAME = "after";
         public const string HAS_NEXT_PAGE_FIELD_NAME = "hasNextPage";
         public const string PAGE_START_ARGUMENT_NAME = "first";
         public const string PAGINATION_OBJECT_TYPE_SUFFIX = "Connection";
@@ -48,20 +49,26 @@ public static DocumentNode Build(DocumentNode root, IDictionary<string, Entity>
 
         private static FieldDefinitionNode GenerateByPKQuery(ObjectTypeDefinitionNode objectTypeDefinitionNode, NameNode name)
         {
-            FieldDefinitionNode primaryKeyField = FindPrimaryKeyField(objectTypeDefinitionNode);
-            return new(
-                location: null,
-                new NameNode($"{FormatNameForField(name)}_by_pk"),
-                new StringValueNode($"Get a {name} from the database by its ID/primary key"),
-                new List<InputValueDefinitionNode> {
-                new InputValueDefinitionNode(
-                    location : null,
+            IEnumerable<FieldDefinitionNode> primaryKeyFields =
+                FindPrimaryKeyFields(objectTypeDefinitionNode);
+            List<InputValueDefinitionNode> inputValues = new();
+
+            foreach (FieldDefinitionNode primaryKeyField in primaryKeyFields)
+            {
+                inputValues.Add(new InputValueDefinitionNode(
+                    location: null,
                     primaryKeyField.Name,
                     description: null,
                     primaryKeyField.Type,
                     defaultValue: null,
-                    new List<DirectiveNode>())
-                },
+                    new List<DirectiveNode>()));
+            }
+
+            return new(
+                location: null,
+                new NameNode($"{FormatNameForField(name)}_by_pk"),
+                new StringValueNode($"Get a {name} from the database by its ID/primary key"),
+                inputValues,
                 new NamedTypeNode(name),
                 new List<DirectiveNode>()
             );
@@ -99,7 +106,7 @@ private static List<InputValueDefinitionNode> QueryArgumentsForField(string filt
             return new()
             {
                 new(location: null, new NameNode(PAGE_START_ARGUMENT_NAME), description: new StringValueNode("The number of items to return from the page start point"), new IntType().ToTypeNode(), defaultValue: null, new List<DirectiveNode>()),
-                new(location: null, new NameNode(PAGINATION_TOKEN_FIELD_NAME), new StringValueNode("A pagination token from a previous query to continue through a paginated list"), new StringType().ToTypeNode(), defaultValue: null, new List<DirectiveNode>()),
+                new(location: null, new NameNode(PAGINATION_TOKEN_ARGUMENT_NAME), new StringValueNode("A pagination token from a previous query to continue through a paginated list"), new StringType().ToTypeNode(), defaultValue: null, new List<DirectiveNode>()),
                 new(location: null, new NameNode(FILTER_FIELD_NAME), new StringValueNode("Filter options for query"), new NamedTypeNode(filterInputName), defaultValue: null, new List<DirectiveNode>()),
                 new(location: null, new NameNode(ODATA_FILTER_FIELD_NAME), new StringValueNode("Filter options for query expressed as OData query language"), new StringType().ToTypeNode(), defaultValue: null, new List<DirectiveNode>())
             };