Use string filter for status/health to simplify API

Author: webprofusion-chrisc

src/Certify.Server/Certify.Server.Hub.Api.Client/Certify.Server.Hub.Api.Client.cs

@@ -1,4 +1,4 @@
-//----------------------
+//----------------------
 // <auto-generated>
 //     Generated using the NSwag toolchain v14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
 // </auto-generated>
@@ -12,7 +12,7 @@
 using Certify.Models.Hub;
 using Certify.Models.Config.Migration;
 using Certify.Shared;
-using ProblemDetails = Certify.Models.Util.ProblemDetails;
+using ProblemDetails=Certify.Models.Util.ProblemDetails;
 
 #pragma warning disable 108 // Disable "CS0108 '{derivedDto}.ToJson()' hides inherited member '{dtoBase}.ToJson()'. Use the new keyword if hiding was intended."
 #pragma warning disable 114 // Disable "CS0114 '{derivedDto}.RaisePropertyChanged(String)' hides inherited member 'dtoBase.RaisePropertyChanged(String)'. To make the current member override that implementation, add the override keyword. Otherwise add the new keyword."
@@ -35,19 +35,19 @@ namespace Certify.Server.Hub.Api
     using System = global::System;
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
-    public partial class Client
+    public partial class Client 
     {
-#pragma warning disable 8618
+        #pragma warning disable 8618
         private string _baseUrl;
-#pragma warning restore 8618
+        #pragma warning restore 8618
 
         private System.Net.Http.HttpClient _httpClient;
         private static System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings, true);
         private Newtonsoft.Json.JsonSerializerSettings _instanceSettings;
 
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public Client(string baseUrl, System.Net.Http.HttpClient httpClient)
-#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
+    #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         {
             BaseUrl = baseUrl;
             _httpClient = httpClient;
@@ -3634,7 +3634,7 @@ public virtual async System.Threading.Tasks.Task<ActionResult> RemoveAcmeAccount
         /// </summary>
         /// <returns>OK</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual System.Threading.Tasks.Task<ManagedCertificateSummaryResult> GetHubManagedItemsAsync(string instanceId, string keyword, ManagedCertificateHealth? health, int? page, int? pageSize)
+        public virtual System.Threading.Tasks.Task<ManagedCertificateSummaryResult> GetHubManagedItemsAsync(string instanceId, string keyword, string health, int? page, int? pageSize)
         {
             return GetHubManagedItemsAsync(instanceId, keyword, health, page, pageSize, System.Threading.CancellationToken.None);
         }
@@ -3645,7 +3645,7 @@ public virtual System.Threading.Tasks.Task<ManagedCertificateSummaryResult> GetH
         /// </summary>
         /// <returns>OK</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<ManagedCertificateSummaryResult> GetHubManagedItemsAsync(string instanceId, string keyword, ManagedCertificateHealth? health, int? page, int? pageSize, System.Threading.CancellationToken cancellationToken)
+        public virtual async System.Threading.Tasks.Task<ManagedCertificateSummaryResult> GetHubManagedItemsAsync(string instanceId, string keyword, string health, int? page, int? pageSize, System.Threading.CancellationToken cancellationToken)
         {
             var client_ = _httpClient;
             var disposeClient_ = false;
@@ -6716,7 +6716,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu
                     var field = System.Reflection.IntrospectionExtensions.GetTypeInfo(value.GetType()).GetDeclaredField(name);
                     if (field != null)
                     {
-                        var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field, typeof(System.Runtime.Serialization.EnumMemberAttribute))
+                        var attribute = System.Reflection.CustomAttributeExtensions.GetCustomAttribute(field, typeof(System.Runtime.Serialization.EnumMemberAttribute)) 
                             as System.Runtime.Serialization.EnumMemberAttribute;
                         if (attribute != null)
                         {
@@ -6728,13 +6728,13 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu
                     return converted == null ? string.Empty : converted;
                 }
             }
-            else if (value is bool)
+            else if (value is bool) 
             {
                 return System.Convert.ToString((bool)value, cultureInfo).ToLowerInvariant();
             }
             else if (value is byte[])
             {
-                return System.Convert.ToBase64String((byte[])value);
+                return System.Convert.ToBase64String((byte[]) value);
             }
             else if (value is string[])
             {
@@ -6756,7 +6756,7 @@ private string ConvertToString(object value, System.Globalization.CultureInfo cu
         }
     }
 
-
+    
 
     [System.CodeDom.Compiler.GeneratedCode("NSwag", "14.4.0.0 (NJsonSchema v11.3.2.0 (Newtonsoft.Json v13.0.0.0))")]
     public partial class FileResponse : System.IDisposable
@@ -6844,4 +6844,4 @@ public ApiException(string message, int statusCode, string response, System.Coll
 #pragma warning restore 8602
 #pragma warning restore 8603
 #pragma warning restore 8604
-#pragma warning restore 8625
+#pragma warning restore 8625

src/Certify.Server/Certify.Server.Hub.Api/Controllers/internal/HubController.cs

@@ -51,7 +51,7 @@ public HubController(ILogger<CertificateController> logger, ICertifyInternalApiC
         [Route("items")]
         [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
         [ProducesResponseType(StatusCodes.Status200OK, Type = typeof(ManagedCertificateSummaryResult))]
-        public async Task<IActionResult> GetHubManagedItems(string? instanceId, string? keyword, Models.ManagedCertificateHealth? health = null, int? page = null, int? pageSize = null)
+        public async Task<IActionResult> GetHubManagedItems(string? instanceId, string? keyword, string? health = null, int? page = null, int? pageSize = null)
         {
             var result = new ManagedCertificateSummaryResult();
 
@@ -60,14 +60,24 @@ public async Task<IActionResult> GetHubManagedItems(string? instanceId, string?
 
             var list = new List<ManagedCertificateSummary>();
 
+            ManagedCertificateHealth? healthFilter = null;
+
+            if (!string.IsNullOrEmpty(health))
+            {
+                if (Enum.TryParse(health, true, out ManagedCertificateHealth healthValue))
+                {
+                    healthFilter = healthValue;
+                }
+            }
+
             foreach (var remote in managedItems.Values)
             {
                 if (string.IsNullOrEmpty(instanceId) || (instanceId == remote.InstanceId))
                 {
                     list.AddRange(
                         remote.Items
                         .Where(i => string.IsNullOrWhiteSpace(keyword) || (!string.IsNullOrWhiteSpace(keyword) && i.Name?.Contains(keyword, StringComparison.InvariantCultureIgnoreCase) == true))
-                        .Where(i => health == null || (health != null && i.Health == health))
+                        .Where(i => healthFilter == null || (healthFilter != null && i.Health == healthFilter))
                         .Select(i =>
                         {
                             var instance = instances.FirstOrDefault(i => i.InstanceId == remote.InstanceId);