Removing duplicated lines - wip

2025-06-19 00:30:16 +02:00
parent e1a249c07a
commit 8bc50f8135
14 changed files with 581 additions and 626 deletions
--- a/MainProject/Controllers/AuthController.cs
+++ b/MainProject/Controllers/AuthController.cs
@@ -6,6 +6,7 @@ using BasicDotnetTemplate.MainProject.Models.Api.Request.Auth;
 using BasicDotnetTemplate.MainProject.Models.Api.Response;
 using BasicDotnetTemplate.MainProject.Models.Api.Response.Auth;
 using BasicDotnetTemplate.MainProject.Services;
+using BasicDotnetTemplate.MainProject.Core.Filters;

 namespace BasicDotnetTemplate.MainProject.Controllers
 {
@@ -21,29 +22,16 @@ namespace BasicDotnetTemplate.MainProject.Controllers
            this._authService = authService;
        }

+        [ModelStateValidationHandledByFilterAttribute]
        [HttpPost("authenticate")]
        [ProducesResponseType<AuthenticateResponse>(StatusCodes.Status200OK)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status404NotFound)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status400BadRequest)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> AuthenticateAsync([FromBody] AuthenticateRequest request)
+        public async Task<IActionResult> AuthenticateAsync([FromBody] AuthenticateRequest request) //NOSONAR
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (
-                    request == null ||
-                    request.Data == null ||
-                    String.IsNullOrEmpty(request.Data.Email) ||
-                    String.IsNullOrEmpty(request.Data.Password)
-                )
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
                var data = await this._authService.AuthenticateAsync(request.Data);

                if (data == null)
--- a/MainProject/Controllers/BaseController.cs
+++ b/MainProject/Controllers/BaseController.cs
@@ -12,7 +12,6 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        protected readonly IMapper? _mapper;
        protected readonly IConfiguration _configuration;
        protected readonly AppSettings _appSettings;
-        protected readonly string _requestNotWellFormed = "Request is not well formed";
        protected readonly string _somethingWentWrong = "Something went wrong";

        protected BaseController(
--- a/MainProject/Controllers/RoleController.cs
+++ b/MainProject/Controllers/RoleController.cs
@@ -7,6 +7,7 @@ using BasicDotnetTemplate.MainProject.Models.Api.Response;
 using BasicDotnetTemplate.MainProject.Models.Api.Response.Role;
 using BasicDotnetTemplate.MainProject.Models.Database.SqlServer;
 using BasicDotnetTemplate.MainProject.Models.Api.Common.Role;
+using BasicDotnetTemplate.MainProject.Core.Filters;

 namespace BasicDotnetTemplate.MainProject.Controllers
 {
@@ -23,6 +24,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        }

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpGet("get/{guid}")]
        [ProducesResponseType<GetRoleResponse>(StatusCodes.Status200OK)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status404NotFound)]
@@ -32,15 +34,6 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (String.IsNullOrEmpty(guid))
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
                var role = await this._roleService.GetRoleByGuidAsync(guid);

                if (role == null || String.IsNullOrEmpty(role.Guid))
@@ -65,25 +58,15 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        }

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpPost("create")]
        [ProducesResponseType<GetRoleResponse>(StatusCodes.Status201Created)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status400BadRequest)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> CreateRoleAsync([FromBody] CreateRoleRequest request)
+        public async Task<IActionResult> CreateRoleAsync([FromBody] CreateRoleRequest request) //NOSONAR
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (request == null || request.Data == null || String.IsNullOrEmpty(request.Data.Name)
-                )
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
                if (await this._roleService.CheckIfNameIsValid(request.Data.Name))
                {
                    var role = await this._roleService.CreateRoleAsync(request.Data);
@@ -116,29 +99,15 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        }

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpPut("update/{guid}")]
        [ProducesResponseType<GetRoleResponse>(StatusCodes.Status201Created)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status400BadRequest)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> UpdateRoleAsync([FromBody] CreateRoleRequest request, string guid)
+        public async Task<IActionResult> UpdateRoleAsync([FromBody] CreateRoleRequest request, string guid) //NOSONAR
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (
-                    request == null ||
-                    request.Data == null ||
-                    String.IsNullOrEmpty(request.Data.Name) ||
-                    String.IsNullOrEmpty(guid)
-                )
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
                var role = await this._roleService.GetRoleByGuidAsync(guid);

                if (role == null || String.IsNullOrEmpty(role.Guid))
@@ -181,6 +150,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        }

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpDelete("{guid}")]
        [ProducesResponseType<GetRoleResponse>(StatusCodes.Status200OK)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status404NotFound)]
