Update GraphQL schema and service

Author: srnichols

management-portal/dab/schema.graphql

@@ -11,6 +11,18 @@ type Tenant {
   createdAt: String
 }
 
+input Tenant_input {
+  id: ID
+  tenantId: String
+  name: String
+  domain: String
+  tier: String
+  status: String
+  displayName: String
+  cellId: String
+  createdAt: String
+}
+
 type Cell {
   id: ID!
   name: String
@@ -21,6 +33,38 @@ type Cell {
   capacityUsed: Int!
 }
 
+extend type Query {
+  tenants: [Tenant]
+  tenant(id: ID!): Tenant
+  cells: [Cell]
+  cell(id: ID!): Cell
+  operations: [Operation]
+  operation(id: ID!): Operation
+}
+
+extend type Mutation {
+  createTenant(item: Tenant_input!): Tenant
+  updateTenant(id: ID!, item: Tenant_input!): Tenant
+  deleteTenant(id: ID!): Boolean
+  createCell(item: Cell_input!): Cell
+  updateCell(id: ID!, item: Cell_input!): Cell
+  deleteCell(id: ID!): Boolean
+  createOperation(item: Operation_input!): Operation
+  updateOperation(id: ID!, item: Operation_input!): Operation
+  deleteOperation(id: ID!): Boolean
+}
+
+input Cell_input {
+  id: ID
+  cellId: String
+  name: String
+  region: String
+  availabilityZone: String
+  status: String
+  capacityTotal: Int
+  capacityUsed: Int
+}
+
 type Operation {
   id: ID!
   tenantId: String
@@ -31,3 +75,13 @@ type Operation {
   timestamp: String
   details: String
 }
+
+input Operation_input {
+  id: ID
+  tenantId: String
+  type: String
+  status: String
+  createdAt: String
+  timestamp: String
+  details: String
+}

management-portal/docs/plan.md

@@ -0,0 +1,16 @@
+# Plan to Resolve DAB GraphQL Query Failures
+
+## Overview
+This plan addresses the issue of GraphQL queries failing to retrieve data from Cosmos DB via Data API Builder (DAB) in the management-portal project. It breaks down the diagnosis and resolution into actionable steps.
+
+## Todo List
+- [ ] Verify DAB container health and logs for crash loops or startup errors using Azure CLI commands.
+- [ ] Compare GraphQL schema (schema.graphql) with Cosmos DB container structures for mismatches.
+- [ ] Test sample GraphQL queries directly against DAB endpoint to reproduce retrieval failures.
+- [ ] Analyze error handling in GraphQLDataService.cs and add logging for detailed failure insights.
+- [ ] Review Bicep deployment (management-portal.bicep) for configuration issues like ports or secrets.
+- [ ] Implement fixes, such as updating schema or deployment settings, and redeploy.
+- [ ] Validate end-to-end data retrieval in the portal UI after fixes.
+
+## Next Steps
+Once approved, switch to debug mode to execute these steps.

management-portal/src/Portal/Services/GraphQLDataService.cs

@@ -2,13 +2,15 @@
 using System.Text;
 using System.Text.Json;
 using Stamps.ManagementPortal.Models;
+using Microsoft.Extensions.Logging;
 
 namespace Stamps.ManagementPortal.Services;
 
-public class GraphQLDataService(IHttpClientFactory httpClientFactory, IConfiguration config) : IDataService
+public class GraphQLDataService(IHttpClientFactory httpClientFactory, IConfiguration config, ILogger<GraphQLDataService> logger) : IDataService
 {
     private readonly IHttpClientFactory _httpClientFactory = httpClientFactory;
     private readonly IConfiguration _config = config;
+    private readonly ILogger<GraphQLDataService> _logger = logger;
 
     private HttpClient Client => _httpClientFactory.CreateClient("GraphQL");
 
@@ -110,49 +112,71 @@ public async Task DeleteOperationAsync(string id, string partitionKey, Cancellat
 
     private async Task<IReadOnlyList<T>> QueryAsync<T>(string query, string rootField, CancellationToken ct)
     {
+        _logger.LogInformation("Executing GraphQL query: {Query}", query);
         var payload = new { query };
         using var req = new HttpRequestMessage(HttpMethod.Post, "")
         {
             Content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json")
         };
-        using var res = await Client.SendAsync(req, ct);
-        res.EnsureSuccessStatusCode();
-        using var stream = await res.Content.ReadAsStreamAsync(ct);
-        using var doc = await JsonDocument.ParseAsync(stream, cancellationToken: ct);
-        // If GraphQL returned errors, surface them clearly
-        if (doc.RootElement.TryGetProperty("errors", out var errs) && errs.ValueKind == JsonValueKind.Array && errs.GetArrayLength() > 0)
+        try
         {
-            throw new HttpRequestException($"GraphQL errors: {errs}");
+            using var res = await Client.SendAsync(req, ct);
+            res.EnsureSuccessStatusCode();
+            var responseContent = await res.Content.ReadAsStringAsync(ct);
+            _logger.LogDebug("GraphQL response: {Response}", responseContent);
+            using var doc = JsonDocument.Parse(responseContent);
+            // If GraphQL returned errors, surface them clearly
+            if (doc.RootElement.TryGetProperty("errors", out var errs) && errs.ValueKind == JsonValueKind.Array && errs.GetArrayLength() > 0)
+            {
+                _logger.LogError("GraphQL errors: {Errors}", errs.ToString());
+                throw new HttpRequestException($"GraphQL errors: {errs}");
+            }
+            var data = doc.RootElement.GetProperty("data").GetProperty(rootField);
+            var list = new List<T>();
+            foreach (var el in data.EnumerateArray())
+            {
+                var obj = el.Deserialize<T>(new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+                if (obj is not null) list.Add(obj);
+            }
+            return list;
         }
-        var data = doc.RootElement.GetProperty("data").GetProperty(rootField);
-        var list = new List<T>();
-        foreach (var el in data.EnumerateArray())
+        catch (Exception ex)
         {
-            var obj = el.Deserialize<T>(new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-            if (obj is not null) list.Add(obj);
+            _logger.LogError(ex, "Error executing GraphQL query: {Query}", query);
+            throw;
         }
-        return list;
     }
 
     private async Task<T> MutationAsync<T>(string query, object variables, string rootField, CancellationToken ct)
     {
+        _logger.LogInformation("Executing GraphQL mutation: {Query} with variables {Variables}", query, JsonSerializer.Serialize(variables));
         var payload = new { query, variables };
         using var req = new HttpRequestMessage(HttpMethod.Post, "")
         {
             Content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json")
         };
-        using var res = await Client.SendAsync(req, ct);
-        res.EnsureSuccessStatusCode();
-        using var stream = await res.Content.ReadAsStreamAsync(ct);
-        using var doc = await JsonDocument.ParseAsync(stream, cancellationToken: ct);
-        if (doc.RootElement.TryGetProperty("errors", out var errs) && errs.ValueKind == JsonValueKind.Array && errs.GetArrayLength() > 0)
+        try
+        {
+            using var res = await Client.SendAsync(req, ct);
+            res.EnsureSuccessStatusCode();
+            var responseContent = await res.Content.ReadAsStringAsync(ct);
+            _logger.LogDebug("GraphQL mutation response: {Response}", responseContent);
+            using var doc = JsonDocument.Parse(responseContent);
+            if (doc.RootElement.TryGetProperty("errors", out var errs) && errs.ValueKind == JsonValueKind.Array && errs.GetArrayLength() > 0)
+            {
+                _logger.LogError("GraphQL mutation errors: {Errors}", errs.ToString());
+                throw new HttpRequestException($"GraphQL errors: {errs}");
+            }
+            var data = doc.RootElement.GetProperty("data").GetProperty(rootField);
+            if (typeof(T) == typeof(object)) return default!;
+            var result = data.Deserialize<T>(new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+            return result!;
+        }
+        catch (Exception ex)
         {
-            throw new HttpRequestException($"GraphQL errors: {errs}");
+            _logger.LogError(ex, "Error executing GraphQL mutation: {Query}", query);
+            throw;
         }
-        var data = doc.RootElement.GetProperty("data").GetProperty(rootField);
-        if (typeof(T) == typeof(object)) return default!;
-        var result = data.Deserialize<T>(new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
-        return result!;
     }
 
     public async Task<bool> ReserveDomainAsync(string domain, string ownerTenantId, CancellationToken ct = default)