netcore-blueprint 1.0.22 → 1.0.24

package/BlueprintTemplate/Blueprint.Core/Services/ItemService.cs

@@ -1,47 +1,52 @@
-using Blueprint.Core.Entities;
-using Blueprint.Core.Interfaces.API;
-using Blueprint.Core.Interfaces.SPI;
-using Blueprint.Core.Models;
-
-namespace Blueprint.Core.Services
-{
-    public class ItemService<TEntity> : IItemService<TEntity> where TEntity : BaseEntity
-    {
-        private readonly IItemInfra<TEntity> _itemInfra;
-        private ILogger? _logger;
-
-        public ItemService(
-            ILogger logger,
-            IRepositoryFactory<TEntity> repositoryFactory
-            )
-        {
-            _itemInfra = repositoryFactory.CreateItemRepository();
-            _logger = logger;
-        }
-
-        public Task AddItemAsync(TEntity item)
-        {
-            return _itemInfra.AddItemAsync(item);
-        }
-
-        public Task DeleteItemsAsync(List<int> ids)
-        {
-            return _itemInfra.DeleteItemsAsync(ids);
-        }
-
-        public Task<TEntity> GetItemByIdAsync(int id)
-        {
-            return _itemInfra.GetItemByIdAsync(id);
-        }
-
-        public virtual Task<PagerData<TEntity>> GetItemsAsync(PagingParams pagingParams)
-        {
-            return _itemInfra.GetItemsAsync(pagingParams);
-        }
-
-        public Task UpdateItemAsync(TEntity item)
-        {
-            return _itemInfra.UpdateItemAsync(item);
-        }
-    }
-}
+using Blueprint.Core.Entities;
+using Blueprint.Core.Interfaces.API;
+using Blueprint.Core.Interfaces.SPI;
+using Blueprint.Core.Models;
+using System.Linq.Expressions;
+
+namespace Blueprint.Core.Services
+{
+    public class ItemService<T> : IItemService<T> where T : BaseEntity
+    {
+        private readonly IItemInfra<T> _itemInfra;
+        private ILogger? _logger;
+
+        public ItemService(
+            ILogger logger,
+            IRepositoryFactory<T> repositoryFactory
+            )
+        {
+            _itemInfra = repositoryFactory.CreateItemRepository();
+            _logger = logger;
+        }
+
+        public Task AddItemAsync(T item)
+        {
+            return _itemInfra.AddItemAsync(item);
+        }
+
+        public Task DeleteItemsAsync(List<int> ids)
+        {
+            return _itemInfra.DeleteItemsAsync(ids);
+        }
+
+        public Task<T> GetItemByIdAsync(
+            int id,
+            params Expression<Func<T, object>>[] includes)
+        {
+            return _itemInfra.GetItemByIdAsync(id, includes);
+        }
+
+        public virtual Task<PagerData<T>> GetItemsAsync(
+            PagingParams pagingParams,
+            params Expression<Func<T, object>>[] includes)
+        {
+            return _itemInfra.GetItemsAsync(pagingParams, includes);
+        }
+
+        public Task UpdateItemAsync(T item)
+        {
+            return _itemInfra.UpdateItemAsync(item);
+        }
+    }
+}

package/BlueprintTemplate/Blueprint.Core/Services/UserService.cs

