move out AdminClient, sink error handling

Author: JWMB

LoadTester/AdminClient.cs

@@ -0,0 +1,64 @@
+using static TrainingApi.Controllers.TrainingsController;
+
+namespace LoadTester
+{
+    internal class AdminClient
+    {
+        private readonly Config config;
+
+        public record Config(Uri BaseUrl, string AuthCookie);
+        public AdminClient(Config config)
+        {
+            this.config = config;
+        }
+
+        public async Task<IEnumerable<string>> GetUsernames(string group)
+        {
+            using var client = new HttpClient();
+
+            var summaries = await GetGroupTrainings(group);
+
+            foreach (var trainingId in summaries.Where(o => o.TrainedDays > 0).Select(o => o.Id))
+            {
+                var req = new HttpRequestMessage(HttpMethod.Delete, GetUri($"trainings?id={trainingId}"));
+                AddAuth(req);
+                var response = await client.SendAsync(req);
+                response.EnsureSuccessStatusCode();
+            }
+            return summaries.Select(o => o.Username);
+
+            async Task<List<TrainingSummaryWithDaysDto>> GetGroupTrainings(string group)
+            {
+                var req = new HttpRequestMessage(HttpMethod.Get, GetUri($"Trainings/summaries?group={System.Net.WebUtility.UrlEncode(group)}"));
+                AddAuth(req);
+                var response = await client.SendAsync(req);
+                response.EnsureSuccessStatusCode();
+                var asString = await response.Content.ReadAsStringAsync();
+                List<TrainingSummaryWithDaysDto>? result;
+                try
+                {
+                    result = System.Text.Json.JsonSerializer.Deserialize<List<TrainingSummaryWithDaysDto>>(asString, new System.Text.Json.JsonSerializerOptions { PropertyNameCaseInsensitive = true }); // await response.Content.ReadFromJsonAsync<List<TrainingSummary>>();
+                }
+                catch (Exception ex)
+                {
+                    throw ex;
+                }
+                if (result == null)
+                    throw new NullReferenceException();
+
+                return result;
+            }
+
+            Uri GetUri(string path)
+            {
+                return new Uri(config.BaseUrl, path);
+            }
+            void AddAuth(HttpRequestMessage m)
+            {
+                if (!string.IsNullOrEmpty(config.AuthCookie))
+                    m.Headers.Add("Cookie", $".AspNetCore.Cookies={config.AuthCookie}");
+            }
+        }
+
+    }
+}

LoadTester/Program.cs

@@ -1,6 +1,6 @@
-using Microsoft.Extensions.Configuration;
+using LoadTester;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using static TrainingApi.Controllers.TrainingsController;
 
 var configuration = new ConfigurationBuilder()
     .AddJsonFile("appsettings.json")
@@ -9,7 +9,8 @@
 
 var serviceProvider = new ServiceCollection().AddHttpClient().BuildServiceProvider();
 
-var usernames = await GetUsernames(configuration["AdminApi:Group"]!);
+var admin = new AdminClient(configuration.GetSection("AdminApi").Get<AdminClient.Config>()!);
+var usernames = await admin.GetUsernames(configuration["AdminApi:Group"]!);
 //usernames = usernames.Take(1);
 
 var clientFactory = serviceProvider.GetRequiredService<IHttpClientFactory>();
@@ -41,52 +42,3 @@ int GetTargetDay(int index, int maxIndex)
     var frac = 1f * index / maxIndex;
     return (int)(frac * 30) + 1;
 }
-
-async Task<IEnumerable<string>> GetUsernames(string group)
-{
-    using var client = new HttpClient();
-
-    var summaries = await GetGroupTrainings(group);
-
-    foreach (var trainingId in summaries.Select(o => o.Id))
-    {
-        var req = new HttpRequestMessage(HttpMethod.Delete, GetUri($"trainings?id={trainingId}"));
-        AddAuth(req);
-        var response = await client.SendAsync(req);
-        response.EnsureSuccessStatusCode();
-    }
-    return summaries.Select(o => o.Username);
-
-    async Task<List<TrainingSummaryWithDaysDto>> GetGroupTrainings(string group)
-    {
-        var req = new HttpRequestMessage(HttpMethod.Get, GetUri($"Trainings/summaries?group={System.Net.WebUtility.UrlEncode(group)}"));
-        AddAuth(req);
-        var response = await client.SendAsync(req);
-        response.EnsureSuccessStatusCode();
-        var asString = await response.Content.ReadAsStringAsync();
-        List<TrainingSummaryWithDaysDto>? result;
-        try
-        {
-            result = System.Text.Json.JsonSerializer.Deserialize<List<TrainingSummaryWithDaysDto>>(asString, new System.Text.Json.JsonSerializerOptions { PropertyNameCaseInsensitive = true }); // await response.Content.ReadFromJsonAsync<List<TrainingSummary>>();
-        }
-        catch (Exception ex)
-        {
-            throw ex;
-        }
-        if (result == null)
-            throw new NullReferenceException();
-
-        return result;
-    }
-
-    Uri GetUri(string path)
-    {
-        return new Uri(new Uri(configuration["AdminApi:BaseUrl"]!), path);
-    }
-    void AddAuth(HttpRequestMessage m)
-    {
-        var cookie = configuration["AdminApi:AuthCookie"];
-        if (!string.IsNullOrEmpty(cookie))
-            m.Headers.Add("Cookie", $".AspNetCore.Cookies={cookie}");
-    }
-}

ProblemSource/ProblemSourceModule/ProblemSourceProcessingMiddleware.cs

@@ -276,7 +276,14 @@ public async Task<SyncResult> Sync(Training training, SyncInput root)
                     // Log incoming data - but remove large State items
                     // Warning: modifying incoming data instead of making a copy
                     root.Events = root.Events.Where(o => LogItem.GetEventClassName(o) != "UserStatePushLogItem").ToArray();
-                    await dataSink.Log(root.Uuid, root);
+                    try
+                    {
+                        await dataSink.Log(root.Uuid, root);
+                    }
+                    catch (Exception ex)
+                    {
+                        log.LogError(ex, $"Uuid: {root.Uuid} Sink size: {JsonConvert.SerializeObject(root).Length}");
+                    }
 
                     var errorLogItems = logItems.OfType<ErrorLogItem>().ToList();
                     if (errorLogItems.Any())