Allow DateOnly to be injected and returned

Author: Kaliumhexacyanoferrat

Modules/Controllers/Extensions.cs

@@ -1,6 +1,11 @@
-using GenHTTP.Modules.Layouting.Provider;
+using System.Diagnostics.CodeAnalysis;
 
-using System.Diagnostics.CodeAnalysis;
+using GenHTTP.Api.Infrastructure;
+
+using GenHTTP.Modules.Controllers.Provider;
+using GenHTTP.Modules.Conversion.Providers;
+using GenHTTP.Modules.Layouting.Provider;
+using GenHTTP.Modules.Reflection.Injectors;
 
 namespace GenHTTP.Modules.Controllers
 {
@@ -15,9 +20,11 @@ public static class Extensions
         /// <typeparam name="T">The type of the controller used to handle requests</typeparam>
         /// <param name="builder">The layout the controller should be added to</param>
         /// <param name="path">The path that should be handled by the controller</param>
-        public static LayoutBuilder AddController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, string path) where T : new()
+        /// <param name="injectors">Optionally the injectors to be used by this controller</param>
+        /// <param name="formats">Optionally the formats to be used by this controller</param>
+        public static LayoutBuilder AddController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()
         {
-            builder.Add(path, Controller.From<T>());
+            builder.Add(path, Controller.From<T>().Configured(injectors, formats));
             return builder;
         }
 
@@ -27,9 +34,26 @@ public static class Extensions
         /// </summary>
         /// <typeparam name="T">The type of the controller used to handle requests</typeparam>
         /// <param name="builder">The layout the controller should be added to</param>
-        public static LayoutBuilder IndexController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder) where T : new()
+        /// <param name="injectors">Optionally the injectors to be used by this controller</param>
+        /// <param name="formats">Optionally the formats to be used by this controller</param>
+        public static LayoutBuilder IndexController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()
         {
-            builder.Add(Controller.From<T>());
+            builder.Add(Controller.From<T>().Configured(injectors, formats));
+            return builder;
+        }
+
+        private static ControllerBuilder<T> Configured<T>(this ControllerBuilder<T> builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()
+        {
+            if (injectors != null)
+            {
+                builder.Injectors(injectors); 
+            }
+
+            if (formats != null)
+            {
+                builder.Formats(formats);
+            }
+
             return builder;
         }
 

Modules/Controllers/Provider/ControllerHandler.cs

@@ -37,7 +37,7 @@ public ControllerHandler(IHandler parent, SerializationRegistry formats, Injecti
         {
             Parent = parent;
 
-            ResponseProvider = new(null);
+            ResponseProvider = new(formats);
 
             Provider = new(this, AnalyzeMethods(typeof(T), formats, injection));
         }

Modules/Conversion/Extensions.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Text.RegularExpressions;
 
 using GenHTTP.Api.Content;
 using GenHTTP.Api.Protocol;
@@ -10,6 +11,8 @@ namespace GenHTTP.Modules.Conversion
     public static class Extensions
     {
 
+        private static readonly Regex DATE_ONLY_PATTERN = new Regex(@"^([0-9]{4})\-([0-9]{2})\-([0-9]{2})$");
+
         /// <summary>
         /// Attempts to convert the given string value to the specified type.
         /// </summary>
@@ -54,6 +57,11 @@ public static class Extensions
                     return Guid.Parse(value);
                 }
 
+                if (actualType == typeof(DateOnly))
+                {
+                    return ParseDateOnly(value);
+                }
+
                 return Convert.ChangeType(value, actualType, CultureInfo.InvariantCulture);
             }
             catch (Exception e)
@@ -62,6 +70,22 @@ public static class Extensions
             }
         }
 
+        private static DateOnly ParseDateOnly(string input)
+        {
+            var match = DATE_ONLY_PATTERN.Match(input);
+
+            if (match.Success)
+            {
+                var year = int.Parse(match.Groups[1].Value);
+                var month = int.Parse(match.Groups[2].Value);
+                var day = int.Parse(match.Groups[3].Value);
+
+                return new DateOnly(year, month, day);
+            }
+
+            throw new ArgumentException($"Input does not match the requested format (yyyy-mm-dd): {input}");
+        }
+
     }
 
 }

Modules/Reflection/Extensions.cs

@@ -14,7 +14,8 @@ public static class Extensions
         /// <returns><c>true</c>, if the given parameter can be passed via the URL</returns>
         public static bool CheckSimple(this ParameterInfo info)
         {
-            return info.CheckNullable() || info.ParameterType.IsPrimitive || info.ParameterType == typeof(string) || info.ParameterType.IsEnum || info.ParameterType == typeof(Guid);
+            return info.CheckNullable() || info.ParameterType.IsPrimitive || info.ParameterType == typeof(string) || info.ParameterType.IsEnum 
+                || info.ParameterType == typeof(Guid) || info.ParameterType == typeof(DateOnly);
         }
 
         /// <summary>

Modules/Reflection/ResponseProvider.cs

@@ -97,6 +97,17 @@ public ResponseProvider(SerializationRegistry? serialization)
             if (Serialization is not null)
             {
                 // basic types should produce a string value
+                if (type == typeof(DateOnly))
+                {
+                    var date = (DateOnly)result;
+
+                    return request.Respond()
+                                  .Content(date.ToString("yyyy-MM-dd"))
+                                  .Type(ContentType.TextPlain)
+                                  .Adjust(adjustments)
+                                  .Build();
+                }
+
                 if (type.IsPrimitive || type == typeof(string) || type.IsEnum || type == typeof(Guid))
                 {
                     return request.Respond()

Testing/Acceptance/Modules/Controllers/DataTests.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using GenHTTP.Api.Protocol;
+using GenHTTP.Modules.Controllers;
+using GenHTTP.Modules.Conversion;
+using GenHTTP.Modules.Layouting;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace GenHTTP.Testing.Acceptance.Modules.Controllers
+{
+
+    [TestClass]
+    public sealed class DataTests
+    {
+
+        #region Controller
+
+        public class TestController
+        {
+
+            [ControllerAction(RequestMethod.POST)]
+            public DateOnly Date(DateOnly date) => date;
+
+        }
+
+        #endregion
+
+        #region Tests
+
+        [TestMethod]
+        public async Task TestDateOnly()
+        {
+            using var host = GetHost();
+
+            var request = host.GetRequest("/t/date/", HttpMethod.Post);
+
+            var data = new Dictionary<string, string>()
+            {
+                { "date", "2024-03-11" }
+            };
+
+            request.Content = new FormUrlEncodedContent(data);
+
+            using var response = await host.GetResponseAsync(request);
+
+            await response.AssertStatusAsync(HttpStatusCode.OK);
+
+            Assert.AreEqual("2024-03-11", await response.GetContentAsync());
+        }
+
+        #endregion
+
+        #region Helpers
+
+        private static TestHost GetHost()
+        {
+            var app = Layout.Create()
+                            .AddController<TestController>("t", formats: Serialization.Default());
+
+            return TestHost.Run(app);
+        }
+
+        #endregion
+
+    }
+
+}