@@ -1,108 +1,108 @@
-using Blueprint.Core.Entities;
-using Blueprint.Core.Enums;
-using Blueprint.Core.Errors;
-using Blueprint.Core.Interfaces.SPI;
-using Blueprint.Core.Services;
-using Microsoft.IdentityModel.Tokens;
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using System.Text;
-using Template.Core.Interfaces.API;
-using Template.Core.Interfaces.SPI;
-
-namespace Template.Core.Services
-{
-    public class UserService : ItemService<User>, IUserService
-    {
-        private readonly IUserInfra _userInfra;
-        private readonly IConfiguration _configuration;
-        public UserService(ILogger<UserService> logger, 
-            IRepositoryFactory<User> repositoryFactory, 
-            IUserInfra userInfra,
-            IConfiguration configuration) : base(logger, repositoryFactory)
-        {
-            _userInfra = userInfra;
-            _configuration = configuration;
-        }
-
-        public async Task<string> CheckUserLogin(string token)
-        {
-            string? email = "";
-            string? name = "";
-            string? picture = "";
-            User? user = null;
-
-            // Check if token is empty
-            if (string.IsNullOrEmpty(token))
-            {
-                throw Errors.EmptyToken;
-            }
-
-            var handler = new JwtSecurityTokenHandler();
-            if (handler.CanReadToken(token))
-            {
-                try
-                {
-                    //Check the existing user by email
-                    var jwtToken = handler.ReadJwtToken(token);
-                    var emailClaim = jwtToken.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email || c.Type == "email");
-                    var nameClaim = jwtToken.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name || c.Type == "unique_name");
-                    var pictureClaim = jwtToken.Claims.FirstOrDefault(c => c.Type == "picture");
-
-                    email = emailClaim?.Value;
-                    name = nameClaim?.Value;
-                    picture = pictureClaim?.Value;
-
-                    if (!string.IsNullOrEmpty(email))
-                    {
-                        user = await _userInfra.GetUserByEmail(email);
-                    }
-
-                    //Create a new one if not exist
-                    if (user == null)
-                    {
-                        user = new User()
-                        {
-                            Email = email,
-                            Name = name,
-                            Picture = picture,
-                            Role = UserRole.Admin
-                        };
-                        await _userInfra.AddItemAsync(user);
-                    }
-
-                    //Generate the new jwt token
-                    var authClaims = new List<Claim>
-                    {
-                        new Claim(ClaimTypes.Email, user.Email!),
-                        new Claim(ClaimTypes.Name, user.Name ?? ""),
-                        new Claim("picture", user.Picture ?? ""),
-                        new Claim(ClaimTypes.Role, user.Role.ToString()!)
-                    };
-
-                    var authSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_configuration["Jwt:Secret"]!));
-                    var tokenDescriptor = new SecurityTokenDescriptor
-                    {
-                        Subject = new ClaimsIdentity(authClaims),
-                        Expires = DateTime.UtcNow.AddHours(1),
-                        SigningCredentials = new SigningCredentials(authSigningKey, SecurityAlgorithms.HmacSha256),
-                        Issuer = _configuration["Jwt:Issuer"],
-                        Audience = _configuration["Jwt:Audience"]
-                    };
-
-                    var tokenHandler = new JwtSecurityTokenHandler();
-                    var securityToken = tokenHandler.CreateToken(tokenDescriptor);
-                    return tokenHandler.WriteToken(securityToken);
-                }
-                catch (Exception ex)
-                {
-                    throw Errors.InvalidToken;
-                }
-            }
-            else
-            {
-                throw Errors.CannotReadToken;
-            }
-        }
-    }
-}
+using Blueprint.Core.Entities;
+using Blueprint.Core.Enums;
+using Blueprint.Core.Errors;
+using Blueprint.Core.Interfaces.SPI;
+using Blueprint.Core.Services;
+using Microsoft.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
+using Template.Core.Interfaces.API;
+using Template.Core.Interfaces.SPI;
+
+namespace Template.Core.Services
+{
+    public class UserService : ItemService<User>, IUserService
+    {
+        private readonly IUserInfra _userInfra;
+        private readonly IConfiguration _configuration;
+        public UserService(ILogger<UserService> logger, 
+            IRepositoryFactory<User> repositoryFactory, 
+            IUserInfra userInfra,
+            IConfiguration configuration) : base(logger, repositoryFactory)
+        {
+            _userInfra = userInfra;
+            _configuration = configuration;
+        }
+
+        public async Task<string> CheckUserLogin(string token)
+        {
+            string? email = "";
+            string? name = "";
+            string? picture = "";
+            User? user = null;
+
+            // Check if token is empty
+            if (string.IsNullOrEmpty(token))
+            {
+                throw Errors.EmptyToken;
+            }
+
+            var handler = new JwtSecurityTokenHandler();
+            if (handler.CanReadToken(token))
+            {
+                try
+                {
+                    //Check the existing user by email
+                    var jwtToken = handler.ReadJwtToken(token);
+                    var emailClaim = jwtToken.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email || c.Type == "email");
+                    var nameClaim = jwtToken.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name || c.Type == "unique_name");
+                    var pictureClaim = jwtToken.Claims.FirstOrDefault(c => c.Type == "picture");
+
+                    email = emailClaim?.Value;
+                    name = nameClaim?.Value;
+                    picture = pictureClaim?.Value;
+
+                    if (!string.IsNullOrEmpty(email))
+                    {
+                        user = await _userInfra.GetUserByEmail(email);
+                    }
+
+                    //Create a new one if not exist
+                    if (user == null)
+                    {
+                        user = new User()
+                        {
+                            Email = email,
+                            Name = name,
+                            Picture = picture,
+                            Role = UserRole.Admin
+                        };
+                        await _userInfra.AddItemAsync(user);
+                    }
+
+                    //Generate the new jwt token
+                    var authClaims = new List<Claim>
+                    {
+                        new Claim(ClaimTypes.Email, user.Email!),
+                        new Claim(ClaimTypes.Name, user.Name ?? ""),
+                        new Claim("picture", user.Picture ?? ""),
+                        new Claim(ClaimTypes.Role, user.Role.ToString()!)
+                    };
+
+                    var authSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_configuration["Jwt:Secret"]!));
+                    var tokenDescriptor = new SecurityTokenDescriptor
+                    {
+                        Subject = new ClaimsIdentity(authClaims),
+                        Expires = DateTime.UtcNow.AddHours(1),
+                        SigningCredentials = new SigningCredentials(authSigningKey, SecurityAlgorithms.HmacSha256),
+                        Issuer = _configuration["Jwt:Issuer"],
+                        Audience = _configuration["Jwt:Audience"]
+                    };
+
+                    var tokenHandler = new JwtSecurityTokenHandler();
+                    var securityToken = tokenHandler.CreateToken(tokenDescriptor);
+                    return tokenHandler.WriteToken(securityToken);
+                }
+                catch (Exception ex)
+                {
+                    throw Errors.InvalidToken;
+                }
+            }
+            else
+            {
+                throw Errors.CannotReadToken;
+            }
+        }
+    }
+}