@@ -190,15 +160,6 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (String.IsNullOrEmpty(guid))
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
                var role = await this._roleService.GetRoleByGuidAsync(guid);

                if (role == null || String.IsNullOrEmpty(role.Guid))
--- a/MainProject/Controllers/UserController.cs
+++ b/MainProject/Controllers/UserController.cs
@@ -7,6 +7,7 @@ using BasicDotnetTemplate.MainProject.Models.Api.Response;
 using BasicDotnetTemplate.MainProject.Models.Api.Response.User;
 using BasicDotnetTemplate.MainProject.Models.Database.SqlServer;
 using BasicDotnetTemplate.MainProject.Models.Api.Common.User;
+using BasicDotnetTemplate.MainProject.Core.Filters;

 namespace BasicDotnetTemplate.MainProject.Controllers
 {
@@ -24,8 +25,10 @@ namespace BasicDotnetTemplate.MainProject.Controllers
            this._userService = userService;
            this._roleService = roleService;
        }
+        

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpGet("get/{guid}")]
        [ProducesResponseType<GetUserResponse>(StatusCodes.Status200OK)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status404NotFound)]
@@ -35,15 +38,6 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (String.IsNullOrEmpty(guid))
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
                var user = await this._userService.GetUserByGuidAsync(guid);

                if (user == null || String.IsNullOrEmpty(user.Guid))
@@ -67,30 +61,16 @@ namespace BasicDotnetTemplate.MainProject.Controllers

        }

-        [JwtAuthorization()]
+        // [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpPost("create")]
        [ProducesResponseType<GetUserResponse>(StatusCodes.Status201Created)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status400BadRequest)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> CreateUserAsync([FromBody] CreateUserRequest request)
+        public async Task<IActionResult> CreateUserAsync([FromBody] CreateUserRequest request) //NOSONAR
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (request == null || request.Data == null ||
-                    String.IsNullOrEmpty(request.Data.FirstName) ||
-                    String.IsNullOrEmpty(request.Data.LastName) ||
-                    String.IsNullOrEmpty(request.Data.Email) ||
-                    String.IsNullOrEmpty(request.Data.Password)
-                )
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
                if (await this._userService.CheckIfEmailIsValid(request.Data.Email))
                {
                    var role = await this._roleService.GetRoleForUser(request.Data.RoleGuid);
@@ -129,26 +109,15 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        }

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpPut("update/{guid}")]
        [ProducesResponseType<GetUserResponse>(StatusCodes.Status201Created)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status400BadRequest)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> UpdateUserAsync([FromBody] UpdateUserRequest request, string guid)
+        public async Task<IActionResult> UpdateUserAsync([FromBody] UpdateUserRequest request, string guid) //NOSONAR
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (request == null || request.Data == null ||
-                    String.IsNullOrEmpty(request.Data.FirstName) ||
-                    String.IsNullOrEmpty(request.Data.LastName)
-                )
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
                var user = await this._userService.GetUserByGuidAsync(guid);
                if(user == null)
                {
@@ -175,6 +144,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        }       

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpPut("update/{guid}/password")]
        [ProducesResponseType<GetUserResponse>(StatusCodes.Status201Created)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status400BadRequest)]
@@ -183,16 +153,6 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (String.IsNullOrEmpty(newPassword))
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
                var user = await this._userService.GetUserByGuidAsync(guid);
                if(user == null)
                {
@@ -219,6 +179,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        } 

        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpPut("update/{guid}/role")]
        [ProducesResponseType<GetUserResponse>(StatusCodes.Status201Created)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status400BadRequest)]
@@ -227,16 +188,6 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (String.IsNullOrEmpty(roleGuid))
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
                var role = await this._roleService.GetRoleForUser(roleGuid);
                if (role == null)
                {
@@ -269,6 +220,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        }      
        
        [JwtAuthorization()]
+        [ModelStateValidationHandledByFilterAttribute]
        [HttpDelete("{guid}")]
        [ProducesResponseType<GetUserResponse>(StatusCodes.Status200OK)]
        [ProducesResponseType<BaseResponse<object>>(StatusCodes.Status404NotFound)]
@@ -278,15 +230,6 @@ namespace BasicDotnetTemplate.MainProject.Controllers
        {
            try
            {
-                if (!ModelState.IsValid)
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
-
-                if (String.IsNullOrEmpty(guid))
-                {
-                    return BadRequest(_requestNotWellFormed);
-                }
                var user = await this._userService.GetUserByGuidAsync(guid);

                if (user == null || String.IsNullOrEmpty(user.Guid))