move initialize using query parameters convention to rich transient f…

…eature
mouseless · Oct 24, 2024 · bf48f63 · bf48f63
1 parent 427226e
commit bf48f63
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/...Recipe.Service.Application/CodingStyle/CommandPattern/CommandPatternCodingStyleFeature.cs b/...Recipe.Service.Application/CodingStyle/CommandPattern/CommandPatternCodingStyleFeature.cs
@@ -36,7 +36,6 @@ public void Configure(LayerConfigurator configurator)
 
         configurator.ConfigureApiModelConventions(conventions =>
         {
-            conventions.Add(new InitializeUsingQueryParametersConvention(), order: -10);
             conventions.Add(new IncludeClassDocsForActionNamesConvention(_methodNames), order: -10);
             conventions.Add(new UseClassNameInsteadOfActionNamesConvention(_methodNames), order: -10);
             conventions.Add(new RemoveFromRouteConvention(_methodNames));

diff --git a/...TargetRichTransientFromRouteConvention.cs → ...t/InitializeUsingIdParameterConvention.cs b/...TargetRichTransientFromRouteConvention.cs → ...t/InitializeUsingIdParameterConvention.cs
@@ -6,7 +6,7 @@
 
 namespace Baked.CodingStyle.RichTransient;
 
-public class TargetRichTransientFromRouteConvention(DomainModel _domain)
+public class InitializeUsingIdParameterConvention(DomainModel _domain)
     : IApiModelConvention<ActionModelContext>
 {
     public void Apply(ActionModelContext context)
@@ -30,9 +30,12 @@ public void Apply(ActionModelContext context)
                 RoutePosition = 1
             };
 
+        var targetParameter = context.Action.Parameter["target"];
+        targetParameter.Name = "newTarget";
+        targetParameter.Type = $"Func<{targetParameter.Type}>";
+
         context.Action.RouteParts.RemoveAt(0);
         context.Action.RouteParts.Insert(0, context.Controller.MappedType.Name.Pluralize());
-
         context.Action.FindTargetStatement = $"newTarget().{initializer.Name}({initializer.DefaultOverload.Parameters.Select(p => $"@{p.Name}").Join(", ")})";
     }
 }
diff --git a/...itializeUsingQueryParametersConvention.cs → ...itializeUsingQueryParametersConvention.cs b/...itializeUsingQueryParametersConvention.cs → ...itializeUsingQueryParametersConvention.cs
@@ -2,14 +2,15 @@
 using Baked.RestApi.Configuration;
 using Baked.RestApi.Model;
 
-namespace Baked.CodingStyle.CommandPattern;
+namespace Baked.CodingStyle.RichTransient;
 
 public class InitializeUsingQueryParametersConvention : IApiModelConvention<ActionModelContext>
 {
     public void Apply(ActionModelContext context)
     {
         if (!context.Controller.MappedType.TryGetMembers(out var members)) { return; }
-        if (!members.Has<PubliclyInitializableAttribute>()) { return; }
+        if (members.Has<LocatableAttribute>()) { return; }
+        if (!members.Methods.Having<InitializerAttribute>().Any()) { return; }
 
         var initializer = members.Methods.Having<InitializerAttribute>().Single();
         foreach (var parameter in initializer.DefaultOverload.Parameters)

diff --git a/...d.Recipe.Service.Application/CodingStyle/RichTransient/RichTransientCodingStyleFeature.cs b/...d.Recipe.Service.Application/CodingStyle/RichTransient/RichTransientCodingStyleFeature.cs
@@ -45,7 +45,8 @@ public void Configure(LayerConfigurator configurator)
         {
             var domainModel = configurator.Context.GetDomainModel();
 
-            conventions.Add(new TargetRichTransientFromRouteConvention(domainModel));
+            conventions.Add(new InitializeUsingQueryParametersConvention(), order: -10);
+            conventions.Add(new InitializeUsingIdParameterConvention(domainModel));
             conventions.Add(new RichTransientInitializerIsGetResourceConvention(domainModel));
         });
     }

diff --git a/....Application/CodingStyle/RichTransient/RichTransientInitializerIsGetResourceConvention.cs b/....Application/CodingStyle/RichTransient/RichTransientInitializerIsGetResourceConvention.cs
@@ -22,6 +22,10 @@ public void Apply(ActionModelContext context)
         parameter.From = RestApi.Model.ParameterModelFrom.Route;
         parameter.RoutePosition = 1;
 
+        var targetParameter = context.Action.Parameter["target"];
+        targetParameter.Name = "newTarget";
+        targetParameter.Type = $"Func<{targetParameter.Type}>";
+
         context.Action.Method = HttpMethod.Get;
         context.Action.RouteParts = [context.Controller.MappedType.Name.Pluralize()];
         context.Action.FindTargetStatement = "newTarget()";