Gimme 1.0.5

reggiepangilinan · May 12, 2019 · 676411c · 676411c
1 parent 395183c
commit 676411c
Show file tree

Hide file tree

Showing 13 changed files with 167 additions and 51 deletions.
diff --git a/src/gimme/Commands/ApiController.cs b/src/gimme/Commands/ApiController.cs
@@ -35,16 +35,19 @@ public void OnExecute()
                                                 "Controllers"
                                                );
             var controllerCs = $"{ControllerName}.cs";
-            var appnamespace = $"{GimmeConfiguration.WebApiProjectName.Replace("\\",".")}.Controllers";
+            var controllernamespace = $"{GimmeConfiguration.WebApiProjectName.Replace("\\",".")}.Controllers";
+            var appnamespace = $"{GimmeConfiguration.ApplicationProjectName.Replace("\\", ".")}";
+
             var controllerFile = Path.Combine(apiDirectory, controllerCs);
 
             if (!filesService.DirectoryExists(apiDirectory))
                 filesService.CreateDirectory(apiDirectory);
 
             filesService.WriteAllTextToFile(controllerFile,
                   ResourceUtil.GetResourceText("Api_Controller")
-                  .Replace("{{namespace}}", appnamespace)
-                              .Replace("{{name}}", ControllerName)
+                  .Replace("{{namespace}}", controllernamespace)
+                  .Replace("{{appnamespace}}", appnamespace)
+                  .Replace("{{name}}", ControllerName)
                  );
 
             ConsoleUtil.SuccessMessage($"Mediator Controller succesfully generated!");

diff --git a/src/gimme/Commands/WebApiStarter/Command.Step03.Scaffold.cs b/src/gimme/Commands/WebApiStarter/Command.Step03.Scaffold.cs
@@ -35,6 +35,12 @@ private void Step03_Scaffold()
             filesService.WriteAllTextToFile(recordNotFoundException,
                               ResourceUtil.GetResourceText("WAS_App_RecordNotFoundException").Replace("{{solutionname}}", variable.SolutionName));
 
+            ConsoleUtil.HiglightedMessage($"Creating Application Response {variable.CSPROJ_ApplicationProjectFile}");
+
+            var responseClasses = Path.Combine(ApplicationPath, "Response.cs");
+            filesService.WriteAllTextToFile(responseClasses,
+                              ResourceUtil.GetResourceText("WAS_App_Response").Replace("{{solutionname}}", variable.SolutionName));
+
             ///
             ConsoleUtil.HiglightedMessage($"Creating Web Api Controllers and Filters {variable.CSPROJ_WebApiProjectFile}");
             var WebApiPath = Path.Combine(variable.SolutionBasePath, variable.ApiProjectName);

diff --git a/src/gimme/Commands/WebApiStarter/Command.Step04.Nuget.cs b/src/gimme/Commands/WebApiStarter/Command.Step04.Nuget.cs
@@ -32,8 +32,8 @@ private void Step04_ConfigureNugetReference()
             ConsoleUtil.HiglightedMessage($"Add package reference to {variable.CSPROJ_ApplicationUnitTestProjectFile}");
             Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package Microsoft.EntityFrameworkCore.InMemory"));
             Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package Moq"));
-            Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package nunit -f netcoreapp2.2"));
-            Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package NUnit3TestAdapter -f netcoreapp2.2"));
+            Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package xunit -f netcoreapp2.2"));
+            Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package xunit.runner.visualstudio -f netcoreapp2.2"));
             Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package Microsoft.NET.Test.Sdk -f netcoreapp2.2"));
             Console.WriteLine(shellService.Exec($"dotnet add {variable.CSPROJ_ApplicationUnitTestProjectFile} package AutoMapper"));
 

diff --git a/src/gimme/Commands/WebApiStarter/Command.cs b/src/gimme/Commands/WebApiStarter/Command.cs
@@ -1,5 +1,6 @@
 using gimme.Services.Files;
 using gimme.Shell.Services;
+using gimme.Utils;
 using McMaster.Extensions.CommandLineUtils;
 using System;
 using System.ComponentModel.DataAnnotations;
@@ -37,6 +38,7 @@ public void OnExecute()
             Step02_CreateProjects();
             Step03_Scaffold();
             Step04_ConfigureNugetReference();
+            ConsoleUtil.SuccessMessage($"Done! ^_^");
         }
     }
 }
diff --git a/src/gimme/Properties/Resources.Designer.cs b/src/gimme/Properties/Resources.Designer.cs
diff --git a/src/gimme/Properties/Resources.resx b/src/gimme/Properties/Resources.resx
@@ -181,16 +181,19 @@
   <data name="WAS_App_RecordNotFoundException" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\was_app_recordnotfoundexception.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
