diff --git a/BeReadyBackend/DTO/Users/GetUserDetailsDto.cs b/BeReadyBackend/DTO/Users/GetUserDetailsDto.cs index 2f795c3..92cdd1d 100644 --- a/BeReadyBackend/DTO/Users/GetUserDetailsDto.cs +++ b/BeReadyBackend/DTO/Users/GetUserDetailsDto.cs @@ -7,6 +7,7 @@ public class GetUserDetailsDto public string? Name { get; set; } public string? Username { get; set; } public string? Email { get; set; } + public int? DesignationId { get; set; } public string? DesignationName { get; set; } public DateTime CreationDate { get; set; } public GetUserStatsDto? GetUserStatsDto { get; set; } diff --git a/BeReadyBackend/DTO/Users/GetUserDto.cs b/BeReadyBackend/DTO/Users/GetUserDto.cs index cf58f8c..c5d0cac 100644 --- a/BeReadyBackend/DTO/Users/GetUserDto.cs +++ b/BeReadyBackend/DTO/Users/GetUserDto.cs @@ -6,6 +6,7 @@ public class GetUserDto public string? FirstName { get; set; } public string? Name { get; set; } public string? Username { get; set; } + public int? DesignationId { get; set; } public string? DesignationName { get; set; } public GetUserStatsDto? GetUserStatsDto { get; set; } } \ No newline at end of file diff --git a/BeReadyBackend/Validators/Users/GetUserDetailsDtoValidator.cs b/BeReadyBackend/Validators/Users/GetUserDetailsDtoValidator.cs index d4e92ab..1d6f551 100644 --- a/BeReadyBackend/Validators/Users/GetUserDetailsDtoValidator.cs +++ b/BeReadyBackend/Validators/Users/GetUserDetailsDtoValidator.cs @@ -44,6 +44,13 @@ public class GetUserDetailsDtoValidator : Validator .NotEmpty() .WithMessage("CreationDate is required"); + When(x => x.DesignationId is not null, () => + { + RuleFor(x => x.DesignationName) + .NotEmpty() + .WithMessage("DesignationId is required"); + }); + When(x => x.DesignationName is not null, () => { RuleFor(x => x.DesignationName) diff --git a/BeReadyBackend/Validators/Users/GetUserDtoValidator.cs b/BeReadyBackend/Validators/Users/GetUserDtoValidator.cs index 80988fd..74e91f5 100644 --- a/BeReadyBackend/Validators/Users/GetUserDtoValidator.cs +++ b/BeReadyBackend/Validators/Users/GetUserDtoValidator.cs @@ -38,6 +38,13 @@ public class GetUserDtoValidator : Validator .MinimumLength(2) .WithMessage("Username must exceed 2 characters"); + When(x => x.DesignationId is not null, () => + { + RuleFor(x => x.DesignationName) + .NotEmpty() + .WithMessage("DesignationId is required"); + }); + When(x => x.DesignationName is not null, () => { RuleFor(x => x.DesignationName)