netcore-blueprint 1.0.22 → 1.0.24

package/BlueprintTemplate/.gitlab-ci.yml

@@ -0,0 +1,21 @@
+image: docker:latest  # Use Docker image
+
+services:
+  - docker:dind  # Enable Docker-in-Docker
+
+variables:
+  DOCKER_USERNAME: "$DOCKER_USERNAME"
+  DOCKER_REPOSITORY: "$DOCKER_REPOSITORY"
+  TAG: latest
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_TLS_CERTDIR: ""
+
+build:
+  stage: build
+  script:
+    - apk add --no-cache bash
+    - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+    - chmod +x ./build-and-push.sh
+    - ./build-and-push.sh "$DOCKER_USERNAME" "$DOCKER_REPOSITORY" "$TAG"
+  only:
+    - main

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

@@ -1,28 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
-    <PackageReference Include="AWSSDK.S3" Version="3.7.410.12" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
-      <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>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Blueprint.Core\Blueprint.Core.csproj" />
-    <ProjectReference Include="..\Blueprint.Infra\Blueprint.Infra.csproj" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.410.12" />
+    <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.404" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+      <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>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Blueprint.Core\Blueprint.Core.csproj" />
+    <ProjectReference Include="..\Blueprint.Infra\Blueprint.Infra.csproj" />
+  </ItemGroup>
+
+</Project>

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

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ActiveDebugProfile>https</ActiveDebugProfile>
-    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
-    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
-  </PropertyGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ActiveDebugProfile>https</ActiveDebugProfile>
+    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
+    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
+  </PropertyGroup>
 </Project>

package/BlueprintTemplate/Blueprint.API/Blueprint.API.http