+  <data name="WAS_App_Response" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\was_app_response.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
   <data name="WAS_Domain_BaseEntity" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\was_domain_baseentity.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="WAS_GitIgnore" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\was_gitignore.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="WAS_Persistence_DbContext" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\was_Persistence_dbcontext.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\resources\was_persistence_dbcontext.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
   <data name="WAS_Persistence_DbContextFactory" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\was_Persistence_dbcontextfactory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+    <value>..\resources\was_persistence_dbcontextfactory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
 </root>
diff --git a/src/gimme/Resources/Api_Controller.txt b/src/gimme/Resources/Api_Controller.txt
@@ -2,19 +2,26 @@ using System.ComponentModel;
 using System.Net;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using Commands = {{appnamespace}}.YourApplicationGroupHere.Commands;
+using Models = {{appnamespace}}.YourApplicationGroupHere.Models;
+using Queries = {{appnamespace}}.YourApplicationGroupHere.Queries;
 
 namespace {{namespace}}
 {
-   [Route ("api/[controller]")]
+    [Route ("api/[controller]")]
     public class {{name}} : MediatorController {
+
         [HttpGet]
-        [DescriptionAttribute ("Your endpoint description goes here.")]
-        [ProducesResponseType (typeof (YourReturnType), (int) HttpStatusCode.OK)]
-        public async Task<IActionResult> Get()
+        [Description("Your endpoint description goes here.")]
+        public async Task<ActionResult<Models.YourModelHere>> Get()
         {
             //TODO: Implement Realistic Implementation
-            await Mediator.Send (new YourCommandOrQueryHere() {});
-            return Ok();
+            var result = await Mediator.Send (new YourCommandOrQueryHere() {});
+
+			if(result == null)
+				return NotFound();
+
+            return Ok(result);
         }
     }
 }
diff --git a/src/gimme/Resources/App_Command.txt b/src/gimme/Resources/App_Command.txt
@@ -11,20 +11,20 @@ namespace {{namespace}}
     /// Command
     /// </summary>
     [JsonSchema("{{name}}Command")]
-    public class Command : IRequest<YouReturnTypeHere>
+    public class Command : IRequest<Response>
     {
     }
 
     /// <summary>
     /// Command Handler
     /// </summary>
-    public class CommandHandler : IRequestHandler<Command, YouReturnTypeHere>
+    public class CommandHandler : IRequestHandler<Command, Response>
     {
         public CommandHandler()
         {
 
         }
-        public async Task<YouReturnTypeHere> Handle(Command request, CancellationToken cancellationToken)
+        public async Task<Response> Handle(Command request, CancellationToken cancellationToken)
         {
             throw new NotImplementedException();
         }

diff --git a/src/gimme/Resources/WAS_Api_Conf_AutoMapper.txt b/src/gimme/Resources/WAS_Api_Conf_AutoMapper.txt
@@ -5,7 +5,14 @@ namespace {{solutionname}}.Api.Configurations
 {
     public static class AutoMapper {
         internal static void RegisterAutoMapper (IServiceCollection services) {
-            services.AddAutoMapper ();
+            //http://docs.automapper.org/en/stable/Inline-Mapping.html
+            services.AddAutoMapper(
+                configAction =>
+                {
+                    configAction.ValidateInlineMaps = false;
+                },
+                typeof(Application.Response)
+                );
         }
     }
 }
diff --git a/src/gimme/Resources/WAS_Api_Conf_Swagger.txt b/src/gimme/Resources/WAS_Api_Conf_Swagger.txt
@@ -1,14 +1,12 @@
-using System;
-using System.Reflection;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
+using System.Linq;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using NJsonSchema;
 using NSwag;
 using NSwag.AspNetCore;
 using NSwag.SwaggerGeneration.Processors.Security;
 
+
+
 namespace {{solutionname}}.Api.Configurations {
 
     public static class Swagger
@@ -24,13 +22,15 @@ namespace {{solutionname}}.Api.Configurations {
                 c.Title = "{{solutionname}} Api";
                 c.Version = "v1";
                 c.Description = "RESTFul Api for {{solutionname}}";
-                c.DocumentProcessors.Add(new SecurityDefinitionAppender("JWT", new SwaggerSecurityScheme
+
+                c.AddSecurity("JWT", Enumerable.Empty<string>(), new SwaggerSecurityScheme
                 {
                     Type = SwaggerSecuritySchemeType.ApiKey,
                     Name = "Authorization",
                     In = SwaggerSecurityApiKeyLocation.Header,
                     Description = "Copy 'Bearer ' + valid JWT token into field"
-                }));
+                });
+
                 c.OperationProcessors.Add(new OperationSecurityScopeProcessor("JWT"));
             });
 

diff --git a/src/gimme/Resources/WAS_Api_MediatorController.txt b/src/gimme/Resources/WAS_Api_MediatorController.txt
@@ -5,7 +5,8 @@ using Microsoft.Extensions.DependencyInjection;
 
 namespace {{solutionname}}.Api.Controllers
 {
-    public abstract class MediatorController : Controller
+    [ApiController]
+    public abstract class MediatorController : ControllerBase
     {
         private IMediator _mediator;