simona/dotnet-template
Template
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing sonarcloud issues

Browse Source
This commit is contained in:
Caterina Simona Pastore
2025-06-19 19:29:05 +02:00
parent 1fc8e6cc1c
commit e03db76496
62 changed files with 152 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.editorconfig Normal file
View File

@@ -0,0 +1,23 @@
# top-most EditorConfig file
root = true
# Core EditorConfig properties
[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.cs]
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_naming_rule.types.symbols = types
dotnet_naming_rule.types.style = pascal_case
dotnet_naming_rule.types.severity = warning
csharp_prefer_braced_block = true:suggestion
csharp_preserve_single_line_blocks = true
csharp_style_expression_bodied_methods = when_on_single_line:suggestion

10
MainProject.Tests/Controllers/AuthController_Tests.cs
View File

@@ -66,7 +66,7 @@ public class AuthController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status200OK);
Assert.AreEqual(StatusCodes.Status200OK, result.Status);
Assert.IsInstanceOfType(result.Data, typeof(AuthenticatedUser));
}
else
@@ -103,7 +103,7 @@ public class AuthController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -173,7 +173,7 @@ public class AuthController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -212,8 +212,8 @@ public class AuthController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status500InternalServerError);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message );
Assert.AreEqual(StatusCodes.Status500InternalServerError, result.Status);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message);
}
else
{

52
MainProject.Tests/Controllers/RoleController_Tests.cs
View File

@@ -75,7 +75,7 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status200OK);
Assert.AreEqual(StatusCodes.Status200OK, result.Status);
Assert.IsInstanceOfType(result.Data, typeof(RoleDto));
}
else
@@ -110,7 +110,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -172,7 +172,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -207,8 +207,8 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status500InternalServerError);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message );
Assert.AreEqual(StatusCodes.Status500InternalServerError, result.Status);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message);
}
else
{
@@ -260,7 +260,7 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status200OK);
Assert.AreEqual(StatusCodes.Status200OK, result.Status);
Assert.IsInstanceOfType(result.Data, typeof(RoleDto));
}
else
@@ -302,8 +302,8 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
Assert.AreEqual("Invalid name", result.Message );
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
Assert.AreEqual("Invalid name", result.Message);
}
else
{
@@ -346,7 +346,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -396,8 +396,8 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
Assert.IsTrue(result.Message == "Not created");
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
Assert.AreEqual("Not created", result.Message);
}
else
{
@@ -446,7 +446,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -499,8 +499,8 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status500InternalServerError);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message );
Assert.AreEqual(StatusCodes.Status500InternalServerError, result.Status);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message);
}
else
{
@@ -560,7 +560,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -622,7 +622,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -657,8 +657,8 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status500InternalServerError);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message );
Assert.AreEqual(StatusCodes.Status500InternalServerError, result.Status);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message);
}
else
{
@@ -713,7 +713,7 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status200OK);
Assert.AreEqual(StatusCodes.Status200OK, result.Status);
Assert.IsInstanceOfType(result.Data, typeof(RoleDto));
}
else
@@ -791,8 +791,8 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
Assert.AreEqual("Invalid name", result.Message );
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
Assert.AreEqual("Invalid name", result.Message);
}
else
{
@@ -837,7 +837,7 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
Assert.IsTrue(result.Message == "This role is not editable");
}
else
@@ -879,7 +879,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -927,7 +927,7 @@ public class RoleController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -981,8 +981,8 @@ public class RoleController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status500InternalServerError);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message );
Assert.AreEqual(StatusCodes.Status500InternalServerError, result.Status);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message);
}
else
{

28
MainProject.Tests/Controllers/UserController_Tests.cs
View File

@@ -85,7 +85,7 @@ public class UserController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status200OK);
Assert.AreEqual(StatusCodes.Status200OK, result.Status);
Assert.IsInstanceOfType(result.Data, typeof(UserDto));
}
else
@@ -120,7 +120,7 @@ public class UserController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -182,7 +182,7 @@ public class UserController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -217,8 +217,8 @@ public class UserController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status500InternalServerError);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message );
Assert.AreEqual(StatusCodes.Status500InternalServerError, result.Status);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message);
}
else
{
@@ -270,7 +270,7 @@ public class UserController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status200OK);
Assert.AreEqual(StatusCodes.Status200OK, result.Status);
Assert.IsInstanceOfType(result.Data, typeof(UserDto));
}
else
@@ -316,7 +316,7 @@ public class UserController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
Assert.IsTrue(result.Message == "Invalid email");
}
else
@@ -367,7 +367,7 @@ public class UserController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
Assert.IsTrue(result.Message == "Role not found");
}
else
@@ -412,7 +412,7 @@ public class UserController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
// else
@@ -467,8 +467,8 @@ public class UserController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
Assert.IsTrue(result.Message == "Not created");
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
Assert.AreEqual("Not created", result.Message);
}
else
{
@@ -520,7 +520,7 @@ public class UserController_Tests
// var result = (BaseResponse<object>)response.Value;
// if (result != null)
// {
// Assert.IsTrue(result.Status == StatusCodes.Status400BadRequest);
// Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
// Console.WriteLine(JsonConvert.SerializeObject(result));
// Assert.IsTrue(result.Message == "Request is not well formed");
// }
@@ -582,8 +582,8 @@ public class UserController_Tests
var result = (BaseResponse<object>)response.Value;
if (result != null)
{
Assert.IsTrue(result.Status == StatusCodes.Status500InternalServerError);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message );
Assert.AreEqual(StatusCodes.Status500InternalServerError, result.Status);
Assert.AreEqual("Something went wrong. Unexpected error", result.Message);
}
else
{

4
MainProject.Tests/Services/UserService_Tests.cs
View File

@@ -366,7 +366,7 @@ public class UserService_Tests
var user = await _userService.UpdateUserPasswordAsync(_user!, "this-is-a-new-password");
Assert.IsInstanceOfType(user, typeof(User));
Assert.IsNotNull(user);
Assert.IsTrue(user.Password != oldPassword);
Assert.AreNotEqual(user.Password, oldPassword);
}
else
{
@@ -424,7 +424,7 @@ public class UserService_Tests
var user = await _userService.UpdateUserRoleAsync(_user!, role);
Assert.IsInstanceOfType(user, typeof(User));
Assert.IsNotNull(user);
Assert.IsTrue(user.Role?.Id != oldRole?.Id);
Assert.AreNotEqual(user.Role?.Id, oldRole?.Id);
}
else
{

8
MainProject/Controllers/RoleController.cs
View File

@@ -67,9 +67,9 @@ namespace BasicDotnetTemplate.MainProject.Controllers
{
try
{
if (await this._roleService.CheckIfNameIsValid(request.Data.Name))
if (await this._roleService.CheckIfNameIsValid(request!.Data!.Name))
{
var role = await this._roleService.CreateRoleAsync(request.Data);
var role = await this._roleService.CreateRoleAsync(request!.Data);
if (role == null || String.IsNullOrEmpty(role.Guid))
{
@@ -121,8 +121,8 @@ namespace BasicDotnetTemplate.MainProject.Controllers
}
if (
await this._roleService.CheckIfNameIsValid(request.Data.Name) ||
await this._roleService.CheckIfNameIsValid(request.Data.Name, guid)
await this._roleService.CheckIfNameIsValid(request!.Data!.Name) ||
await this._roleService.CheckIfNameIsValid(request!.Data!.Name, guid)
)
{
role = await this._roleService.UpdateRoleAsync(request.Data, role);

10
MainProject/Controllers/UserController.cs
View File

@@ -73,13 +73,13 @@ namespace BasicDotnetTemplate.MainProject.Controllers
{
if (await this._userService.CheckIfEmailIsValid(request!.Data!.Email))
{
var role = await this._roleService.GetRoleForUser(request.Data.RoleGuid);
var role = await this._roleService.GetRoleForUser(request!.Data!.RoleGuid);
if (role == null)
{
return BadRequest("Role not found");
}
var user = await this._userService.CreateUserAsync(request.Data, role);
var user = await this._userService.CreateUserAsync(request!.Data, role);
if (user == null || String.IsNullOrEmpty(user.Guid))
{
@@ -119,7 +119,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
try
{
var user = await this._userService.GetUserByGuidAsync(guid);
if(user == null)
if (user == null)
{
return NotFound();
}
@@ -154,7 +154,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
try
{
var user = await this._userService.GetUserByGuidAsync(guid);
if(user == null)
if (user == null)
{
return NotFound();
}
@@ -195,7 +195,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
}
var user = await this._userService.GetUserByGuidAsync(guid);
if(user == null)
if (user == null)
{
return NotFound();
}

2
MainProject/Migrations/20240904211920_InitialCreate.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20241129231345_Try.cs
View File

@@ -1,4 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20250311195750_AlterTableUser.cs
View File

@@ -1,4 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20250312234517_AlterTableUserMaxLengthIndexes.cs
View File

@@ -1,4 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20250316014620_AlterTablesUsersAndRoles.cs
View File

@@ -1,4 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20250316212343_AlterBaseUpdateTimeDeletionTimeNullable.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20250316212722_AlterTableRoleAddedIsNotEditable.cs
View File

@@ -1,4 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20250426183010_AddingPermissionsTables.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Migrations/20250617183212_AlterTableUsersForPasswordEncryption.cs
View File

@@ -1,4 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

2
MainProject/Models/Api/Common/Role/UserRole.cs
View File

@@ -9,7 +9,7 @@ public class UserRole
public string? Name { get; set; }
#nullable disable
public UserRole() {}
public UserRole() { }
public UserRole(DatabaseSqlServer.Role role)
{

2
MainProject/Models/Common/OperationInfo.cs
View File

@@ -4,6 +4,6 @@ public class OperationInfo
{
#nullable enable
public string? Operation { get; set; }
public List<string>? Roles {get; set; }
public List<string>? Roles { get; set; }
#nullable disable
}

2
MainProject/Models/Common/PermissionInfo.cs
View File

@@ -4,6 +4,6 @@ public class PermissionInfo
{
#nullable enable
public string? System { get; set; }
public List<RolePermissionModuleOperation>? RolePermissionModuleOperations {get; set; }
public List<RolePermissionModuleOperation>? RolePermissionModuleOperations { get; set; }
#nullable disable
}

2
MainProject/Program.cs
View File

@@ -1,4 +1,4 @@
using NLog;
using NLog;
using BasicDotnetTemplate.MainProject.Models.Settings;
using System.Reflection;
using BasicDotnetTemplate.MainProject.Utils;

2
MainProject/Services/UserService.cs
View File

@@ -191,7 +191,7 @@ public class UserService : BaseService, IUserService
user.PasswordSalt = salt;
user.PasswordPepper = pepper;
user.PasswordIterations = iterations;
user.PasswordIterations = iterations;
user.Password = CryptUtils.GeneratePassword(newPassword, salt, iterations, pepper);
user.UpdateTime = DateTime.UtcNow;
user.UpdateUserId = this.GetCurrentUserId();