fix controller names with split of api and mvc

dpvreony · Aug 31, 2023 · 0790a19 · 0790a19
1 parent 47effbc
commit 0790a19
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Whipstaff.AspNetCore" Version="6.1.116" />
-    <PackageReference Include="Whipstaff.Wpf" Version="6.1.116" />
-    <PackageReference Include="Whipstaff.Wpf.Mahapps" Version="6.1.116" />
+    <PackageReference Include="Whipstaff.AspNetCore" Version="6.1.120" />
+    <PackageReference Include="Whipstaff.Wpf" Version="6.1.120" />
+    <PackageReference Include="Whipstaff.Wpf.Mahapps" Version="6.1.120" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
   </ItemGroup>
 

diff --git a/src/Dhgms.Nucleotide.Generators/Features/Mvc/MvcControllerGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/Mvc/MvcControllerGeneratorProcessor.cs
@@ -50,7 +50,7 @@ protected override IList<string> GetUsings()
         protected override string GetBaseClass(IEntityGenerationModel entityGenerationModel)
         {
             var entityName = entityGenerationModel.ClassName;
-            return $"global::Whipstaff.AspNetCore.QueryOnlyController<Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto, LoggerMessageActions.{entityName}LoggerMessageActions>";
+            return $"global::Whipstaff.AspNetCore.QueryOnlyMvcController<Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto, LoggerMessageActions.{entityName}LoggerMessageActions>";
         }
 
         protected override IEnumerable<string> GetImplementedInterfaces(IEntityGenerationModel entityGenerationModel)
@@ -113,7 +113,6 @@ protected override IList<Tuple<string, IList<string>>> GetClassAttributes(IEntit
             {
                 new Tuple<string, IList<string>>("Microsoft.AspNetCore.Mvc.AutoValidateAntiforgeryToken", null),
                 new Tuple<string, IList<string>>("Microsoft.AspNetCore.Authorization.Authorize", null),
-                new Tuple<string, IList<string>>("Microsoft.AspNetCore.Mvc.Route", new[]{ $"\"{entityDeclaration.ClassName}\"" })
             };
         }
 

diff --git a/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs b/src/Dhgms.Nucleotide.Generators/Features/WebApi/WebApiServiceGeneratorProcessor.cs
@@ -47,7 +47,7 @@ protected override IList<string> GetUsings()
         protected override string GetBaseClass(IEntityGenerationModel entityGenerationModel)
         {
             var entityName = entityGenerationModel.ClassName;
-            return $"global::Whipstaff.AspNetCore.CrudController<Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto, Commands.IAdd{entityName}Command, RequestDtos.Add{entityName}RequestDto, ResponseDtos.Add{entityName}ResponseDto, Commands.IDelete{entityName}Command, ResponseDtos.Delete{entityName}ResponseDto, Commands.IUpdate{entityName}Command, RequestDtos.Update{entityName}RequestDto, ResponseDtos.Update{entityName}ResponseDto, LoggerMessageActions.{entityName}LoggerMessageActions>";
+            return $"global::Whipstaff.AspNetCore.CrudApiController<Queries.IList{entityName}Query, RequestDtos.List{entityName}RequestDto, ResponseDtos.List{entityName}ResponseDto, Queries.IView{entityName}Query, ResponseDtos.View{entityName}ResponseDto, Commands.IAdd{entityName}Command, RequestDtos.Add{entityName}RequestDto, ResponseDtos.Add{entityName}ResponseDto, Commands.IDelete{entityName}Command, ResponseDtos.Delete{entityName}ResponseDto, Commands.IUpdate{entityName}Command, RequestDtos.Update{entityName}RequestDto, ResponseDtos.Update{entityName}ResponseDto, LoggerMessageActions.{entityName}LoggerMessageActions>";
         }
 
         protected override IEnumerable<string> GetImplementedInterfaces(IEntityGenerationModel entityGenerationModel)
@@ -111,7 +111,6 @@ protected override IList<Tuple<string, IList<string>>> GetClassAttributes(IEntit
             return new List<Tuple<string, IList<string>>>
             {
                 new Tuple<string, IList<string>>("Microsoft.AspNetCore.Authorization.Authorize", null),
-                new Tuple<string, IList<string>>("Microsoft.AspNetCore.Mvc.Route", new[]{ $"\"api/{entityDeclaration.ClassName.ToLower()}\"" })
             };
         }