netcore-blueprint 1.0.25 → 1.0.26

package/BlueprintTemplate/Blueprint.API/{Controllers → AsyncControllers}/UserControllerAsync.cs

@@ -3,11 +3,11 @@ using Microsoft.AspNetCore.Mvc;
 using System.Text.Json;
 using Template.Core.Dtos.Requests;
 
-namespace Blueprint.API.Controllers
+namespace Blueprint.API.AsyncControllers
 {
     [Route("rest/v{version:apiVersion}/users-async")]
     [ApiController]
-    public class UserControllerAsync: Controller
+    public class UserControllerAsync : Controller
     {
         private readonly IRabbitMqService _rabbitMqService;
         private readonly ILogger<UserControllerAsync> _logger;

package/BlueprintTemplate/Blueprint.API/Blueprint.API.csproj

@@ -17,7 +17,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
   </ItemGroup>
 

package/BlueprintTemplate/Blueprint.API/Program.cs

@@ -9,7 +9,6 @@ using Amazon.S3;
 using Template.Core.Interfaces.API;
 using Template.Core.Services;
 using Template.Core.Interfaces.SPI;
-using Template.Infra.Services;
 using Blueprint.Core.Interfaces.API;
 using Blueprint.Core.Interfaces.SPI;
 using Blueprint.Infra.Services;
@@ -20,6 +19,8 @@ using System.Text;
 using Blueprint.Core.Services;
 using Amazon.SimpleSystemsManagement.Model;
 using Amazon.SimpleSystemsManagement;
+using Blueprint.Infra.Services.Mongo;
+using Blueprint.Infra.Services.MySQL;
 
 var builder = WebApplication.CreateBuilder(args);
 

package/BlueprintTemplate/Blueprint.Core/Blueprint.Core.csproj

@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="MongoDB.Bson" Version="3.1.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
   </ItemGroup>
 </Project>

package/BlueprintTemplate/Blueprint.Core/Interfaces/SPI/IRepositoryFactory.cs

@@ -4,7 +4,6 @@ namespace Blueprint.Core.Interfaces.SPI
 {
     public interface IRepositoryFactory<T>
     {
-        IUserInfra CreateUserRepository();
         IItemInfra<T> CreateItemRepository();
     }
 }

package/BlueprintTemplate/Blueprint.Core/Interfaces/SPI/IUserInfra.cs

@@ -1,9 +1,9 @@
 using Blueprint.Core.Entities;
-using Blueprint.Core.Interfaces.API;
+using Blueprint.Core.Interfaces.SPI;
 
 namespace Template.Core.Interfaces.SPI
 {
-    public interface IUserInfra: IItemService<User>
+    public interface IUserInfra: IItemInfra<User>
     {
         public Task<User> GetUserByEmail(string email);
     }

package/BlueprintTemplate/Blueprint.Infra/Blueprint.Infra.csproj

@@ -16,7 +16,6 @@
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="MongoDB.Driver" Version="3.1.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
-    <PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

package/BlueprintTemplate/Blueprint.Infra/Services/{MongoItemInfra.cs → Mongo/MongoItemInfra.cs}

@@ -5,7 +5,7 @@ using Blueprint.Core.Models;
 using MongoDB.Driver;
 using System.Linq.Expressions;
 
-namespace Blueprint.Infra.Services
+namespace Blueprint.Infra.Services.Mongo
 {
     public class MongoItemInfra<T> : IItemInfra<T> where T : BaseEntity
     {
@@ -13,7 +13,7 @@ namespace Blueprint.Infra.Services
         public readonly ILogger<MongoItemInfra<T>> _logger;
 
         public MongoItemInfra(
-            IMongoDatabase database, 
+            IMongoDatabase database,
             ILogger<MongoItemInfra<T>> logger)
         {
             _dbSet = database.GetCollection<T>(typeof(T).Name.ToLower());
@@ -98,7 +98,7 @@ namespace Blueprint.Infra.Services
             try
             {
                 var id = typeof(T).GetProperty("Id")?.GetValue(item);
-                if (id == null) 
+                if (id == null)
                     throw Errors.CannotFindTheItem;
 
                 await _dbSet.ReplaceOneAsync(Builders<T>.Filter.Eq("Id", id), item);

package/BlueprintTemplate/Blueprint.Infra/Services/{MongoUserInfra.cs → Mongo/MongoUserInfra.cs}

@@ -1,16 +1,15 @@
 using Blueprint.Core.Entities;
 using Blueprint.Core.Errors;
 using Blueprint.Infra.Database;
-using Blueprint.Infra.Services;
 using Microsoft.EntityFrameworkCore;
 using MongoDB.Driver;
 using Template.Core.Interfaces.SPI;
 
-namespace Template.Infra.Services
+namespace Blueprint.Infra.Services.Mongo
 {
     public class MongoUserInfra : MongoItemInfra<User>, IUserInfra
     {
-        public MongoUserInfra(IMongoDatabase dbContext, ILogger<MongoUserInfra> logger) 
+        public MongoUserInfra(IMongoDatabase dbContext, ILogger<MongoUserInfra> logger)
             : base(dbContext, logger)
         {
         }

package/BlueprintTemplate/Blueprint.Infra/Services/{MySQLItemInfra.cs → MySQL/MySQLItemInfra.cs}

@@ -6,7 +6,7 @@ using Blueprint.Core.Models;
 using Blueprint.Infra.Database;
 using System.Linq.Expressions;
 
-namespace Blueprint.Infra.Services
+namespace Blueprint.Infra.Services.MySQL
 {
     public class MySQLItemInfra<T> : IItemInfra<T> where T : BaseEntity
     {

package/BlueprintTemplate/Blueprint.Infra/Services/{MySQLUserInfra.cs → MySQL/MySQLUserInfra.cs}

@@ -1,15 +1,14 @@
 using Blueprint.Core.Entities;
 using Blueprint.Core.Errors;
 using Blueprint.Infra.Database;
-using Blueprint.Infra.Services;
 using Microsoft.EntityFrameworkCore;
 using Template.Core.Interfaces.SPI;
 
-namespace Template.Infra.Services
+namespace Blueprint.Infra.Services.MySQL
 {
     public class MySQLUserInfra : MySQLItemInfra<User>, IUserInfra
     {
-        public MySQLUserInfra(MyDbContext dbContext, ILogger<MySQLUserInfra> logger) 
+        public MySQLUserInfra(MyDbContext dbContext, ILogger<MySQLUserInfra> logger)
             : base(dbContext, logger)
         {
         }

package/BlueprintTemplate/Blueprint.Infra/Services/RepositoryFactory.cs

@@ -1,7 +1,7 @@
 using Blueprint.Core.Entities;
 using Blueprint.Core.Interfaces.SPI;
-using Template.Core.Interfaces.SPI;
-using Template.Infra.Services;
+using Blueprint.Infra.Services.Mongo;
+using Blueprint.Infra.Services.MySQL;
 
 namespace Blueprint.Infra.Services
 {
@@ -18,21 +18,25 @@ namespace Blueprint.Infra.Services
 
         public IItemInfra<T> CreateItemRepository()
         {
-            return _databaseType.ToLower() switch
+            var dbType = _databaseType.ToLower();
+            var entityType = typeof(T);
+
+            Type implementationType = dbType switch
             {
-                "mysql" => ActivatorUtilities.CreateInstance<MySQLItemInfra<T>>(_serviceProvider),
-                "mongodb" => ActivatorUtilities.CreateInstance<MongoItemInfra<T>>(_serviceProvider),
+                "mysql" => GetMySqlImplementationType(entityType),
+                "mongodb" => typeof(MongoItemInfra<>).MakeGenericType(entityType),
                 _ => throw new ArgumentException("Invalid database type")
             };
+
+            return (IItemInfra<T>)ActivatorUtilities.CreateInstance(_serviceProvider, implementationType);
         }
 
-        public IUserInfra CreateUserRepository()
+        private Type GetMySqlImplementationType(Type entityType)
         {
-            return _databaseType.ToLower() switch
+            return entityType.Name switch
             {
-                "mysql" => ActivatorUtilities.CreateInstance<MySQLUserInfra>(_serviceProvider),
-                "mongodb" => ActivatorUtilities.CreateInstance<MongoUserInfra>(_serviceProvider),
-                _ => throw new ArgumentException("Invalid database type")
+                nameof(User) => typeof(MySQLUserInfra),
+                _ => typeof(MySQLItemInfra<>).MakeGenericType(entityType)
             };
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netcore-blueprint",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "A custom .NET Core project blueprint",
   "main": "create.js",
   "bin": {

package/BlueprintTemplate/Blueprint.API/Controllers/WeatherForecastController.cs

@@ -1,33 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-
-namespace Blueprint.API.Controllers
-{
-    [ApiController]
-    [Route("[controller]")]
-    public class WeatherForecastController : ControllerBase
-    {
-        private static readonly string[] Summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
-
-        private readonly ILogger<WeatherForecastController> _logger;
-
-        public WeatherForecastController(ILogger<WeatherForecastController> logger)
-        {
-            _logger = logger;
-        }
-
-        [HttpGet(Name = "GetWeatherForecast")]
-        public IEnumerable<WeatherForecast> Get()
-        {
-            return Enumerable.Range(1, 5).Select(index => new WeatherForecast
-            {
-                Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-                TemperatureC = Random.Shared.Next(-20, 55),
-                Summary = Summaries[Random.Shared.Next(Summaries.Length)]
-            })
-            .ToArray();
-        }
-    }
-}