@@ -1,6 +1,6 @@
-@Blueprint.API_HostAddress = http://localhost:5262
-
-GET {{Blueprint.API_HostAddress}}/weatherforecast/
-Accept: application/json
-
-###
+@Blueprint.API_HostAddress = http://localhost:5262
+
+GET {{Blueprint.API_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###

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

@@ -1,179 +1,178 @@
-using AutoMapper;
-using Blueprint.Core.Entities;
-using Blueprint.Core.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System.Diagnostics;
-using Template.Core.Dtos.Requests;
-using Template.Core.Dtos.Responses;
-using Template.Core.Interfaces.API;
-
-namespace Template.API.Controllers
-{
-    /// <summary>
-    /// User Controller
-    /// </summary>
-    [Route("rest/v1.0/users")]
-    [ApiVersion("1.0")]
-    [Produces("application/json")]
-    [ApiController]
-    public class UserController : Controller
-    {
-        private readonly IMapper _mapper;
-        private ILogger _logger;
-        private readonly IUserService _userService;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="logger"></param>
-        /// <param name="mapper"></param>
-        /// <param name="userService"></param>
-        public UserController(
-            ILogger<UserController> logger,
-            IMapper mapper,
-            IUserService userService)
-        {
-            _mapper = mapper;
-            _logger = logger;
-            _userService = userService;
-        }
-
-        /// <summary>
-        /// Get users
-        /// </summary>
-        /// <param name="pagingParams"></param>
-        /// <returns></returns>
-        [HttpGet]
-        [Authorize(Roles = "Admin")]
-        [ProducesResponseType(typeof(PagerData<UserResponseDto>), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetUsers([FromQuery] PagingParams pagingParams)
-        {
-            _logger.LogInformation($"Start getting users");
-            var stopwatch = Stopwatch.StartNew();
-
-            PagerData<User> users = await _userService.GetItemsAsync(pagingParams);
-            PagerData<UserResponseDto> userResponse = _mapper.Map<PagerData<UserResponseDto>>(users);
-
-            // Add custom headers
-            Response.Headers.Append("X-WP-Total", users.TotalRecords.ToString());
-
-            stopwatch.Stop();
-            _logger.LogInformation($"Getting users done in {stopwatch.ElapsedMilliseconds}");
-
-            return Ok(userResponse.Items);
-        }
-
-        /// <summary>
-        /// Get user by Id
-        /// </summary>
-        /// <param name="userId"></param>
-        /// <returns></returns>
-        [HttpGet("{userId}")]
-        [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GetUserById(int userId)
-        {
-            _logger.LogInformation($"Start getting a user with Id = {userId}");
-            var stopwatch = Stopwatch.StartNew();
-
-            User user = await _userService.GetItemByIdAsync(userId);
-            UserResponseDto userResponseDto = _mapper.Map<UserResponseDto>(user);
-
-            stopwatch.Stop();
-            _logger.LogInformation($"Getting an user done in {stopwatch.ElapsedMilliseconds}");
-
-            return Ok(userResponseDto);
-        }
-
-        /// <summary>
-        /// Checking user login
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("check-user-login")]
-        [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-        public async Task<IActionResult> CheckUserLogin()
-        {
-            _logger.LogInformation($"Start checking user login");
-            var stopwatch = Stopwatch.StartNew();
-
-            string? authorizationHeader = Request.Headers["Authorization"].FirstOrDefault();
-            if (string.IsNullOrEmpty(authorizationHeader) || !authorizationHeader.StartsWith("Bearer "))
-            {
-                return Unauthorized("Authorization header missing or invalid.");
-            }
-
-            string token = authorizationHeader.Replace("Bearer ", string.Empty);
-
-            string newToken = await _userService.CheckUserLogin(token);
-
-            stopwatch.Stop();
-            _logger.LogInformation($"Checking user login done in {stopwatch.ElapsedMilliseconds}");
-
-            return Ok(newToken);
-        }
-
-        /// <summary>
-        /// Update User
-        /// </summary>
-        /// <param name="userRequestDto"></param>
-        /// <returns></returns>
-        [HttpPut]
-        [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
-        public async Task<IActionResult> UpdateUser([FromBody] UserRequestDto userRequestDto)
-        {
-            _logger.LogInformation($"Start update a user");
-            var stopwatch = Stopwatch.StartNew();
-
-            User user = _mapper.Map<User>(userRequestDto);
-            await _userService.UpdateItemAsync(user);
-
-            stopwatch.Stop();
-            _logger.LogInformation($"Updating a user done in {stopwatch.ElapsedMilliseconds}");
-
-            return Ok();
-        }
-
-        /// <summary>
-        /// Delete User
-        /// </summary>
-        /// <param name="userIds"></param>
-        /// <returns></returns>
-        [HttpDelete]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<IActionResult> DeleteUser([FromBody] List<int> userIds)
-        {
-            _logger.LogInformation($"Start deleting a User");
-            Stopwatch stopwatch = Stopwatch.StartNew();
-
-            await _userService.DeleteItemsAsync(userIds);
-
-            stopwatch.Stop();
-            _logger.LogInformation($"Deleting a User done in {stopwatch.ElapsedMilliseconds}");
-
-            return Ok();
-        }
-
-        /// <summary>
-        /// Create user
-        /// </summary>
-        /// <param name="userRequestDto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<IActionResult> CreateUser([FromBody] UserRequestDto userRequestDto)
-        {
-            _logger.LogInformation($"Start creating a user");
-            var stopwatch = Stopwatch.StartNew();
-
-            User user = _mapper.Map<User>(userRequestDto);
-            await _userService.AddItemAsync(user);
-
-            stopwatch.Stop();
-            _logger.LogInformation($"Creating a user done in {stopwatch.ElapsedMilliseconds}");
-
-            return Ok();
-        }
-    }
-}
+using AutoMapper;
+using Blueprint.Core.Entities;
+using Blueprint.Core.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+using Template.Core.Dtos.Requests;
+using Template.Core.Dtos.Responses;
+using Template.Core.Interfaces.API;
+
+namespace Template.API.Controllers
+{
+    /// <summary>
+    /// User Controller
+    /// </summary>
+    [Route("rest/v{version:apiVersion}/users")]
+    [Produces("application/json")]
+    [ApiController]
+    public class UserController : Controller
+    {
+        private readonly IMapper _mapper;
+        private ILogger _logger;
+        private readonly IUserService _userService;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="logger"></param>
+        /// <param name="mapper"></param>
+        /// <param name="userService"></param>
+        public UserController(
+            ILogger<UserController> logger,
+            IMapper mapper,
+            IUserService userService)
+        {
+            _mapper = mapper;
+            _logger = logger;
+            _userService = userService;
+        }
+
+        /// <summary>
+        /// Get users
+        /// </summary>
+        /// <param name="pagingParams"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [Authorize(Roles = "Admin")]
+        [ProducesResponseType(typeof(PagerData<UserResponseDto>), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetUsers([FromQuery] PagingParams pagingParams)
+        {
+            _logger.LogInformation($"Start getting users");
+            var stopwatch = Stopwatch.StartNew();
+
+            PagerData<User> users = await _userService.GetItemsAsync(pagingParams);
+            PagerData<UserResponseDto> userResponse = _mapper.Map<PagerData<UserResponseDto>>(users);
+
+            // Add custom headers
+            Response.Headers.Append("X-WP-Total", users.TotalRecords.ToString());
+
+            stopwatch.Stop();
+            _logger.LogInformation($"Getting users done in {stopwatch.ElapsedMilliseconds}");
+
+            return Ok(userResponse.Items);
+        }
+
+        /// <summary>
+        /// Get user by Id
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        [HttpGet("{userId}")]
+        [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetUserById(int userId)
+        {
+            _logger.LogInformation($"Start getting a user with Id = {userId}");
+            var stopwatch = Stopwatch.StartNew();
+
+            User user = await _userService.GetItemByIdAsync(userId);
+            UserResponseDto userResponseDto = _mapper.Map<UserResponseDto>(user);
+
+            stopwatch.Stop();
+            _logger.LogInformation($"Getting an user done in {stopwatch.ElapsedMilliseconds}");
+
+            return Ok(userResponseDto);
+        }
+
+        /// <summary>
+        /// Checking user login
+        /// </summary>
+        /// <param name="token"></param>
+        /// <returns></returns>
+        [HttpGet("check-user-login")]
+        [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+        public async Task<IActionResult> CheckUserLogin()
+        {
+            _logger.LogInformation($"Start checking user login");
+            var stopwatch = Stopwatch.StartNew();
+
+            string? authorizationHeader = Request.Headers["Authorization"].FirstOrDefault();
+            if (string.IsNullOrEmpty(authorizationHeader) || !authorizationHeader.StartsWith("Bearer "))
+            {
+                return Unauthorized("Authorization header missing or invalid.");
+            }
+
+            string token = authorizationHeader.Replace("Bearer ", string.Empty);
+
+            string newToken = await _userService.CheckUserLogin(token);
+
+            stopwatch.Stop();
+            _logger.LogInformation($"Checking user login done in {stopwatch.ElapsedMilliseconds}");
+
+            return Ok(newToken);
+        }
+
+        /// <summary>
+        /// Update User
+        /// </summary>
+        /// <param name="userRequestDto"></param>
+        /// <returns></returns>
+        [HttpPut]
+        [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
+        public async Task<IActionResult> UpdateUser([FromBody] UserRequestDto userRequestDto)
+        {
+            _logger.LogInformation($"Start update a user");
+            var stopwatch = Stopwatch.StartNew();
+
+            User user = _mapper.Map<User>(userRequestDto);
+            await _userService.UpdateItemAsync(user);
+
+            stopwatch.Stop();
+            _logger.LogInformation($"Updating a user done in {stopwatch.ElapsedMilliseconds}");
+
+            return Ok();
+        }
+
+        /// <summary>
+        /// Delete User
+        /// </summary>
+        /// <param name="userIds"></param>
+        /// <returns></returns>
+        [HttpDelete]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<IActionResult> DeleteUser([FromBody] List<int> userIds)
+        {
+            _logger.LogInformation($"Start deleting a User");
+            Stopwatch stopwatch = Stopwatch.StartNew();
+
+            await _userService.DeleteItemsAsync(userIds);
+
+            stopwatch.Stop();
+            _logger.LogInformation($"Deleting a User done in {stopwatch.ElapsedMilliseconds}");
+
+            return Ok();
+        }
+
+        /// <summary>
+        /// Create user
+        /// </summary>
+        /// <param name="userRequestDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<IActionResult> CreateUser([FromBody] UserRequestDto userRequestDto)
+        {
+            _logger.LogInformation($"Start creating a user");
+            var stopwatch = Stopwatch.StartNew();
+
+            User user = _mapper.Map<User>(userRequestDto);
+            await _userService.AddItemAsync(user);
+
+            stopwatch.Stop();
+            _logger.LogInformation($"Creating a user done in {stopwatch.ElapsedMilliseconds}");
+
+            return Ok();
+        }
+    }
+}

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

@@ -1,51 +1,51 @@
-using Blueprint.Core.Interfaces.SPI;
-using Microsoft.AspNetCore.Mvc;
-using System.Text.Json;
-using Template.Core.Dtos.Requests;
-
-namespace Blueprint.API.Controllers
-{
-    [Route("rest/v1.0/users-async")]
-    [ApiController]
-    public class UserControllerAsync: Controller
-    {
-        private readonly IRabbitMqService _rabbitMqService;
-        private readonly ILogger<UserControllerAsync> _logger;
-
-        public UserControllerAsync(IRabbitMqService rabbitMqService, ILogger<UserControllerAsync> logger)
-        {
-            _rabbitMqService = rabbitMqService;
-            _logger = logger;
-        }
-
-        [HttpPost]
-        public IActionResult CreateUser([FromBody] UserRequestDto userRequestDto)
-        {
-            _logger.LogInformation($"Start queuing a user creation request.");
-
-            // Serialize the user data as a message
-            string message = JsonSerializer.Serialize(userRequestDto);
-
-            // Publish the message to RabbitMQ
-            _rabbitMqService.PublishMessage("user-creation-queue", message);
-
-            _logger.LogInformation($"User creation request queued successfully.");
-            return Accepted("User creation request is being processed.");
-        }
-
-        [HttpDelete]
-        public IActionResult DeleteUser([FromBody] List<int> userIds)
-        {
-            _logger.LogInformation($"Start queuing a user deletion request.");
-
-            // Serialize the user IDs as a message
-            string message = JsonSerializer.Serialize(userIds);
-
-            // Publish the message to RabbitMQ
-            _rabbitMqService.PublishMessage("user-deletion-queue", message);
-
-            _logger.LogInformation($"User deletion request queued successfully.");
-            return Accepted("User deletion request is being processed.");
-        }
-    }
-}
+using Blueprint.Core.Interfaces.SPI;
+using Microsoft.AspNetCore.Mvc;
+using System.Text.Json;
+using Template.Core.Dtos.Requests;
+
+namespace Blueprint.API.Controllers
+{
+    [Route("rest/v{version:apiVersion}/users-async")]
+    [ApiController]
+    public class UserControllerAsync: Controller
+    {
+        private readonly IRabbitMqService _rabbitMqService;
+        private readonly ILogger<UserControllerAsync> _logger;
+
+        public UserControllerAsync(IRabbitMqService rabbitMqService, ILogger<UserControllerAsync> logger)
+        {
+            _rabbitMqService = rabbitMqService;
+            _logger = logger;
+        }
+
+        [HttpPost]
+        public IActionResult CreateUser([FromBody] UserRequestDto userRequestDto)
+        {
+            _logger.LogInformation($"Start queuing a user creation request.");
+
+            // Serialize the user data as a message
+            string message = JsonSerializer.Serialize(userRequestDto);
+
+            // Publish the message to RabbitMQ
+            _rabbitMqService.PublishMessage("user-creation-queue", message);
+
+            _logger.LogInformation($"User creation request queued successfully.");
+            return Accepted("User creation request is being processed.");
+        }
+
+        [HttpDelete]
+        public IActionResult DeleteUser([FromBody] List<int> userIds)
+        {
+            _logger.LogInformation($"Start queuing a user deletion request.");
+
+            // Serialize the user IDs as a message
+            string message = JsonSerializer.Serialize(userIds);
+
+            // Publish the message to RabbitMQ
+            _rabbitMqService.PublishMessage("user-deletion-queue", message);
+
+            _logger.LogInformation($"User deletion request queued successfully.");
+            return Accepted("User deletion request is being processed.");
+        }
+    }
+}