Make subcategory parameter optional (will work if only one category exists)

Author: Andrii Bondarchuk

src/FitSyncHub.Functions/Functions/ZwiftEventRidersCompetitionMetricsHttpTriggerFunction.cs

@@ -20,22 +20,21 @@ public async Task<IActionResult> Run(
         [HttpTrigger(AuthorizationLevel.Function, "get", Route = "zwift-event-competition-metrics")] HttpRequest req,
         CancellationToken cancellationToken)
     {
-        string? zwiftEventUrl = req.Query["eventUrl"];
+        string? eventUrl = req.Query["eventUrl"];
         string? subcategory = req.Query["subcategory"];
 
-        if (string.IsNullOrWhiteSpace(zwiftEventUrl)
-            || string.IsNullOrWhiteSpace(subcategory))
+        if (string.IsNullOrWhiteSpace(eventUrl))
         {
-            return new BadRequestObjectResult("wrong request");
+            return new BadRequestObjectResult($"Specify params: {nameof(eventUrl)}");
         }
 
-        if (!Uri.TryCreate(zwiftEventUrl, UriKind.Absolute, out _))
+        if (!Uri.TryCreate(eventUrl, UriKind.Absolute, out _))
         {
-            return new BadRequestObjectResult("wrong url");
+            return new BadRequestObjectResult($"Wrong '{nameof(eventUrl)}' url");
         }
 
         var entrants = await _zwiftEventsService
-            .GetEntrants(zwiftEventUrl, subcategory, includeMyself: true, cancellationToken);
+            .GetEntrants(eventUrl, subcategory, includeMyself: true, cancellationToken);
 
         var result = await GetRidersCompetitionMetrics(entrants, cancellationToken);
         result = [.. result.OrderByDescending(x => x.RacingScore)];

src/FitSyncHub.Functions/Functions/ZwiftEventVELORatingHttpTriggerFunction.cs

@@ -29,23 +29,22 @@ public async Task<IActionResult> Run(
         CancellationToken cancellationToken)
     {
         string? cookie = req.Query["cookie"];
-        string? zwiftEventUrl = req.Query["eventUrl"];
+        string? eventUrl = req.Query["eventUrl"];
         string? subcategory = req.Query["subcategory"];
 
         if (string.IsNullOrWhiteSpace(cookie)
-            || string.IsNullOrWhiteSpace(zwiftEventUrl)
-            || string.IsNullOrWhiteSpace(subcategory))
+            || string.IsNullOrWhiteSpace(eventUrl))
         {
-            return new BadRequestObjectResult("wrong request");
+            return new BadRequestObjectResult($"Specify params: {nameof(cookie)}, {nameof(eventUrl)}");
         }
 
-        if (!Uri.TryCreate(zwiftEventUrl, UriKind.Absolute, out _))
+        if (!Uri.TryCreate(eventUrl, UriKind.Absolute, out _))
         {
-            return new BadRequestObjectResult("wrong url");
+            return new BadRequestObjectResult($"Wrong '{nameof(eventUrl)}' url");
         }
 
         var entrants = await _zwiftEventsService
-            .GetEntrants(zwiftEventUrl, subcategory, includeMyself: true, cancellationToken);
+            .GetEntrants(eventUrl, subcategory, includeMyself: true, cancellationToken);
 
         var result = await GetEntrantsVELO(entrants, cancellationToken);
         result = [.. result.OrderByDescending(x => x.MaxVELO)];

src/FitSyncHub.Functions/Program.cs

@@ -29,6 +29,8 @@
     nameof(MacroNutrientsCalculatorHttpTriggerFunction),
     nameof(LactateSyncHttpTriggerFunction),
     nameof(XertWorkoutToIntervalsICUExporterHttpTriggerFunction),
+    nameof(ZwiftEventRidersCompetitionMetricsHttpTriggerFunction),
+    nameof(ZwiftEventVELORatingHttpTriggerFunction),
 ];
 
 var builder = FunctionsApplication.CreateBuilder(args);

src/FitSyncHub.Zwift/Services/ZwiftEventsService.cs

@@ -43,22 +43,26 @@ public async Task<ZwiftPlayerCompetitionMetrics> GetCompetitionMetrics(
 
     public Task<IReadOnlyCollection<ZwiftEntrantResponseModel>> GetEntrants(
         string zwiftEventUrl,
-        string subgroupLabel,
+        string? subgroupLabel,
         CancellationToken cancellationToken)
     {
         return GetEntrants(zwiftEventUrl, subgroupLabel, includeMyself: false, cancellationToken);
     }
 
-
     public async Task<IReadOnlyCollection<ZwiftEntrantResponseModel>> GetEntrants(
         string zwiftEventUrl,
-        string subgroupLabel,
+        string? subgroupLabel,
         bool includeMyself,
         CancellationToken cancellationToken)
     {
         var zwiftEvent = await _zwiftHttpClient.GetEventFromZwfitEventViewUrl(zwiftEventUrl, cancellationToken);
-        var eventSubgroupId = zwiftEvent.EventSubgroups
-            .Single(x => x.SubgroupLabel == subgroupLabel).Id;
+
+        var eventSubgroupId = (string.IsNullOrWhiteSpace(subgroupLabel), zwiftEvent.EventSubgroups) switch
+        {
+            (true, { Length: 1 }) => zwiftEvent.EventSubgroups.Single().Id,
+            (false, { Length: >= 1 }) => zwiftEvent.EventSubgroups.Single(x => x.SubgroupLabel == subgroupLabel).Id,
+            _ => throw new InvalidDataException("Can not map subgroupLabel to eventSubgroup")
+        };
 
         var entrants = await _zwiftHttpClient
             .GetEventSubgroupEntrants(eventSubgroupId, cancellationToken: cancellationToken);