package/BlueprintTemplate/Blueprint.Core/StaticClasses/Errors.cs

@@ -1,20 +1,20 @@
-using System.Net;
-using Blueprint.Core.Models;
-
-namespace Blueprint.Core.Errors
-{
-    public static class Errors
-    {
-        public static readonly Error CannotQueryError = new Error("E-001", "Cannot do the query", HttpStatusCode.InternalServerError);
-        public static readonly Error CannotFindTheItem = new Error("E-002", "Cannot find the item", HttpStatusCode.NotFound);
-
-        //S3 Error
-        public static readonly Error HaveNoFile = new Error("E-S3-001", "Do not have file", HttpStatusCode.InternalServerError);
-        public static readonly Error CannotUploadFile = new Error("E-S3-002", "Cannot upload file to S3", HttpStatusCode.InternalServerError);
-
-        //Authen, Author Error
-        public static readonly Error CannotReadToken = new Error("E-AU-001", "Cannot read the token", HttpStatusCode.Unauthorized);
-        public static readonly Error EmptyToken = new Error("E-AU-002", "Token cannot be empty", HttpStatusCode.Unauthorized);
-        public static readonly Error InvalidToken = new Error("E-AU-002", "Invalid token", HttpStatusCode.Unauthorized);
-    }
-}
+using System.Net;
+using Blueprint.Core.Models;
+
+namespace Blueprint.Core.Errors
+{
+    public static class Errors
+    {
+        public static readonly Error CannotQueryError = new Error("E-001", "Cannot do the query", HttpStatusCode.InternalServerError);
+        public static readonly Error CannotFindTheItem = new Error("E-002", "Cannot find the item", HttpStatusCode.NotFound);
+
+        //S3 Error
+        public static readonly Error HaveNoFile = new Error("E-S3-001", "Do not have file", HttpStatusCode.InternalServerError);
+        public static readonly Error CannotUploadFile = new Error("E-S3-002", "Cannot upload file to S3", HttpStatusCode.InternalServerError);
+
+        //Authen, Author Error
+        public static readonly Error CannotReadToken = new Error("E-AU-001", "Cannot read the token", HttpStatusCode.Unauthorized);
+        public static readonly Error EmptyToken = new Error("E-AU-002", "Token cannot be empty", HttpStatusCode.Unauthorized);
+        public static readonly Error InvalidToken = new Error("E-AU-002", "Invalid token", HttpStatusCode.Unauthorized);
+    }
+}

package/BlueprintTemplate/Blueprint.Core/Worker.cs

@@ -1,24 +1,24 @@
-namespace Blueprint.Core
-{
-    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.Core
+{
+    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.Infra/Blueprint.Infra.csproj

@@ -1,29 +1,25 @@
-<Project Sdk="Microsoft.NET.Sdk.Worker">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>dotnet-Blueprint.Infra-8aff4112-afb5-45ca-b7eb-618ff5523ffe</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <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>
-    <ProjectReference Include="..\Blueprint.Core\Blueprint.Core.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Models\" />
-  </ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UserSecretsId>dotnet-Blueprint.Infra-8aff4112-afb5-45ca-b7eb-618ff5523ffe</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.10">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <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>
+    <ProjectReference Include="..\Blueprint.Core\Blueprint.Core.csproj" />
+  </ItemGroup>
+</Project>