Sprint 8 #43
@@ -10,14 +10,6 @@ charset = utf-8
|
|||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
insert_final_newline = 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_prefer_braced_block = true:suggestion
|
||||||
csharp_preserve_single_line_blocks = true
|
csharp_preserve_single_line_blocks = true
|
||||||
csharp_style_expression_bodied_methods = when_on_single_line:suggestion
|
csharp_style_expression_bodied_methods = when_on_single_line:suggestion
|
||||||
|
|||||||
@@ -838,7 +838,7 @@ public class RoleController_Tests
|
|||||||
if (result != null)
|
if (result != null)
|
||||||
{
|
{
|
||||||
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
|
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
|
||||||
Assert.IsTrue(result.Message == "This role is not editable");
|
Assert.AreEqual("This role is not editable", result.Message);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -317,7 +317,7 @@ public class UserController_Tests
|
|||||||
if (result != null)
|
if (result != null)
|
||||||
{
|
{
|
||||||
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
|
Assert.AreEqual(StatusCodes.Status400BadRequest, result.Status);
|
||||||
Assert.IsTrue(result.Message == "Invalid email");
|
Assert.AreEqual("Invalid email", result.Message);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -23,9 +23,9 @@ public class UserRole_Tests
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
DatabaseSqlServer.Role role = ModelsInit.CreateRole();
|
DatabaseSqlServer.Role role = ModelsInit.CreateRole();
|
||||||
UserRole userRole = new UserRole(role);
|
UserRole userRole = new(role);
|
||||||
|
|
||||||
Assert.IsTrue(userRole.Name == role.Name);
|
Assert.AreEqual(role.Name, userRole.Name);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -25,9 +25,9 @@ public class AuthenticatedUser_Tests
|
|||||||
DatabaseSqlServer.User user = ModelsInit.CreateUser();
|
DatabaseSqlServer.User user = ModelsInit.CreateUser();
|
||||||
AuthenticatedUser authenticatedUser = new AuthenticatedUser(user);
|
AuthenticatedUser authenticatedUser = new AuthenticatedUser(user);
|
||||||
|
|
||||||
Assert.IsTrue(authenticatedUser.FirstName == user.FirstName);
|
Assert.AreEqual(user.FirstName, authenticatedUser.FirstName);
|
||||||
Assert.IsTrue(authenticatedUser.LastName == user.LastName);
|
Assert.AreEqual(user.LastName, authenticatedUser.LastName);
|
||||||
Assert.IsTrue(authenticatedUser.Email == user.Email);
|
Assert.AreEqual(user.Email, authenticatedUser.Email);
|
||||||
Assert.IsInstanceOfType(authenticatedUser.Role, typeof(UserRole));
|
Assert.IsInstanceOfType(authenticatedUser.Role, typeof(UserRole));
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var data = await this._authService.AuthenticateAsync(request.Data);
|
var data = await this._authService.AuthenticateAsync(request!.Data);
|
||||||
|
|
||||||
if (data == null)
|
if (data == null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ namespace BasicDotnetTemplate.MainProject.Controllers
|
|||||||
return NotFound();
|
return NotFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
user = await this._userService.UpdateUserAsync(request.Data, user);
|
user = await this._userService.UpdateUserAsync(request!.Data, user);
|
||||||
|
|
||||||
var userDto = _mapper?.Map<UserDto>(user);
|
var userDto = _mapper?.Map<UserDto>(user);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user