netcore-blueprint 1.0.24 → 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/Controllers/UserController.cs

@@ -44,7 +44,7 @@ namespace Template.API.Controllers
         /// <param name="pagingParams"></param>
         /// <returns></returns>
         [HttpGet]
-        [Authorize(Roles = "Admin")]
+        //[Authorize(Roles = "Admin")]
         [ProducesResponseType(typeof(PagerData<UserResponseDto>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetUsers([FromQuery] PagingParams pagingParams)
         {
@@ -69,6 +69,7 @@ namespace Template.API.Controllers
         /// <param name="userId"></param>
         /// <returns></returns>
         [HttpGet("{userId}")]
+        [Authorize(Roles = "Admin")]
         [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetUserById(int userId)
         {

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.API/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "MySql": "Server=localhost;port=3306;Database=test9;User=root",
+    "MySql": "Server=localhost;port=3306;Database=test10;User=root",
     "MongoDb": "mongodb://admin:password@localhost:27017"
   },
   "Database": {

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/Dtos/Requests/BaseRequestDto.cs

@@ -1,7 +1,7 @@
 namespace Template.Core.Dtos
 {
     /// <summary>
-    /// BaseDto
+    /// BaseRequestDto
     /// </summary>
     public class BaseRequestDto
     {
@@ -10,16 +10,16 @@
         /// </summary>
         public int? Id { get; set; }
         /// <summary>
-        /// Active
+        /// Status
         /// </summary>
-        public bool? Active { get; set; }
+        public bool? Status { get; set; }
         /// <summary>
-        /// CreatedDate
+        /// Date
         /// </summary>
-        public DateTime? CreatedDate { get; set; }
+        public DateTime? Date { get; set; }
         /// <summary>
-        /// LastModifiedDate
+        /// Modified
         /// </summary>
-        public DateTime? LastModifiedDate { get; set; }
+        public DateTime? Modified { get; set; }
     }
 }

package/BlueprintTemplate/Blueprint.Core/Dtos/Requests/UserRequestDto.cs

@@ -1,12 +1,10 @@
-using Blueprint.Core.Enums;
-
-namespace Template.Core.Dtos.Requests
+namespace Template.Core.Dtos.Requests
 {
     public class UserRequestDto: BaseRequestDto
     {
         public string? Name { get; set; }
         public string? Email { get; set; }
         public string? Picture { get; set; }
-        public UserRole Role { get; set; }
+        public string? Role { get; set; }
     }
 }

package/BlueprintTemplate/Blueprint.Core/Dtos/Responses/BaseResponseDto.cs

@@ -1,10 +1,7 @@
-using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson;
-
-namespace Template.Core.Dtos
+namespace Template.Core.Dtos
 {
     /// <summary>
-    /// BaseDto
+    /// BaseResponseDto
     /// </summary>
     public class BaseDto
     {
@@ -13,16 +10,16 @@ namespace Template.Core.Dtos
         /// </summary>
         public int? Id { get; set; }
         /// <summary>
-        /// Active
+        /// Status
         /// </summary>
-        public bool? Active { get; set; }
+        public bool? Status { get; set; }
         /// <summary>
-        /// CreatedDate
+        /// Date
         /// </summary>
-        public DateTime? CreatedDate { get; set; }
+        public DateTime? Date { get; set; }
         /// <summary>
-        /// LastModifiedDate
+        /// Modified
         /// </summary>
-        public DateTime? LastModifiedDate { get; set; }
+        public DateTime? Modified { get; set; }
     }
 }

package/BlueprintTemplate/Blueprint.Core/Dtos/Responses/UserResponseDto.cs

@@ -1,5 +1,4 @@
-
-namespace Template.Core.Dtos.Responses
+namespace Template.Core.Dtos.Responses
 {
     public class UserResponseDto : BaseRequestDto
     {

package/BlueprintTemplate/Blueprint.Core/Entities/BaseEntity.cs

@@ -13,11 +13,11 @@ namespace Blueprint.Core.Entities
         [Key]
         [BsonElement("id")]
         public int Id { get; set; }
-        [BsonElement("active")]
-        public bool Active { get; set; } = true;
-        [BsonElement("createdDate")]
-        public DateTime CreatedDate { get; set; } = DateTime.Now;
-        [BsonElement("lastModifiedDate")]
-        public DateTime LastModifiedDate { get; set; } = DateTime.Now;
+        [BsonElement("status")]
+        public bool Status { get; set; } = true;
+        [BsonElement("date")]
+        public DateTime Date { get; set; } = DateTime.Now;
+        [BsonElement("modified")]
+        public DateTime Modified { get; set; } = DateTime.Now;
     }
 }

package/BlueprintTemplate/Blueprint.Core/Entities/Category.cs

@@ -3,7 +3,9 @@
     public class Category: BaseEntity
     {
         public string? Name { get; set; }
-        public string? Description { get; set; }
+        public string? CoverImage { get; set; }
+        public string? Title { get; set; }
+        public string? Content { get; set; }
         public virtual List<Product>? Products { get; set; }
     }
 }

package/BlueprintTemplate/Blueprint.Core/Entities/Product.cs

@@ -1,12 +1,11 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Blueprint.Core.Entities
+namespace Blueprint.Core.Entities
 {
     public class Product : BaseEntity
     {
         public string? Name { get; set; }
-        public string? Url { get; set; }
-        public string? Description { get; set; }
+        public string? CoverImage { get; set; }
+        public string? Title { get; set; }
+        public string? Content { get; set; }
         public virtual Category? Category { get; set; }
         public int? CategoryId { get; set; }
     }

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,10 +16,13 @@
     <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="Migrations\" />
+  </ItemGroup>
 </Project>

package/BlueprintTemplate/Blueprint.Infra/Database/DbInitializer.cs

@@ -19,27 +19,27 @@ namespace Blueprint.Infra.Database
                     Id = 1,
                     Name = "Test",
                     Email = "",
-                    Active = true,
-                    CreatedDate = DateTime.Now,
-                    LastModifiedDate = DateTime.Now,
+                    Status = true,
+                    Date = DateTime.Now,
+                    Modified = DateTime.Now,
                 },
                 new User()
                 {
                     Id = 2,
                     Name = "Truong Dang",
                     Email = "truongdxfx08031@funix.edu.vn",
-                    Active = true,
-                    CreatedDate = DateTime.Now,
-                    LastModifiedDate = DateTime.Now,
+                    Status = true,
+                    Date = DateTime.Now,
+                    Modified = DateTime.Now,
                 },
                 new User()
                 {
                     Id = 3,
                     Name = "Thai Son",
                     Email = "truonghusk17aws1@gmail.com",
-                    Active = true,
-                    CreatedDate = DateTime.Now,
-                    LastModifiedDate = DateTime.Now,
+                    Status = true,
+                    Date = DateTime.Now,
+                    Modified = DateTime.Now,
                 }
             );
             modelBuilder?.Entity<Category>().HasData(
@@ -47,17 +47,17 @@ namespace Blueprint.Infra.Database
                 {
                     Id = 1,
                     Name = "Item 1",
-                    Active = true,
-                    CreatedDate = DateTime.Now,
-                    LastModifiedDate = DateTime.Now,
+                    Status = true,
+                    Date = DateTime.Now,
+                    Modified = DateTime.Now,
                 },
                 new Category()
                 {
                     Id = 2,
                     Name = "Item 2",
-                    Active = true,
-                    CreatedDate = DateTime.Now,
-                    LastModifiedDate = DateTime.Now,
+                    Status = true,
+                    Date = DateTime.Now,
+                    Modified = DateTime.Now,
                 }
             );
             modelBuilder?.Entity<Product>().HasData
@@ -66,120 +66,120 @@ namespace Blueprint.Infra.Database
                     { 
                         Id = 1,
                         Name = "Item 1",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Premtilmiue.png",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Premtilmiue.png",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 1,
                     },
                     new Product()
                     {
                         Id = 2,
                         Name = "Item 2",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Protile.png",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Protile.png",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     },
                     new Product()
                     {
                         Id = 3,
                         Name = "Item 3",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Supertile.png",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Supertile.png",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     },
                     new Product()
                     {
                         Id = 4,
                         Name = "Item 4",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-Sealant-HP.jpg",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-Sealant-HP.jpg",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 1,
                     },
                     new Product()
                     {
                         Id = 5,
                         Name = "Item 5",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-.jpg",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-.jpg",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     },
                     new Product()
                     {
                         Id = 6,
                         Name = "Item 6",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-1.jpg",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-1.jpg",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     },
                     new Product()
                     {
                         Id = 7,
                         Name = "Item 7",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-303.jpg",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-303.jpg",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 1,
                     },
                     new Product()
                     {
                         Id = 8,
                         Name = "Item 8",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Premtilmiue.png",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Premtilmiue.png",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     },
                     new Product()
                     {
                         Id = 9,
                         Name = "Item 9",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Protile.png",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Protile.png",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     },
                     new Product()
                     {
                         Id = 10,
                         Name = "Item 10",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Supertile.png",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/keo-dan-gach-TOA-Supertile.png",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 1,
                     },
                     new Product()
                     {
                         Id = 11,
                         Name = "Item 11",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-Sealant-HP.jpg",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-Sealant-HP.jpg",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     },
                     new Product()
                     {
                         Id = 12,
                         Name = "Item 12",
-                        Url = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-.jpg",
-                        Active = true,
-                        CreatedDate = DateTime.Now,
-                        LastModifiedDate = DateTime.Now,
+                        CoverImage = "https://innocons.s3.ap-southeast-1.amazonaws.com/products/Silicone-TOA-.jpg",
+                        Status = true,
+                        Date = DateTime.Now,
+                        Modified = DateTime.Now,
                         CategoryId = 2,
                     }
                 );