From e81a726e33fbee1483b2ed4dca86786d1581b48a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 17:44:36 +0100
Subject: [PATCH] Update all whipstaff dependencies to v6.1.116 (#388)

* Update all whipstaff dependencies to v6.1.116

* fix controller names with split of api and mvc

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Vreony <dpvreony@users.noreply.github.com>
---
 .../Dhgms.Nucleotide.SampleApp.csproj                       | 6 +++---
 .../Features/Mvc/MvcControllerGeneratorProcessor.cs         | 3 +--
 .../Features/WebApi/WebApiServiceGeneratorProcessor.cs      | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj b/src/Dhgms.Nucleotide.GenerationTests/Dhgms.Nucleotide.SampleApp.csproj
index f74bc1bd..19466c34 100644
--- 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.83" />
-    <PackageReference Include="Whipstaff.Wpf" Version="6.1.83" />
-    <PackageReference Include="Whipstaff.Wpf.Mahapps" Version="6.1.83" />
+    <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
index 723778a6..7208d185 100644
--- 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 string[] GetClassLevelCommentRemarks(string entityName)
             {
                 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
index a47c23dd..294dfcc7 100644
--- 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 string[] GetClassLevelCommentRemarks(string entityName)
             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()}\"" })
             };
         }