netcore-blueprint 1.0.22 → 1.0.24

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

@@ -1,111 +1,131 @@
-using Microsoft.EntityFrameworkCore;
-using Blueprint.Core.Entities;
-using Blueprint.Core.Errors;
-using Blueprint.Core.Interfaces.SPI;
-using Blueprint.Core.Models;
-using Blueprint.Infra.Database;
-
-namespace Blueprint.Infra.Services
-{
-    public class MySQLItemInfra<TEntity> : IItemInfra<TEntity> where TEntity : BaseEntity
-    {
-        public readonly DbContext _dbContext;
-        public readonly DbSet<TEntity> _dbSet;
-        public ILogger _logger;
-        public MySQLItemInfra
-        (
-            MyDbContext dbContext,
-            ILogger<MySQLItemInfra<TEntity>> logger
-        )
-        {
-            _dbContext = dbContext;
-            _logger = logger;
-            _dbSet = _dbContext.Set<TEntity>();
-        }
-        public async Task AddItemAsync(TEntity item)
-        {
-            try
-            {
-                _dbSet.Add(item);
-                await _dbContext.SaveChangesAsync();
-            }
-            catch (Exception)
-            {
-                _logger.LogError($"Cannot add an item");
-                throw Errors.CannotQueryError;
-            }
-        }
-
-        public async Task DeleteItemsAsync(List<int> ids)
-        {
-            try
-            {
-                List<TEntity> items = _dbSet.Where(p => ids.Contains(p.Id)).ToList();
-                items.ForEach(i => i.Active = false);
-                _dbSet.UpdateRange(items);
-                await _dbContext.SaveChangesAsync();
-            }
-            catch (Exception)
-            {
-                _logger.LogError($"Cannot delete items");
-                throw Errors.CannotQueryError;
-            }
-        }
-
-        public Task<TEntity?> GetItemByIdAsync(int id)
-        {
-            try
-            {
-                return _dbSet.FirstOrDefaultAsync(p => p.Id == id);
-            }
-            catch (Exception)
-            {
-                _logger.LogError($"Cannot get a item");
-                throw Errors.CannotQueryError;
-            }
-        }
-
-        public virtual async Task<PagerData<TEntity>> GetItemsAsync(PagingParams pagingParams)
-        {
-            try
-            {
-                int skipValues = (pagingParams.Page - 1) * pagingParams.Per_Page;
-                var query = _dbSet
-                    .Where(p => p.Active == true)
-                    .OrderByDescending(p => p.Id);
-
-                List<TEntity> items = await query
-                    .Skip(skipValues)
-                    .Take(pagingParams.Per_Page)
-                    .ToListAsync();
-
-                PagerData<TEntity> pagerData = new PagerData<TEntity>
-                {
-                    Items = items,
-                    TotalRecords = (await query.ToListAsync()).Count()
-                };
-
-                return pagerData;
-            }
-            catch (Exception)
-            {
-                _logger.LogError($"Cannot get items");
-                throw Errors.CannotQueryError;
-            }
-        }
-
-        public async Task UpdateItemAsync(TEntity item)
-        {
-            try
-            {
-                _dbSet.Update(item);
-                await _dbContext.SaveChangesAsync();
-            }
-            catch (Exception)
-            {
-                _logger.LogError($"Cannot update an item");
-                throw Errors.CannotQueryError;
-            }
-        }
-    }
-}
+using Microsoft.EntityFrameworkCore;
+using Blueprint.Core.Entities;
+using Blueprint.Core.Errors;
+using Blueprint.Core.Interfaces.SPI;
+using Blueprint.Core.Models;
+using Blueprint.Infra.Database;
+using System.Linq.Expressions;
+
+namespace Blueprint.Infra.Services
+{
+    public class MySQLItemInfra<T> : IItemInfra<T> where T : BaseEntity
+    {
+        public readonly DbContext _dbContext;
+        public readonly DbSet<T> _dbSet;
+        public ILogger _logger;
+        public MySQLItemInfra
+        (
+            MyDbContext dbContext,
+            ILogger<MySQLItemInfra<T>> logger
+        )
+        {
+            _dbContext = dbContext;
+            _logger = logger;
+            _dbSet = _dbContext.Set<T>();
+        }
+        public async Task AddItemAsync(T item)
+        {
+            try
+            {
+                _dbSet.Add(item);
+                await _dbContext.SaveChangesAsync();
+            }
+            catch (Exception)
+            {
+                _logger.LogError($"Cannot add an item");
+                throw Errors.CannotQueryError;
+            }
+        }
+
+        public async Task DeleteItemsAsync(List<int> ids)
+        {
+            try
+            {
+                List<T> items = _dbSet.Where(p => ids.Contains(p.Id)).ToList();
+                items.ForEach(i => i.Active = false);
+                _dbSet.UpdateRange(items);
+                await _dbContext.SaveChangesAsync();
+            }
+            catch (Exception)
+            {
+                _logger.LogError($"Cannot delete items");
+                throw Errors.CannotQueryError;
+            }
+        }
+
+        public virtual async Task<T?> GetItemByIdAsync(int id, params Expression<Func<T, object>>[] includes)
+        {
+            try
+            {
+                IQueryable<T> query = _dbSet;
+
+                // Apply includes dynamically
+                foreach (var include in includes)
+                {
+                    query = query.Include(include);
+                }
+
+                return await query.FirstOrDefaultAsync(p => p.Id == id);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Cannot get item with ID: {Id}", id);
+                throw Errors.CannotQueryError;
+            }
+        }
+
+        public virtual async Task<PagerData<T>> GetItemsAsync(
+            PagingParams pagingParams,
+            params Expression<Func<T, object>>[] includes)
+        {
+            try
+            {
+                int skipValues = (pagingParams.Page - 1) * pagingParams.Per_Page;
+                IQueryable<T> query = _dbSet
+                    .Where(p => p.Active == true)
+                    .OrderByDescending(p => p.Id);
+
+                // Apply includes dynamically
+                if (includes != null)
+                {
+                    foreach (var include in includes)
+                    {
+                        query = query.Include(include);
+                    }
+                }
+
+                List<T> items = await query
+                    .Skip(skipValues)
+                    .Take(pagingParams.Per_Page)
+                    .ToListAsync();
+
+                PagerData<T> pagerData = new PagerData<T>
+                {
+                    Items = items,
+                    TotalRecords = (await query.ToListAsync()).Count()
+                };
+
+                return pagerData;
+            }
+            catch (Exception)
+            {
+                _logger.LogError($"Cannot get items");
+                throw Errors.CannotQueryError;
+            }
+        }
+
+        public async Task UpdateItemAsync(T item)
+        {
+            try
+            {
+                _dbSet.Update(item);
+                await _dbContext.SaveChangesAsync();
+            }
+            catch (Exception)
+            {
+                _logger.LogError($"Cannot update an item");
+                throw Errors.CannotQueryError;
+            }
+        }
+    }
+}

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

