Commit d11c5abe authored by Vijay Akula's avatar Vijay Akula

Removed the hard coded values of employee roles in employeeservice

parent 49d725f8
...@@ -8,6 +8,7 @@ import com.nisum.myteam.repository.EmployeeRepo; ...@@ -8,6 +8,7 @@ import com.nisum.myteam.repository.EmployeeRepo;
import com.nisum.myteam.service.*; import com.nisum.myteam.service.*;
import com.nisum.myteam.utils.MyTeamUtils; import com.nisum.myteam.utils.MyTeamUtils;
import com.nisum.myteam.utils.constants.ApplicationRole; import com.nisum.myteam.utils.constants.ApplicationRole;
import com.nisum.myteam.utils.constants.RoleConstant;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -173,17 +174,29 @@ public class EmployeeService implements IEmployeeService { ...@@ -173,17 +174,29 @@ public class EmployeeService implements IEmployeeService {
return employee; return employee;
} }
@Override
public List<Employee> getAllEmployees() {
return employeeRepo.findAll();
}
@Override @Override
public Employee getEmployeeByEmaillId(String emailId) { public Employee getEmployeeByEmaillId(String emailId) {
return employeeRepo.findByEmailId(emailId); return employeeRepo.findByEmailId(emailId);
} }
@Override
public List<Employee> getEmployeesByEmpStatusAndShift(String empStatus, String shift) {
return employeeRepo.findByEmpStatusAndShiftLikeOrderByEmployeeIdDesc(empStatus, shift);
}
public List<Employee> getManagers() throws MyTeamException { public List<Employee> getManagers() throws MyTeamException {
List<Employee> activeEmpsList = getActiveEmployees(); List<Employee> activeEmpsList = getActiveEmployees();
List<Employee> managers = activeEmpsList.stream() List<Employee> managers = activeEmpsList.stream()
.filter(e -> ("Director".equalsIgnoreCase(e.getRole()) .filter(employee -> (RoleConstant.DIRECTOR.getRoleName().equalsIgnoreCase(employee.getRole())
|| "Delivery Manager".equalsIgnoreCase(e.getRole()) || "Manager".equalsIgnoreCase(e.getRole()) || RoleConstant.DELIVERY_MANAGER.getRoleName().equalsIgnoreCase(employee.getRole())
|| "HR Manager".equalsIgnoreCase(e.getRole()) || "Lead".equalsIgnoreCase(e.getRole()))) || RoleConstant.MANAGER.getRoleName().equalsIgnoreCase(employee.getRole())
|| RoleConstant.HR_MANAGER.getRoleName().equalsIgnoreCase(employee.getRole())
|| RoleConstant.LEAD.getRoleName().equalsIgnoreCase(employee.getRole())))
.sorted(Comparator.comparing(Employee::getEmployeeName)).collect(Collectors.toList()); .sorted(Comparator.comparing(Employee::getEmployeeName)).collect(Collectors.toList());
return managers; return managers;
} }
...@@ -250,7 +263,6 @@ public class EmployeeService implements IEmployeeService { ...@@ -250,7 +263,6 @@ public class EmployeeService implements IEmployeeService {
return getDeliveryManagerMap(domain.getDeliveryManagers()); return getDeliveryManagerMap(domain.getDeliveryManagers());
} }
@Override @Override
public List<HashMap<String, String>> getDeliveryManagerMap(List deliveryManagerIdsList) { public List<HashMap<String, String>> getDeliveryManagerMap(List deliveryManagerIdsList) {
List<HashMap<String, String>> employeeList = new ArrayList<>(); List<HashMap<String, String>> employeeList = new ArrayList<>();
...@@ -312,15 +324,5 @@ public class EmployeeService implements IEmployeeService { ...@@ -312,15 +324,5 @@ public class EmployeeService implements IEmployeeService {
} }
@Override
public List<Employee> getAllEmployees() {
return employeeRepo.findAll();
}
@Override
public List<Employee> getEmployeesByEmpStatusAndShift(String empStatus, String shift) {
return employeeRepo.findByEmpStatusAndShiftLikeOrderByEmployeeIdDesc(empStatus, shift);
}
} }
package com.nisum.myteam.utils.constants;
public enum RoleConstant {
DIRECTOR("","Director"),DELIVERY_MANAGER("","Delivery Manager"),
MANAGER("","Manager"),HR_MANAGER("","HR Manager"),LEAD("","Lead");
private String roleId;
private String roleName;
private RoleConstant(String roleId, String roleName) {
this.roleId = roleId;
this.roleName = roleName;
}
public String getRoleId() {
return this.roleId;
}
public String getRoleName() {
return this.roleName;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment