diff --git a/CleanArchitecture.Api/CleanArchitecture.Api.csproj b/CleanArchitecture.Api/CleanArchitecture.Api.csproj index 2ff7087..8abb896 100644 --- a/CleanArchitecture.Api/CleanArchitecture.Api.csproj +++ b/CleanArchitecture.Api/CleanArchitecture.Api.csproj @@ -7,13 +7,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/CleanArchitecture.Application/CleanArchitecture.Application.csproj b/CleanArchitecture.Application/CleanArchitecture.Application.csproj index 1fcc7a9..90df52f 100644 --- a/CleanArchitecture.Application/CleanArchitecture.Application.csproj +++ b/CleanArchitecture.Application/CleanArchitecture.Application.csproj @@ -6,7 +6,7 @@ - + diff --git a/CleanArchitecture.Application/Services/UserService.cs b/CleanArchitecture.Application/Services/UserService.cs index da20411..8ab4600 100644 --- a/CleanArchitecture.Application/Services/UserService.cs +++ b/CleanArchitecture.Application/Services/UserService.cs @@ -47,8 +47,8 @@ public sealed class UserService : IUserService await _bus.SendCommandAsync(new CreateUserCommand( userId, user.Email, - user.Surname, - user.GivenName, + user.FirstName, + user.LastName, user.Password)); return userId; @@ -59,8 +59,8 @@ public sealed class UserService : IUserService await _bus.SendCommandAsync(new UpdateUserCommand( user.Id, user.Email, - user.Surname, - user.GivenName, + user.FirstName, + user.LastName, user.Role)); } diff --git a/CleanArchitecture.Application/gRPC/UsersApiImplementation.cs b/CleanArchitecture.Application/gRPC/UsersApiImplementation.cs index 97e1b11..d8f9599 100644 --- a/CleanArchitecture.Application/gRPC/UsersApiImplementation.cs +++ b/CleanArchitecture.Application/gRPC/UsersApiImplementation.cs @@ -39,8 +39,8 @@ public sealed class UsersApiImplementation : UsersApi.UsersApiBase { Id = user.Id.ToString(), Email = user.Email, - FirstName = user.GivenName, - LastName = user.Surname, + FirstName = user.FirstName, + LastName = user.LastName, IsDeleted = user.Deleted }) .ToListAsync(); diff --git a/CleanArchitecture.Application/viewmodels/Users/CreateUserViewModel.cs b/CleanArchitecture.Application/viewmodels/Users/CreateUserViewModel.cs index 3efbb36..2197419 100644 --- a/CleanArchitecture.Application/viewmodels/Users/CreateUserViewModel.cs +++ b/CleanArchitecture.Application/viewmodels/Users/CreateUserViewModel.cs @@ -2,6 +2,6 @@ namespace CleanArchitecture.Application.ViewModels.Users; public sealed record CreateUserViewModel( string Email, - string Surname, - string GivenName, + string FirstName, + string LastName, string Password); \ No newline at end of file diff --git a/CleanArchitecture.Application/viewmodels/Users/UpdateUserViewModel.cs b/CleanArchitecture.Application/viewmodels/Users/UpdateUserViewModel.cs index 137d30f..1826704 100644 --- a/CleanArchitecture.Application/viewmodels/Users/UpdateUserViewModel.cs +++ b/CleanArchitecture.Application/viewmodels/Users/UpdateUserViewModel.cs @@ -6,6 +6,6 @@ namespace CleanArchitecture.Application.ViewModels.Users; public sealed record UpdateUserViewModel( Guid Id, string Email, - string Surname, - string GivenName, + string FirstName, + string LastName, UserRole Role); \ No newline at end of file diff --git a/CleanArchitecture.Application/viewmodels/Users/UserViewModel.cs b/CleanArchitecture.Application/viewmodels/Users/UserViewModel.cs index 53f2aa9..ea6e2da 100644 --- a/CleanArchitecture.Application/viewmodels/Users/UserViewModel.cs +++ b/CleanArchitecture.Application/viewmodels/Users/UserViewModel.cs @@ -8,8 +8,8 @@ public sealed class UserViewModel { public Guid Id { get; set; } public string Email { get; set; } = string.Empty; - public string GivenName { get; set; } = string.Empty; - public string Surname { get; set; } = string.Empty; + public string FirstName { get; set; } = string.Empty; + public string LastName { get; set; } = string.Empty; public UserRole Role { get; set; } public static UserViewModel FromUser(User user) @@ -18,8 +18,8 @@ public sealed class UserViewModel { Id = user.Id, Email = user.Email, - GivenName = user.GivenName, - Surname = user.Surname, + FirstName = user.FirstName, + LastName = user.LastName, Role = user.Role }; } diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandValidationTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandValidationTests.cs index 05a8d1b..f4635df 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandValidationTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/User/CreateUser/CreateUserCommandValidationTests.cs @@ -67,47 +67,47 @@ public sealed class CreateUserCommandValidationTests : } [Fact] - public void Should_Be_Invalid_For_Empty_Surname() + public void Should_Be_Invalid_For_Empty_First_Name() { - var command = CreateTestCommand(surName: ""); + var command = CreateTestCommand(firstName: ""); ShouldHaveSingleError( command, - DomainErrorCodes.UserEmptySurname, - "Surname may not be empty"); + DomainErrorCodes.UserEmptyFirstName, + "FirstName may not be empty"); } [Fact] - public void Should_Be_Invalid_For_Surname_Exceeds_Max_Length() + public void Should_Be_Invalid_For_First_Name_Exceeds_Max_Length() { - var command = CreateTestCommand(surName: new string('a', 101)); + var command = CreateTestCommand(firstName: new string('a', 101)); ShouldHaveSingleError( command, - DomainErrorCodes.UserSurnameExceedsMaxLength, - "Surname may not be longer than 100 characters"); + DomainErrorCodes.UserFirstNameExceedsMaxLength, + "FirstName may not be longer than 100 characters"); } [Fact] - public void Should_Be_Invalid_For_Empty_Given_Name() + public void Should_Be_Invalid_For_Empty_Last_Name() { - var command = CreateTestCommand(givenName: ""); + var command = CreateTestCommand(lastName: ""); ShouldHaveSingleError( command, - DomainErrorCodes.UserEmptyGivenName, - "Given name may not be empty"); + DomainErrorCodes.UserEmptyLastName, + "LastName may not be empty"); } [Fact] - public void Should_Be_Invalid_For_Given_Name_Exceeds_Max_Length() + public void Should_Be_Invalid_For_Last_Name_Exceeds_Max_Length() { - var command = CreateTestCommand(givenName: new string('a', 101)); + var command = CreateTestCommand(lastName: new string('a', 101)); ShouldHaveSingleError( command, - DomainErrorCodes.UserGivenNameExceedsMaxLength, - "Given name may not be longer than 100 characters"); + DomainErrorCodes.UserLastNameExceedsMaxLength, + "LastName may not be longer than 100 characters"); } [Fact] @@ -179,15 +179,15 @@ public sealed class CreateUserCommandValidationTests : private static CreateUserCommand CreateTestCommand( Guid? userId = null, string? email = null, - string? surName = null, - string? givenName = null, + string? firstName = null, + string? lastName = null, string? password = null) { return new( userId ?? Guid.NewGuid(), email ?? "test@email.com", - surName ?? "test", - givenName ?? "email", + firstName ?? "test", + lastName ?? "email", password ?? "Po=PF]PC6t.?8?ks)A6W"); } } \ No newline at end of file diff --git a/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandValidationTests.cs b/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandValidationTests.cs index 2fe4e21..7a919f4 100644 --- a/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandValidationTests.cs +++ b/CleanArchitecture.Domain.Tests/CommandHandler/User/UpdateUser/UpdateUserCommandValidationTests.cs @@ -66,61 +66,61 @@ public sealed class UpdateUserCommandValidationTests : } [Fact] - public void Should_Be_Invalid_For_Empty_Surname() + public void Should_Be_Invalid_For_Empty_First_Name() { - var command = CreateTestCommand(surName: ""); + var command = CreateTestCommand(firstName: ""); ShouldHaveSingleError( command, - DomainErrorCodes.UserEmptySurname, - "Surname may not be empty"); + DomainErrorCodes.UserEmptyFirstName, + "FirstName may not be empty"); } [Fact] - public void Should_Be_Invalid_For_Surname_Exceeds_Max_Length() + public void Should_Be_Invalid_For_First_Name_Exceeds_Max_Length() { - var command = CreateTestCommand(surName: new string('a', 101)); + var command = CreateTestCommand(firstName: new string('a', 101)); ShouldHaveSingleError( command, - DomainErrorCodes.UserSurnameExceedsMaxLength, - "Surname may not be longer than 100 characters"); + DomainErrorCodes.UserFirstNameExceedsMaxLength, + "FirstName may not be longer than 100 characters"); } [Fact] - public void Should_Be_Invalid_For_Empty_Given_Name() + public void Should_Be_Invalid_For_Empty_Last_Name() { - var command = CreateTestCommand(givenName: ""); + var command = CreateTestCommand(lastName: ""); ShouldHaveSingleError( command, - DomainErrorCodes.UserEmptyGivenName, - "Given name may not be empty"); + DomainErrorCodes.UserEmptyLastName, + "LastName may not be empty"); } [Fact] - public void Should_Be_Invalid_For_Given_Name_Exceeds_Max_Length() + public void Should_Be_Invalid_For_Last_Name_Exceeds_Max_Length() { - var command = CreateTestCommand(givenName: new string('a', 101)); + var command = CreateTestCommand(lastName: new string('a', 101)); ShouldHaveSingleError( command, - DomainErrorCodes.UserGivenNameExceedsMaxLength, - "Given name may not be longer than 100 characters"); + DomainErrorCodes.UserLastNameExceedsMaxLength, + "LastName may not be longer than 100 characters"); } private static UpdateUserCommand CreateTestCommand( Guid? userId = null, string? email = null, - string? surName = null, - string? givenName = null, + string? firstName = null, + string? lastName = null, UserRole? role = null) { return new( userId ?? Guid.NewGuid(), email ?? "test@email.com", - surName ?? "test", - givenName ?? "email", + firstName ?? "test", + lastName ?? "email", role ?? UserRole.User); } } \ No newline at end of file diff --git a/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj b/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj index 3774cae..e0d653c 100644 --- a/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj +++ b/CleanArchitecture.Domain/CleanArchitecture.Domain.csproj @@ -6,12 +6,12 @@ - - - - - - + + + + + + diff --git a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommand.cs b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommand.cs index bafd286..c9e9e79 100644 --- a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommand.cs +++ b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommand.cs @@ -9,21 +9,21 @@ public sealed class CreateUserCommand : CommandBase public CreateUserCommand( Guid userId, string email, - string surname, - string givenName, + string firstName, + string lastName, string password) : base(userId) { UserId = userId; Email = email; - Surname = surname; - GivenName = givenName; + FirstName = firstName; + LastName = lastName; Password = password; } public Guid UserId { get; } public string Email { get; } - public string Surname { get; } - public string GivenName { get; } + public string FirstName { get; } + public string LastName { get; } public string Password { get; } public override bool IsValid() diff --git a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs index a639591..98e1b2b 100644 --- a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandHandler.cs @@ -62,8 +62,8 @@ public sealed class CreateUserCommandHandler : CommandHandlerBase, var user = new User( request.UserId, request.Email, - request.Surname, - request.GivenName, + request.FirstName, + request.LastName, passwordHash, UserRole.User); diff --git a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandValidation.cs b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandValidation.cs index 23be1aa..196db14 100644 --- a/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandValidation.cs +++ b/CleanArchitecture.Domain/Commands/Users/CreateUser/CreateUserCommandValidation.cs @@ -10,8 +10,8 @@ public sealed class CreateUserCommandValidation : AbstractValidator cmd.Surname) + RuleFor(cmd => cmd.FirstName) .NotEmpty() - .WithErrorCode(DomainErrorCodes.UserEmptySurname) - .WithMessage("Surname may not be empty") + .WithErrorCode(DomainErrorCodes.UserEmptyFirstName) + .WithMessage("FirstName may not be empty") .MaximumLength(100) - .WithErrorCode(DomainErrorCodes.UserSurnameExceedsMaxLength) - .WithMessage("Surname may not be longer than 100 characters"); + .WithErrorCode(DomainErrorCodes.UserFirstNameExceedsMaxLength) + .WithMessage("FirstName may not be longer than 100 characters"); } - private void AddRuleForGivenName() + private void AddRuleForLastName() { - RuleFor(cmd => cmd.GivenName) + RuleFor(cmd => cmd.LastName) .NotEmpty() - .WithErrorCode(DomainErrorCodes.UserEmptyGivenName) - .WithMessage("Given name may not be empty") + .WithErrorCode(DomainErrorCodes.UserEmptyLastName) + .WithMessage("LastName may not be empty") .MaximumLength(100) - .WithErrorCode(DomainErrorCodes.UserGivenNameExceedsMaxLength) - .WithMessage("Given name may not be longer than 100 characters"); + .WithErrorCode(DomainErrorCodes.UserLastNameExceedsMaxLength) + .WithMessage("LastName may not be longer than 100 characters"); } private void AddRuleForPassword() diff --git a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommand.cs b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommand.cs index 918bec9..13bc3d9 100644 --- a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommand.cs +++ b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommand.cs @@ -10,21 +10,21 @@ public sealed class UpdateUserCommand : CommandBase public UpdateUserCommand( Guid userId, string email, - string surname, - string givenName, + string firstName, + string lastName, UserRole role) : base(userId) { UserId = userId; Email = email; - Surname = surname; - GivenName = givenName; + FirstName = firstName; + LastName = lastName; Role = role; } public Guid UserId { get; } public string Email { get; } - public string Surname { get; } - public string GivenName { get; } + public string FirstName { get; } + public string LastName { get; } public UserRole Role { get; } public override bool IsValid() diff --git a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs index 6f882e3..cc40b23 100644 --- a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs +++ b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandHandler.cs @@ -63,8 +63,8 @@ public sealed class UpdateUserCommandHandler : CommandHandlerBase, } user.SetEmail(request.Email); - user.SetSurname(request.Surname); - user.SetGivenName(request.GivenName); + user.SetFirstName(request.FirstName); + user.SetLastName(request.LastName); _userRepository.Update(user); diff --git a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandValidation.cs b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandValidation.cs index f0afc67..2b29a94 100644 --- a/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandValidation.cs +++ b/CleanArchitecture.Domain/Commands/Users/UpdateUser/UpdateUserCommandValidation.cs @@ -9,8 +9,8 @@ public sealed class UpdateUserCommandValidation : AbstractValidator cmd.Surname) + RuleFor(cmd => cmd.FirstName) .NotEmpty() - .WithErrorCode(DomainErrorCodes.UserEmptySurname) - .WithMessage("Surname may not be empty") + .WithErrorCode(DomainErrorCodes.UserEmptyFirstName) + .WithMessage("FirstName may not be empty") .MaximumLength(100) - .WithErrorCode(DomainErrorCodes.UserSurnameExceedsMaxLength) - .WithMessage("Surname may not be longer than 100 characters"); + .WithErrorCode(DomainErrorCodes.UserFirstNameExceedsMaxLength) + .WithMessage("FirstName may not be longer than 100 characters"); } - private void AddRuleForGivenName() + private void AddRuleForLastName() { - RuleFor(cmd => cmd.GivenName) + RuleFor(cmd => cmd.LastName) .NotEmpty() - .WithErrorCode(DomainErrorCodes.UserEmptyGivenName) - .WithMessage("Given name may not be empty") + .WithErrorCode(DomainErrorCodes.UserEmptyLastName) + .WithMessage("LastName may not be empty") .MaximumLength(100) - .WithErrorCode(DomainErrorCodes.UserGivenNameExceedsMaxLength) - .WithMessage("Given name may not be longer than 100 characters"); + .WithErrorCode(DomainErrorCodes.UserLastNameExceedsMaxLength) + .WithMessage("LastName may not be longer than 100 characters"); } private void AddRuleForRole() diff --git a/CleanArchitecture.Domain/Entities/User.cs b/CleanArchitecture.Domain/Entities/User.cs index b92cd3e..4d9ddd3 100644 --- a/CleanArchitecture.Domain/Entities/User.cs +++ b/CleanArchitecture.Domain/Entities/User.cs @@ -9,25 +9,25 @@ public class User : Entity public User( Guid id, string email, - string surname, - string givenName, + string firstname, + string lastName, string password, UserRole role) : base(id) { Email = email; - GivenName = givenName; - Surname = surname; + FirstName = firstname; + LastName = lastName; Password = password; Role = role; } public string Email { get; private set; } - public string GivenName { get; private set; } - public string Surname { get; private set; } + public string FirstName { get; private set; } + public string LastName { get; private set; } public string Password { get; private set; } public UserRole Role { get; private set; } - public string FullName => $"{Surname}, {GivenName}"; + public string FullName => $"{FirstName}, {LastName}"; [MemberNotNull(nameof(Email))] public void SetEmail(string email) @@ -46,38 +46,38 @@ public class User : Entity Email = email; } - [MemberNotNull(nameof(GivenName))] - public void SetGivenName(string givenName) + [MemberNotNull(nameof(FirstName))] + public void SetFirstName(string firstName) { - if (givenName == null) + if (firstName == null) { - throw new ArgumentNullException(nameof(givenName)); + throw new ArgumentNullException(nameof(firstName)); } - if (givenName.Length > 100) + if (firstName.Length > 100) { throw new ArgumentException( - "Given name may not be longer than 100 characters"); + "First name may not be longer than 100 characters"); } - GivenName = givenName; + FirstName = firstName; } - [MemberNotNull(nameof(Surname))] - public void SetSurname(string surname) + [MemberNotNull(nameof(LastName))] + public void SetLastName(string lastName) { - if (surname == null) + if (lastName == null) { - throw new ArgumentNullException(nameof(surname)); + throw new ArgumentNullException(nameof(lastName)); } - if (surname.Length > 100) + if (lastName.Length > 100) { throw new ArgumentException( - "Surname may not be longer than 100 characters"); + "Last name may not be longer than 100 characters"); } - Surname = surname; + LastName = lastName; } [MemberNotNull(nameof(Password))] diff --git a/CleanArchitecture.Domain/Errors/DomainErrorCodes.cs b/CleanArchitecture.Domain/Errors/DomainErrorCodes.cs index 6c486cf..a6091de 100644 --- a/CleanArchitecture.Domain/Errors/DomainErrorCodes.cs +++ b/CleanArchitecture.Domain/Errors/DomainErrorCodes.cs @@ -4,11 +4,11 @@ public static class DomainErrorCodes { // User Validation public const string UserEmptyId = "USER_EMPTY_ID"; - public const string UserEmptySurname = "USER_EMPTY_SURNAME"; - public const string UserEmptyGivenName = "USER_EMPTY_GIVEN_NAME"; + public const string UserEmptyFirstName = "USER_EMPTY_FIRST_NAME"; + public const string UserEmptyLastName = "USER_EMPTY_LAST_NAME"; public const string UserEmailExceedsMaxLength = "USER_EMAIL_EXCEEDS_MAX_LENGTH"; - public const string UserSurnameExceedsMaxLength = "USER_SURNAME_EXCEEDS_MAX_LENGTH"; - public const string UserGivenNameExceedsMaxLength = "USER_GIVEN_NAME_EXCEEDS_MAX_LENGTH"; + public const string UserFirstNameExceedsMaxLength = "USER_FIRST_NAME_EXCEEDS_MAX_LENGTH"; + public const string UserLastNameExceedsMaxLength = "USER_LAST_NAME_EXCEEDS_MAX_LENGTH"; public const string UserInvalidEmail = "USER_INVALID_EMAIL"; public const string UserInvalidRole = "USER_INVALID_ROLE"; diff --git a/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj b/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj index 01399f8..f84484a 100644 --- a/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj +++ b/CleanArchitecture.Infrastructure/CleanArchitecture.Infrastructure.csproj @@ -6,15 +6,15 @@ - + - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/CleanArchitecture.Infrastructure/Configurations/UserConfiguration.cs b/CleanArchitecture.Infrastructure/Configurations/UserConfiguration.cs index 4763c9c..ecd3505 100644 --- a/CleanArchitecture.Infrastructure/Configurations/UserConfiguration.cs +++ b/CleanArchitecture.Infrastructure/Configurations/UserConfiguration.cs @@ -16,12 +16,12 @@ public sealed class UserConfiguration : IEntityTypeConfiguration .HasMaxLength(320); builder - .Property(user => user.GivenName) + .Property(user => user.FirstName) .IsRequired() .HasMaxLength(100); builder - .Property(user => user.Surname) + .Property(user => user.LastName) .IsRequired() .HasMaxLength(100); diff --git a/CleanArchitecture.IntegrationTests/CleanArchitecture.IntegrationTests.csproj b/CleanArchitecture.IntegrationTests/CleanArchitecture.IntegrationTests.csproj index 5768a6d..3ce7e6f 100644 --- a/CleanArchitecture.IntegrationTests/CleanArchitecture.IntegrationTests.csproj +++ b/CleanArchitecture.IntegrationTests/CleanArchitecture.IntegrationTests.csproj @@ -8,14 +8,14 @@ - - - - - - - - + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -27,8 +27,8 @@ - - + + diff --git a/CleanArchitecture.IntegrationTests/Controller/UserControllerTests.cs b/CleanArchitecture.IntegrationTests/Controller/UserControllerTests.cs index a06ecfa..ad2cb37 100644 --- a/CleanArchitecture.IntegrationTests/Controller/UserControllerTests.cs +++ b/CleanArchitecture.IntegrationTests/Controller/UserControllerTests.cs @@ -81,8 +81,8 @@ public sealed class UserControllerTests : IClassFixture content.Id.Should().Be(_fixture.CreatedUserId); content.Email.Should().Be("test@email.com"); - content.Surname.Should().Be("Test"); - content.GivenName.Should().Be("Email"); + content.FirstName.Should().Be("Test"); + content.LastName.Should().Be("Email"); } [Fact] @@ -101,8 +101,8 @@ public sealed class UserControllerTests : IClassFixture content.Id.Should().Be(_fixture.CreatedUserId); content.Email.Should().Be("test@email.com"); - content.Surname.Should().Be("Test"); - content.GivenName.Should().Be("Email"); + content.FirstName.Should().Be("Test"); + content.LastName.Should().Be("Email"); } [Fact] @@ -145,8 +145,8 @@ public sealed class UserControllerTests : IClassFixture content.Id.Should().Be(_fixture.CreatedUserId); content.Email.Should().Be("newtest@email.com"); - content.Surname.Should().Be("NewTest"); - content.GivenName.Should().Be("NewEmail"); + content.FirstName.Should().Be("NewTest"); + content.LastName.Should().Be("NewEmail"); _fixture.CreatedUserEmail = content.Email; } @@ -206,14 +206,14 @@ public sealed class UserControllerTests : IClassFixture currentUser.Id.Should().Be(_fixture.CreatedUserId); currentUser.Role.Should().Be(UserRole.User); currentUser.Email.Should().Be("newtest@email.com"); - currentUser.Surname.Should().Be("NewTest"); - currentUser.GivenName.Should().Be("NewEmail"); + currentUser.FirstName.Should().Be("NewTest"); + currentUser.LastName.Should().Be("NewEmail"); var adminUser = content.First(x => x.Role == UserRole.Admin); adminUser.Email.Should().Be("admin@email.com"); - adminUser.Surname.Should().Be("Admin"); - adminUser.GivenName.Should().Be("User"); + adminUser.FirstName.Should().Be("Admin"); + adminUser.LastName.Should().Be("User"); } [Fact] diff --git a/CleanArchitecture.Proto/CleanArchitecture.Proto.csproj b/CleanArchitecture.Proto/CleanArchitecture.Proto.csproj index de1ac9c..ceaeb80 100644 --- a/CleanArchitecture.Proto/CleanArchitecture.Proto.csproj +++ b/CleanArchitecture.Proto/CleanArchitecture.Proto.csproj @@ -6,19 +6,19 @@ - - + + - - + + - - - + + + diff --git a/CleanArchitecture.gRPC.Tests/Users/GetUsersByIdsTests.cs b/CleanArchitecture.gRPC.Tests/Users/GetUsersByIdsTests.cs index 5a4302b..7022833 100644 --- a/CleanArchitecture.gRPC.Tests/Users/GetUsersByIdsTests.cs +++ b/CleanArchitecture.gRPC.Tests/Users/GetUsersByIdsTests.cs @@ -57,8 +57,8 @@ public sealed class GetUsersByIdsTests : IClassFixture mockUser.Should().NotBeNull(); user.Email.Should().Be(mockUser.Email); - user.FirstName.Should().Be(mockUser.GivenName); - user.LastName.Should().Be(mockUser.Surname); + user.FirstName.Should().Be(mockUser.FirstName); + user.LastName.Should().Be(mockUser.LastName); } }