Removed check if current employee is a dentist

This check caused a bug, since the admin or superadmin must be a dentist in order to assign one or more specialties to the employee. This commit relates to issue #124
DentallApp · Dec 29, 2022 · 8421b9e · 8421b9e
1 parent 9131c47
commit 8421b9e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 24 deletions.
diff --git a/src/Features/Employees/EmployeeService.cs b/src/Features/Employees/EmployeeService.cs
@@ -12,7 +12,7 @@ public EmployeeService(IUnitOfWork unitOfWork, IPasswordHasher passwordHasher)
     }
 
     public Task<IEnumerable<EmployeeGetDto>> GetEmployeesAsync(ClaimsPrincipal currentEmployee)
-        =>  currentEmployee.IsAdmin() 
+        =>  currentEmployee.IsAdmin()
                ? _unitOfWork.EmployeeRepository.GetFullEmployeesProfileByOfficeIdAsync(currentEmployee.GetEmployeeId(), currentEmployee.GetOfficeId())
                : _unitOfWork.EmployeeRepository.GetFullEmployeesProfileAsync();
 
@@ -73,20 +73,18 @@ public async Task<Response> EditProfileByAdminAsync(int employeeId, ClaimsPrinci
 
         if (employeeUpdateDto.Password is not null)
             employeeToEdit.User.Password = _passwordHasher.HashPassword(employeeUpdateDto.Password);
-
-        employeeUpdateDto.MapToEmployee(employeeToEdit);
 
-        if (currentEmployee.IsDentist())
-        {
-            var specialtiesId = employeeUpdateDto.SpecialtiesId ?? Enumerable.Empty<int>().ToList();
-            _unitOfWork.EmployeeSpecialtyRepository.UpdateEmployeeSpecialties(employeeToEdit.Id,
-                                                                              employeeToEdit.EmployeeSpecialties,
-                                                                              specialtiesId);
-        }
-
-        _unitOfWork.UserRoleRepository.UpdateUserRoles(employeeToEdit.UserId, 
-                                                       employeeToEdit.User.UserRoles, 
-                                                       rolesId: employeeUpdateDto.Roles);
+        employeeUpdateDto.MapToEmployee(employeeToEdit);
+        var specialtiesId = employeeUpdateDto.SpecialtiesId ?? Enumerable.Empty<int>().ToList();
+        _unitOfWork.EmployeeSpecialtyRepository
+                   .UpdateEmployeeSpecialties(employeeToEdit.Id,
+                                              employeeToEdit.EmployeeSpecialties,
+                                              specialtiesId);
+
+        _unitOfWork.UserRoleRepository
+                   .UpdateUserRoles(employeeToEdit.UserId,
+                                    employeeToEdit.User.UserRoles,
+                                    rolesId: employeeUpdateDto.Roles);
         await _unitOfWork.SaveChangesAsync();
 
         return new Response

diff --git a/src/Features/UserRegistration/UserRegisterService.cs b/src/Features/UserRegistration/UserRegisterService.cs
@@ -7,8 +7,8 @@ public class UserRegisterService : IUserRegisterService
     private readonly ITokenService _tokenService;
     private readonly IPasswordHasher _passwordHasher;
 
-    public UserRegisterService(IUnitOfWork unitOfWork, 
-                               IEmailService emailService, 
+    public UserRegisterService(IUnitOfWork unitOfWork,
+                               IEmailService emailService,
                                ITokenService tokenService,
                                IPasswordHasher passwordHasher)
     {
@@ -69,15 +69,12 @@ public async Task<Response<DtoBase>> CreateEmployeeAccountAsync(ClaimsPrincipal
         _unitOfWork.EmployeeRepository.Insert(employee);
         employee.User = user;
         employee.Person = user.Person;
-        if (currentEmployee.IsDentist())
+        var specialtiesId = (employeeInsertDto.SpecialtiesId ?? Enumerable.Empty<int>()).RemoveDuplicates();
+        foreach (var specialtyId in specialtiesId)
         {
-            var specialtiesId = (employeeInsertDto.SpecialtiesId ?? Enumerable.Empty<int>()).RemoveDuplicates();
-            foreach (var specialtyId in specialtiesId)
-            {
-                var employeeSpecialty = new EmployeeSpecialty { SpecialtyId = specialtyId };
-                _unitOfWork.EmployeeSpecialtyRepository.Insert(employeeSpecialty);
-                employeeSpecialty.Employee = employee;
-            }
+            var employeeSpecialty = new EmployeeSpecialty { SpecialtyId = specialtyId };
+            _unitOfWork.EmployeeSpecialtyRepository.Insert(employeeSpecialty);
+            employeeSpecialty.Employee = employee;
         }
         await _unitOfWork.SaveChangesAsync();