@@ -1,30 +1,30 @@
-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
-{
-    public class MySQLUserInfra : MySQLItemInfra<User>, IUserInfra
-    {
-        public MySQLUserInfra(MyDbContext dbContext, ILogger<MySQLUserInfra> logger) 
-            : base(dbContext, logger)
-        {
-        }
-
-        public async Task<User?> GetUserByEmail(string email)
-        {
-            try
-            {
-                return await _dbSet.FirstOrDefaultAsync(p => p.Email == email);
-            }
-            catch (Exception)
-            {
-                _logger.LogError($"Cannot get a user");
-                throw Errors.CannotQueryError;
-            }
-        }
-    }
+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
+{
+    public class MySQLUserInfra : MySQLItemInfra<User>, IUserInfra
+    {
+        public MySQLUserInfra(MyDbContext dbContext, ILogger<MySQLUserInfra> logger) 
+            : base(dbContext, logger)
+        {
+        }
+
+        public async Task<User?> GetUserByEmail(string email)
+        {
+            try
+            {
+                return await _dbSet.FirstOrDefaultAsync(p => p.Email == email);
+            }
+            catch (Exception)
+            {
+                _logger.LogError($"Cannot get a user");
+                throw Errors.CannotQueryError;
+            }
+        }
+    }
 }

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

@@ -1,61 +1,62 @@
-using Blueprint.Core.Interfaces.SPI;
-using RabbitMQ.Client;
-using RabbitMQ.Client.Exceptions;
-using System.Text;
-
-namespace Blueprint.Infra.Services
-{
-    public class RabbitMqService : IRabbitMqService
-    {
-        private IConnection? _connection;
-        private IChannel? _channel;
-        public RabbitMqService()
-        {
-            InitializeAsync().GetAwaiter().GetResult();
-        }
-
-        private async Task InitializeAsync()
-        {
-            try
-            {
-                var factory = new ConnectionFactory
-                {
-                    HostName = "localhost", // Replace with RabbitMQ hostname
-                    UserName = "truongdx8", // RabbitMQ username
-                    Password = "12345678"  // RabbitMQ password
-                };
-
-                // Use the asynchronous method to create the connection
-                _connection = await factory.CreateConnectionAsync();
-
-                // Create a channel for communication
-                _channel = await _connection.CreateChannelAsync();
-            }
-            catch (BrokerUnreachableException ex)
-            {
-                Console.WriteLine($"Error connecting to RabbitMQ: {ex.Message}");
-                throw;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"Unexpected error: {ex.Message}");
-                throw;
-            }
-        }
-
-        public void PublishMessage(string queueName, string message)
-        {
-            _channel?.QueueDeclareAsync(queue: queueName,
-                      durable: true,
-                      exclusive: false,
-                      autoDelete: false,
-                      arguments: null);
-
-            var body = Encoding.UTF8.GetBytes(message);
-
-            _channel?.BasicPublishAsync(exchange: "",
-                                  routingKey: queueName,
-                                  body: body);
-        }
-    }
-}
+using Blueprint.Core.Interfaces.SPI;
+using RabbitMQ.Client;
+using RabbitMQ.Client.Exceptions;
+using System.Text;
+
+namespace Blueprint.Infra.Services
+{
+    public class RabbitMqService : IRabbitMqService
+    {
+        private readonly IConfiguration _configuration;
+        private IConnection? _connection;
+        private IChannel? _channel;
+        public RabbitMqService(IConfiguration configuration)
+        {
+            InitializeAsync().GetAwaiter().GetResult();
+            _configuration = configuration;
+        }
+
+        private async Task InitializeAsync()
+        {
+            try
+            {
+                var rabbitMqConfig = _configuration.GetSection("RabbitMQ");
+                var factory = new ConnectionFactory
+                {
+                    HostName = rabbitMqConfig["HostName"]!,
+                    UserName = rabbitMqConfig["UserName"]!,
+                    Password = rabbitMqConfig["Password"]!
+                };
+
+                // Use the asynchronous method to create the connection
+                _connection = await factory.CreateConnectionAsync();
+
+                // Create a channel for communication
+                _channel = await _connection.CreateChannelAsync();
+            }
+            catch (BrokerUnreachableException ex)
+            {
+                Console.WriteLine($"Producer warning: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"Unexpected error: {ex.Message}");
+            }
+        }
+
+        public void PublishMessage(string queueName, string message)
+        {
+            _channel?.QueueDeclareAsync(queue: queueName,
+                      durable: true,
+                      exclusive: false,
+                      autoDelete: false,
+                      arguments: null);
+
+            var body = Encoding.UTF8.GetBytes(message);
+
+            _channel?.BasicPublishAsync(exchange: "",
+                                  routingKey: queueName,
+                                  body: body);
+        }
+    }
+}

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

@@ -1,39 +1,39 @@
-using Blueprint.Core.Entities;
-using Blueprint.Core.Interfaces.SPI;
-using Template.Core.Interfaces.SPI;
-using Template.Infra.Services;
-
-namespace Blueprint.Infra.Services
-{
-    public class RepositoryFactory<T> : IRepositoryFactory<T> where T : BaseEntity
-    {
-        private readonly string _databaseType;
-        private readonly IServiceProvider _serviceProvider;
-
-        public RepositoryFactory(IConfiguration configuration, IServiceProvider serviceProvider)
-        {
-            _databaseType = configuration["Database:Type"]!;
-            _serviceProvider = serviceProvider;
-        }
-
-        public IItemInfra<T> CreateItemRepository()
-        {
-            return _databaseType.ToLower() switch
-            {
-                "mysql" => ActivatorUtilities.CreateInstance<MySQLItemInfra<T>>(_serviceProvider),
-                "mongodb" => ActivatorUtilities.CreateInstance<MongoItemInfra<T>>(_serviceProvider),
-                _ => throw new ArgumentException("Invalid database type")
-            };
-        }
-
-        public IUserInfra CreateUserRepository()
-        {
-            return _databaseType.ToLower() switch
-            {
-                "mysql" => ActivatorUtilities.CreateInstance<MySQLUserInfra>(_serviceProvider),
-                "mongodb" => ActivatorUtilities.CreateInstance<MongoUserInfra>(_serviceProvider),
-                _ => throw new ArgumentException("Invalid database type")
-            };
-        }
-    }
-}
+using Blueprint.Core.Entities;
+using Blueprint.Core.Interfaces.SPI;
+using Template.Core.Interfaces.SPI;
+using Template.Infra.Services;
+
+namespace Blueprint.Infra.Services
+{
+    public class RepositoryFactory<T> : IRepositoryFactory<T> where T : BaseEntity
+    {
+        private readonly string _databaseType;
+        private readonly IServiceProvider _serviceProvider;
+
+        public RepositoryFactory(IConfiguration configuration, IServiceProvider serviceProvider)
+        {
+            _databaseType = configuration["Database:Type"]!;
+            _serviceProvider = serviceProvider;
+        }
+
+        public IItemInfra<T> CreateItemRepository()
+        {
+            return _databaseType.ToLower() switch
+            {
+                "mysql" => ActivatorUtilities.CreateInstance<MySQLItemInfra<T>>(_serviceProvider),
+                "mongodb" => ActivatorUtilities.CreateInstance<MongoItemInfra<T>>(_serviceProvider),
+                _ => throw new ArgumentException("Invalid database type")
+            };
+        }
+
+        public IUserInfra CreateUserRepository()
+        {
+            return _databaseType.ToLower() switch
+            {
+                "mysql" => ActivatorUtilities.CreateInstance<MySQLUserInfra>(_serviceProvider),
+                "mongodb" => ActivatorUtilities.CreateInstance<MongoUserInfra>(_serviceProvider),
+                _ => throw new ArgumentException("Invalid database type")
+            };
+        }
+    }
+}

package/BlueprintTemplate/Blueprint.Infra/Worker.cs

@@ -1,24 +1,24 @@
-namespace Blueprint.Infra
-{
-    public class Worker : BackgroundService
-    {
-        private readonly ILogger<Worker> _logger;
-
-        public Worker(ILogger<Worker> logger)
-        {
-            _logger = logger;
-        }
-
-        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-        {
-            while (!stoppingToken.IsCancellationRequested)
-            {
-                if (_logger.IsEnabled(LogLevel.Information))
-                {
-                    _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
-                }
-                await Task.Delay(1000, stoppingToken);
-            }
-        }
-    }
-}
+namespace Blueprint.Infra
+{
+    public class Worker : BackgroundService
+    {
+        private readonly ILogger<Worker> _logger;
+
+        public Worker(ILogger<Worker> logger)
+        {
+            _logger = logger;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            while (!stoppingToken.IsCancellationRequested)
+            {
+                if (_logger.IsEnabled(LogLevel.Information))
+                {
+                    _logger.LogInformation("Worker running at: {time}", DateTimeOffset.Now);
+                }
+                await Task.Delay(1000, stoppingToken);
+            }
+        }
+    }
+}

package/BlueprintTemplate/Blueprint.Test/Blueprint.Test.csproj

@@ -1,29 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Blueprint.API\Blueprint.API.csproj" />
-    <ProjectReference Include="..\Blueprint.Core\Blueprint.Core.csproj" />
-    <ProjectReference Include="..\Blueprint.Infra\Blueprint.Infra.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Blueprint.API\Blueprint.API.csproj" />
+    <ProjectReference Include="..\Blueprint.Core\Blueprint.Core.csproj" />
+    <ProjectReference Include="..\Blueprint.Infra\Blueprint.Infra.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+</Project>

package/BlueprintTemplate/Blueprint.Test/UnitTest1.cs

@@ -1,11 +1,11 @@
-namespace Blueprint.Test
-{
-    public class UnitTest1
-    {
-        [Fact]
-        public void Test1()
-        {
-
-        }
-    }
+namespace Blueprint.Test
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+
+        }
+    }
 }