Skip to content

M
mytime
Commit afdeb36f authored by Rajashekar jadala's avatar Rajashekar jadala Committed by rbonthala-nisum-com
Browse files
Options

MT-80: Sent employee assigned role to UI (#50)

parent c8e144f5
Show whitespace changes
Inline Side-by-side
Showing with 254 additions and 262 deletions
src/main/java/com/nisum/mytime/controller/UserController.java
View file @ afdeb36f
package com.nisum.mytime.controller; package com.nisum.mytime.controller;
import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -28,6 +27,7 @@ import com.nisum.mytime.model.Location; ...@@ -28,6 +27,7 @@ import com.nisum.mytime.model.Location;
import com.nisum.mytime.model.MasterData; import com.nisum.mytime.model.MasterData;
import com.nisum.mytime.model.Shift; import com.nisum.mytime.model.Shift;
import com.nisum.mytime.model.Skill; import com.nisum.mytime.model.Skill;
import com.nisum.mytime.service.RoleMappingService;
import com.nisum.mytime.service.UserService; import com.nisum.mytime.service.UserService;
@RestController @RestController
...@@ -37,182 +37,143 @@ public class UserController { ...@@ -37,182 +37,143 @@ public class UserController {
@Autowired @Autowired
private UserService userService; private UserService userService;
@RequestMapping(value = "/employee", method = RequestMethod.GET, @Autowired
produces = MediaType.APPLICATION_JSON_VALUE) private RoleMappingService roleMappingService;
public ResponseEntity<EmployeeRoles> getEmployeeRole(
@RequestParam("emailId") String emailId) throws MyTimeException { @RequestMapping(value = "/employee", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<EmployeeRoles> getEmployeeRole(@RequestParam("emailId") String emailId)
throws MyTimeException {
EmployeeRoles employeesRole = userService.getEmployeesRole(emailId); EmployeeRoles employeesRole = userService.getEmployeesRole(emailId);
String roleName = roleMappingService.getEmployeeRole(employeesRole.getEmployeeId());
if (roleName != null) {
employeesRole.setRole(roleName);
}
System.out.println("emailId" + emailId + "result" + employeesRole); System.out.println("emailId" + emailId + "result" + employeesRole);
return new ResponseEntity<>(employeesRole, HttpStatus.OK); return new ResponseEntity<>(employeesRole, HttpStatus.OK);
} }
@RequestMapping(value = "/assignEmployeeRole", method = RequestMethod.POST, @RequestMapping(value = "/assignEmployeeRole", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE, public ResponseEntity<EmployeeRoles> assigingEmployeeRole(@RequestBody EmployeeRoles employeeRoles)
consumes = MediaType.APPLICATION_JSON_VALUE) throws MyTimeException {
public ResponseEntity<EmployeeRoles> assigingEmployeeRole( EmployeeRoles employeeRole = userService.assigingEmployeeRole(employeeRoles);
@RequestBody EmployeeRoles employeeRoles) throws MyTimeException {
EmployeeRoles employeeRole = userService
.assigingEmployeeRole(employeeRoles);
return new ResponseEntity<>(employeeRole, HttpStatus.OK); return new ResponseEntity<>(employeeRole, HttpStatus.OK);
} }
@RequestMapping(value = "/updateEmployeeRole", method = RequestMethod.POST, @RequestMapping(value = "/updateEmployeeRole", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE, public ResponseEntity<EmployeeRoles> updateEmployeeRole(@RequestBody EmployeeRoles employeeRoles)
consumes = MediaType.APPLICATION_JSON_VALUE) throws MyTimeException {
public ResponseEntity<EmployeeRoles> updateEmployeeRole( EmployeeRoles employeeRole = userService.updateEmployeeRole(employeeRoles);
@RequestBody EmployeeRoles employeeRoles) throws MyTimeException {
EmployeeRoles employeeRole = userService
.updateEmployeeRole(employeeRoles);
return new ResponseEntity<>(employeeRole, HttpStatus.OK); return new ResponseEntity<>(employeeRole, HttpStatus.OK);
} }
@RequestMapping(value = "/deleteEmployee", method = RequestMethod.DELETE, @RequestMapping(value = "/deleteEmployee", method = RequestMethod.DELETE, produces = MediaType.TEXT_PLAIN_VALUE)
produces = MediaType.TEXT_PLAIN_VALUE) public ResponseEntity<String> deleteEmployee(@RequestParam("empId") String empId) throws MyTimeException {
public ResponseEntity<String> deleteEmployee(
@RequestParam("empId") String empId) throws MyTimeException {
userService.deleteEmployee(empId); userService.deleteEmployee(empId);
return new ResponseEntity<>("Success", HttpStatus.OK); return new ResponseEntity<>("Success", HttpStatus.OK);
} }
@RequestMapping(value = "/getUserRoles", method = RequestMethod.GET, @RequestMapping(value = "/getUserRoles", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<List<EmployeeRoles>> getUserRoles() throws MyTimeException {
public ResponseEntity<List<EmployeeRoles>> getUserRoles()
throws MyTimeException {
List<EmployeeRoles> employeesRoles = userService.getEmployeeRoles(); List<EmployeeRoles> employeesRoles = userService.getEmployeeRoles();
return new ResponseEntity<>(employeesRoles, HttpStatus.OK); return new ResponseEntity<>(employeesRoles, HttpStatus.OK);
} }
@RequestMapping(value = "/getEmployeeRoleData", method = RequestMethod.GET, @RequestMapping(value = "/getEmployeeRoleData", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<EmployeeRoles> getEmployeeRoleData(@RequestParam("empId") String empId)
public ResponseEntity<EmployeeRoles> getEmployeeRoleData( throws MyTimeException {
@RequestParam("empId") String empId) throws MyTimeException {
EmployeeRoles employeesRole = userService.getEmployeesRoleData(empId); EmployeeRoles employeesRole = userService.getEmployeesRoleData(empId);
return new ResponseEntity<>(employeesRole, HttpStatus.OK); return new ResponseEntity<>(employeesRole, HttpStatus.OK);
} }
@RequestMapping(value = "/getEmployeeLocations", method = RequestMethod.GET, @RequestMapping(value = "/getEmployeeLocations", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<List<EmployeeLocationDetails>> getEmployeeLocations(@RequestParam("employeeId") String empId)
public ResponseEntity<List<EmployeeLocationDetails>> getEmployeeLocations( throws MyTimeException {
@RequestParam("employeeId") String empId) throws MyTimeException { List<EmployeeLocationDetails> employeeLocationDetails = userService.getEmployeeLocationDetails(empId);
List<EmployeeLocationDetails> employeeLocationDetails = userService
.getEmployeeLocationDetails(empId);
return new ResponseEntity<>(employeeLocationDetails, HttpStatus.OK); return new ResponseEntity<>(employeeLocationDetails, HttpStatus.OK);
} }
@RequestMapping(value = "/getManagers", method = RequestMethod.GET, @RequestMapping(value = "/getManagers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<List<EmployeeRoles>> getManagers() throws MyTimeException {
public ResponseEntity<List<EmployeeRoles>> getManagers()
throws MyTimeException {
List<EmployeeRoles> employeesRoles = userService.getEmployeeRoles(); List<EmployeeRoles> employeesRoles = userService.getEmployeeRoles();
List<EmployeeRoles> managers = employeesRoles.stream() List<EmployeeRoles> managers = employeesRoles.stream()
.filter(e -> ("Director".equalsIgnoreCase(e.getRole()) .filter(e -> ("Director".equalsIgnoreCase(e.getRole())
|| "Delivery Manager".equalsIgnoreCase(e.getRole()) || "Delivery Manager".equalsIgnoreCase(e.getRole()) || "Manager".equalsIgnoreCase(e.getRole())
|| "Manager".equalsIgnoreCase(e.getRole()) || "HR Manager".equalsIgnoreCase(e.getRole()) || "Lead".equalsIgnoreCase(e.getRole())))
|| "HR Manager".equalsIgnoreCase(e.getRole()) .sorted(Comparator.comparing(EmployeeRoles::getEmployeeName)).collect(Collectors.toList());
|| "Lead".equalsIgnoreCase(e.getRole())))
.sorted(Comparator.comparing(EmployeeRoles::getEmployeeName))
.collect(Collectors.toList());
return new ResponseEntity<>(managers, HttpStatus.OK); return new ResponseEntity<>(managers, HttpStatus.OK);
} }
@RequestMapping(value = "/getAllShifts", method = RequestMethod.GET, @RequestMapping(value = "/getAllShifts", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<String>> getAllShifts() throws MyTimeException { public ResponseEntity<List<String>> getAllShifts() throws MyTimeException {
List<String> shifts = userService.getAllShifts().stream() List<String> shifts = userService.getAllShifts().stream().filter(e -> "Y".equalsIgnoreCase(e.getActiveStatus()))
.filter(e -> "Y".equalsIgnoreCase(e.getActiveStatus()))
.map(Shift::getShiftName).sorted().collect(Collectors.toList()); .map(Shift::getShiftName).sorted().collect(Collectors.toList());
return new ResponseEntity<>(shifts, HttpStatus.OK); return new ResponseEntity<>(shifts, HttpStatus.OK);
} }
@RequestMapping(value = "/getAllDesignations", method = RequestMethod.GET, @RequestMapping(value = "/getAllDesignations", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<List<String>> getAllDesignations() throws MyTimeException {
public ResponseEntity<List<String>> getAllDesignations()
throws MyTimeException {
List<String> designations = userService.getAllDesignations().stream() List<String> designations = userService.getAllDesignations().stream()
.filter(e -> "Y".equalsIgnoreCase(e.getActiveStatus())) .filter(e -> "Y".equalsIgnoreCase(e.getActiveStatus())).map(Designation::getDesignationName).sorted()
.map(Designation::getDesignationName).sorted()
.collect(Collectors.toList()); .collect(Collectors.toList());
return new ResponseEntity<>(designations, HttpStatus.OK); return new ResponseEntity<>(designations, HttpStatus.OK);
} }
@RequestMapping(value = "/getSkills", method = RequestMethod.GET, @RequestMapping(value = "/getSkills", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<List<String>> getTechnologies() throws MyTimeException {
public ResponseEntity<List<String>> getTechnologies()
throws MyTimeException {
List<String> technologies = userService.getTechnologies().stream() List<String> technologies = userService.getTechnologies().stream()
.filter(e -> "Y".equalsIgnoreCase(e.getActiveStatus())) .filter(e -> "Y".equalsIgnoreCase(e.getActiveStatus())).map(Skill::getSkillName).sorted()
.map(Skill::getSkillName).sorted().collect(Collectors.toList()); .collect(Collectors.toList());
return new ResponseEntity<>(technologies, HttpStatus.OK); return new ResponseEntity<>(technologies, HttpStatus.OK);
} }
@RequestMapping(value = "/getLocations", method = RequestMethod.GET, @RequestMapping(value = "/getLocations", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<String>> getLocations() throws MyTimeException { public ResponseEntity<List<String>> getLocations() throws MyTimeException {
System.out.println( System.out.println(" userService.getLocations()" + userService.getLocations());
" userService.getLocations()" + userService.getLocations()); List<String> locations = userService.getLocations().stream().filter(e -> (e.isActiveStatus() == true))
List<String> locations = userService.getLocations().stream() .map(Location::getLocation).sorted().collect(Collectors.toList());
.filter(e -> (e.isActiveStatus() == true))
.map(Location::getLocation).sorted()
.collect(Collectors.toList());
System.out.println("getLocations################ " + locations); System.out.println("getLocations################ " + locations);
return new ResponseEntity<>(locations, HttpStatus.OK); return new ResponseEntity<>(locations, HttpStatus.OK);
} }
@RequestMapping(value = "/updateProfile", method = RequestMethod.POST, @RequestMapping(value = "/updateProfile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE, public ResponseEntity<EmployeeRoles> updateProfile(@RequestBody EmployeeRoles employeeRoles)
consumes = MediaType.APPLICATION_JSON_VALUE) throws MyTimeException {
public ResponseEntity<EmployeeRoles> updateProfile(
@RequestBody EmployeeRoles employeeRoles) throws MyTimeException {
EmployeeRoles employeeRole = userService.updateProfile(employeeRoles); EmployeeRoles employeeRole = userService.updateProfile(employeeRoles);
return new ResponseEntity<>(employeeRole, HttpStatus.OK); return new ResponseEntity<>(employeeRole, HttpStatus.OK);
} }
@RequestMapping(value = "/getAccounts", method = RequestMethod.GET, @RequestMapping(value = "/getAccounts", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Account>> getAccounts() throws MyTimeException { public ResponseEntity<List<Account>> getAccounts() throws MyTimeException {
List<Account> technologies = userService.getAccounts().stream() List<Account> technologies = userService.getAccounts().stream().filter(e -> "Y".equalsIgnoreCase(e.getStatus()))
.filter(e -> "Y".equalsIgnoreCase(e.getStatus()))
// .map(Account::getAccountName).sorted() // .map(Account::getAccountName).sorted()
.collect(Collectors.toList()); .collect(Collectors.toList());
return new ResponseEntity<>(technologies, HttpStatus.OK); return new ResponseEntity<>(technologies, HttpStatus.OK);
} }
@RequestMapping(value = "/getEmployeeRoleDataForSearchCriteria", @RequestMapping(value = "/getEmployeeRoleDataForSearchCriteria", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
method = RequestMethod.GET, public ResponseEntity<EmployeeRoles> getEmployeeRoleDataForSearchCriteria(@RequestParam("searchId") String searchId,
produces = MediaType.APPLICATION_JSON_VALUE) @RequestParam("searchAttribute") String searchAttribute) throws MyTimeException {
public ResponseEntity<EmployeeRoles> getEmployeeRoleDataForSearchCriteria( EmployeeRoles employeesRole = userService.getEmployeeRoleDataForSearchCriteria(searchId, searchAttribute);
@RequestParam("searchId") String searchId,
@RequestParam("searchAttribute") String searchAttribute)
throws MyTimeException {
EmployeeRoles employeesRole = userService
.getEmployeeRoleDataForSearchCriteria(searchId,
searchAttribute);
return new ResponseEntity<>(employeesRole, HttpStatus.OK); return new ResponseEntity<>(employeesRole, HttpStatus.OK);
} }
@RequestMapping(value = "/getEmployeeDetailsForAutocomplete", @RequestMapping(value = "/getEmployeeDetailsForAutocomplete", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
method = RequestMethod.GET, public ResponseEntity<List<String>> getEmployeeDetailsForAutocomplete() throws MyTimeException {
produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<String>> getEmployeeDetailsForAutocomplete()
throws MyTimeException {
List<String> details = userService.getEmployeeDetailsForAutocomplete(); List<String> details = userService.getEmployeeDetailsForAutocomplete();
return new ResponseEntity<>(details, HttpStatus.OK); return new ResponseEntity<>(details, HttpStatus.OK);
} }
@RequestMapping(value = "/getMasterData", method = RequestMethod.GET, @RequestMapping(value = "/getMasterData", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<Map<String, List<String>>> getMasterData() throws MyTimeException {
public ResponseEntity<Map<String, List<String>>> getMasterData()
throws MyTimeException {
Map<String, List<String>> masterDataMap = new HashMap<>(); Map<String, List<String>> masterDataMap = new HashMap<>();
Map<String, List<MasterData>> result = userService.getMasterData() Map<String, List<MasterData>> result = userService.getMasterData().stream()
.stream().filter(e -> (e.isActiveStatus() == true)) .filter(e -> (e.isActiveStatus() == true))
.collect(Collectors.groupingBy(MasterData::getMasterDataType)); .collect(Collectors.groupingBy(MasterData::getMasterDataType));
for (String key : result.keySet()) { for (String key : result.keySet()) {
List<MasterData> valueList = result.get(key); List<MasterData> valueList = result.get(key);
List<String> technologies = valueList.stream() List<String> technologies = valueList.stream().map(MasterData::getMasterDataName).sorted()
.map(MasterData::getMasterDataName).sorted()
.collect(Collectors.toList()); .collect(Collectors.toList());
masterDataMap.put(key, technologies); masterDataMap.put(key, technologies);
} }
...@@ -220,36 +181,32 @@ public class UserController { ...@@ -220,36 +181,32 @@ public class UserController {
} }
@RequestMapping(value = "/getEmployeeByStatus", method = RequestMethod.GET, @RequestMapping(value = "/getEmployeeByStatus", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity<List<EmployeeRoles>> getEmployeeByStatus(@RequestParam("status") String status) {
public ResponseEntity<List<EmployeeRoles>> getEmployeeByStatus(
@RequestParam("status") String status) {
List<EmployeeRoles> employeesRoles = userService List<EmployeeRoles> employeesRoles = userService.getEmployeesByStatus(status);
.getEmployeesByStatus(status);
return new ResponseEntity<>(employeesRoles, HttpStatus.OK); return new ResponseEntity<>(employeesRoles, HttpStatus.OK);
} }
@RequestMapping(value = "/getDeliveryLeads", method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/getDeliveryLeads", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<HashMap<String, String>>> getDeliveryLeads(@RequestParam("domainId") String domainId) public ResponseEntity<List<HashMap<String, String>>> getDeliveryLeads(@RequestParam("domainId") String domainId)
throws MyTimeException { throws MyTimeException {
List<HashMap<String, String>> managers = userService.getDeliveryLeads(domainId); List<HashMap<String, String>> managers = userService.getDeliveryLeads(domainId);
return new ResponseEntity<>(managers, HttpStatus.OK); return new ResponseEntity<>(managers, HttpStatus.OK);
} }
@RequestMapping(value = "/getAccountsInfo", method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/getAccountsInfo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<AccountInfo>> getAccountsInfo() throws MyTimeException { public ResponseEntity<List<AccountInfo>> getAccountsInfo() throws MyTimeException {
List<AccountInfo> technologies = userService.getAccountsInfo().stream() List<AccountInfo> technologies = userService.getAccountsInfo().stream()
.filter(e -> "Active".equalsIgnoreCase(e.getStatus())) .filter(e -> "Active".equalsIgnoreCase(e.getStatus())).collect(Collectors.toList());
.collect(Collectors.toList());
return new ResponseEntity<>(technologies, HttpStatus.OK); return new ResponseEntity<>(technologies, HttpStatus.OK);
} }
@RequestMapping(value = "/getDomains", method = RequestMethod.GET,
produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/getDomains", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<List<Domains>> getDomains(@RequestParam("accountId") String accountId)throws MyTimeException public ResponseEntity<List<Domains>> getDomains(@RequestParam("accountId") String accountId)
{ throws MyTimeException {
List<Domains> domains=userService.getDomains(accountId).stream() List<Domains> domains = userService.getDomains(accountId).stream()
.filter(e->"Active".equalsIgnoreCase(e.getStatus())).collect(Collectors.toList()); .filter(e -> "Active".equalsIgnoreCase(e.getStatus())).collect(Collectors.toList());
return new ResponseEntity<>(domains, HttpStatus.OK); return new ResponseEntity<>(domains, HttpStatus.OK);
} }
......
src/main/java/com/nisum/mytime/model/RoleInfo.java
View file @ afdeb36f
...@@ -24,6 +24,7 @@ public class RoleInfo implements Serializable { ...@@ -24,6 +24,7 @@ public class RoleInfo implements Serializable {
@Id @Id
private ObjectId id; private ObjectId id;
private int priority;
private String roleId; private String roleId;
private String roleName; private String roleName;
private String roleDescription; private String roleDescription;
......
src/main/java/com/nisum/mytime/repository/RoleInfoRepo.java
View file @ afdeb36f
...@@ -5,5 +5,8 @@ import org.springframework.data.mongodb.repository.MongoRepository; ...@@ -5,5 +5,8 @@ import org.springframework.data.mongodb.repository.MongoRepository;
import com.nisum.mytime.model.RoleInfo; import com.nisum.mytime.model.RoleInfo;
public interface RoleInfoRepo extends MongoRepository<RoleInfo, String> { public interface RoleInfoRepo extends MongoRepository<RoleInfo, String> {
RoleInfo findByRoleName(String roleName); RoleInfo findByRoleName(String roleName);
RoleInfo findByRoleId(String roleId);
} }
\ No newline at end of file
src/main/java/com/nisum/mytime/repository/RoleMappingInfoRepo.java
View file @ afdeb36f
package com.nisum.mytime.repository; package com.nisum.mytime.repository;
import java.util.List;
import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.data.mongodb.repository.MongoRepository;
import com.nisum.mytime.model.RoleMappingInfo; import com.nisum.mytime.model.RoleMappingInfo;
...@@ -7,4 +9,6 @@ import com.nisum.mytime.model.RoleMappingInfo; ...@@ -7,4 +9,6 @@ import com.nisum.mytime.model.RoleMappingInfo;
public interface RoleMappingInfoRepo extends MongoRepository<RoleMappingInfo, String> { public interface RoleMappingInfoRepo extends MongoRepository<RoleMappingInfo, String> {
RoleMappingInfo findByEmployeeIdAndRoleId(String employeeId, String roleId); RoleMappingInfo findByEmployeeIdAndRoleId(String employeeId, String roleId);
List<RoleMappingInfo> findByEmployeeId(String employeeId);
} }
\ No newline at end of file
src/main/java/com/nisum/mytime/service/EmployeeDataService.java
View file @ afdeb36f
...@@ -29,16 +29,19 @@ public class EmployeeDataService { ...@@ -29,16 +29,19 @@ public class EmployeeDataService {
public List<EmpLoginData> fetchEmployeeLoginsBasedOnDates(long employeeId, String fromDate, String toDate) public List<EmpLoginData> fetchEmployeeLoginsBasedOnDates(long employeeId, String fromDate, String toDate)
throws MyTimeException { throws MyTimeException {
long start_ms = System.currentTimeMillis(); long start_ms = System.currentTimeMillis();
String querys=MyTimeUtils.ABESENT_STATUS_QUERY+"'"+fromDate+"'"+ MyTimeUtils.ABESENT_STATUS_QUERY1 +"'"+toDate+"'"+MyTimeUtils.ABESENT_STATUS_QUERY2+employeeId+MyTimeUtils.ABESENT_STATUS_QUERY3; String querys = null;
System.out.println("fetch employee details"+querys); if (employeeId == 0)
querys = MyTimeUtils.ABESENT_STATUS_QUERY + "'" + fromDate + "'" + MyTimeUtils.ABESENT_STATUS_QUERY1 + "'"
+ toDate + "'" + MyTimeUtils.ABESENT_STATUS_QUERY3;
else
querys = MyTimeUtils.ABESENT_STATUS_QUERY + "'" + fromDate + "'" + MyTimeUtils.ABESENT_STATUS_QUERY1 + "'"
+ toDate + "'" + MyTimeUtils.ABESENT_STATUS_QUERY2 + employeeId + MyTimeUtils.ABESENT_STATUS_QUERY3;
int countHours = 0; int countHours = 0;
List<EmpLoginData> listOfEmpLoginData = new ArrayList<>(); List<EmpLoginData> listOfEmpLoginData = new ArrayList<>();
try(Connection connection = dbConnection.getDBConnection(); try (Connection connection = dbConnection.getDBConnection();
Statement statement = connection.createStatement(); Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery(querys.toString())) ResultSet resultSet = statement.executeQuery(querys.toString())) {
{
if (employeeId > 0) {
while (resultSet.next()) { while (resultSet.next()) {
EmpLoginData empLoginData = new EmpLoginData(); EmpLoginData empLoginData = new EmpLoginData();
empLoginData.setEmployeeId(resultSet.getString("EmployeeCode")); empLoginData.setEmployeeId(resultSet.getString("EmployeeCode"));
...@@ -48,14 +51,14 @@ public class EmployeeDataService { ...@@ -48,14 +51,14 @@ public class EmployeeDataService {
empLoginData.setLastLogout(resultSet.getTime("LastLogin").toString()); empLoginData.setLastLogout(resultSet.getTime("LastLogin").toString());
Time from = resultSet.getTime("FirstLogin"); Time from = resultSet.getTime("FirstLogin");
Time to = resultSet.getTime("LastLogin"); Time to = resultSet.getTime("LastLogin");
long milliseconds=to.getTime() - from.getTime(); long milliseconds = to.getTime() - from.getTime();
int seconds = (int) milliseconds / 1000; int seconds = (int) milliseconds / 1000;
int hours = seconds / 3600; int hours = seconds / 3600;
int minutes = (seconds % 3600) / 60; int minutes = (seconds % 3600) / 60;
seconds = (seconds % 3600) % 60; seconds = (seconds % 3600) % 60;
empLoginData.setTotalLoginTime(hours+":"+minutes+":"+seconds); empLoginData.setTotalLoginTime(hours + ":" + minutes + ":" + seconds);
empLoginData.setTotalLoginTime(hours+":"+minutes+":"+seconds); empLoginData.setTotalLoginTime(hours + ":" + minutes + ":" + seconds);
Date d = MyTimeUtils.tdf.parse(empLoginData.getTotalLoginTime()); Date d = MyTimeUtils.tdf.parse(empLoginData.getTotalLoginTime());
countHours += d.getTime(); countHours += d.getTime();
listOfEmpLoginData.add(empLoginData); listOfEmpLoginData.add(empLoginData);
...@@ -65,16 +68,9 @@ public class EmployeeDataService { ...@@ -65,16 +68,9 @@ public class EmployeeDataService {
.setTotalAvgTime(MyTimeUtils.tdf.format(countHours / listOfEmpLoginData.size())); .setTotalAvgTime(MyTimeUtils.tdf.format(countHours / listOfEmpLoginData.size()));
} }
MyTimeLogger.getInstance().info(" Time Taken fecth Employee data based on Dates ::: " MyTimeLogger.getInstance().info(
+ (System.currentTimeMillis() - start_ms)); " Time Taken fecth Employee data based on Dates ::: " + (System.currentTimeMillis() - start_ms));
} else if (employeeId == 0) {
listOfEmpLoginData = null;
MyTimeLogger.getInstance().info("Time Taken for with fecth All Employees data based on Dates ::: "
+ (System.currentTimeMillis() - start_ms));
}
} catch (Exception e) { } catch (Exception e) {
MyTimeLogger.getInstance().error(e.getMessage()); MyTimeLogger.getInstance().error(e.getMessage());
throw new MyTimeException(e.getMessage()); throw new MyTimeException(e.getMessage());
......
src/main/java/com/nisum/mytime/service/RoleMappingService.java
View file @ afdeb36f
...@@ -10,4 +10,6 @@ public interface RoleMappingService { ...@@ -10,4 +10,6 @@ public interface RoleMappingService {
void saveUniqueEmployeeAndRole(List<String> employeeIds, String roleId) throws MyTimeException; void saveUniqueEmployeeAndRole(List<String> employeeIds, String roleId) throws MyTimeException;
WriteResult deleteRole(String employeeId, String roleId) throws MyTimeException; WriteResult deleteRole(String employeeId, String roleId) throws MyTimeException;
String getEmployeeRole(String employeeId);
} }
src/main/java/com/nisum/mytime/service/RoleMappingServiceImpl.java
View file @ afdeb36f
package com.nisum.mytime.service; package com.nisum.mytime.service;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
...@@ -12,6 +15,7 @@ import org.springframework.stereotype.Service; ...@@ -12,6 +15,7 @@ import org.springframework.stereotype.Service;
import com.mongodb.WriteResult; import com.mongodb.WriteResult;
import com.nisum.mytime.exception.handler.MyTimeException; import com.nisum.mytime.exception.handler.MyTimeException;
import com.nisum.mytime.model.RoleMappingInfo; import com.nisum.mytime.model.RoleMappingInfo;
import com.nisum.mytime.repository.RoleInfoRepo;
import com.nisum.mytime.repository.RoleMappingInfoRepo; import com.nisum.mytime.repository.RoleMappingInfoRepo;
import com.nisum.mytime.utils.MyTimeUtils; import com.nisum.mytime.utils.MyTimeUtils;
...@@ -21,6 +25,9 @@ public class RoleMappingServiceImpl implements RoleMappingService { ...@@ -21,6 +25,9 @@ public class RoleMappingServiceImpl implements RoleMappingService {
@Autowired @Autowired
private RoleMappingInfoRepo roleMappingInfoRepo; private RoleMappingInfoRepo roleMappingInfoRepo;
@Autowired
private RoleInfoRepo roleInfoRepo;
@Autowired @Autowired
private MongoTemplate mongoTemplate; private MongoTemplate mongoTemplate;
...@@ -49,4 +56,26 @@ public class RoleMappingServiceImpl implements RoleMappingService { ...@@ -49,4 +56,26 @@ public class RoleMappingServiceImpl implements RoleMappingService {
return mongoTemplate.upsert(query, update, RoleMappingInfo.class); return mongoTemplate.upsert(query, update, RoleMappingInfo.class);
} }
@Override
public String getEmployeeRole(String employeeId) {
Map<Integer, String> roleInfoMap = new LinkedHashMap<Integer, String>();
List<RoleMappingInfo> listOfEmployeeRoles = roleMappingInfoRepo.findByEmployeeId(employeeId);
for (RoleMappingInfo employee : listOfEmployeeRoles) {
roleInfoMap.put((roleInfoRepo.findByRoleId(employee.getRoleId())).getPriority(), employee.getRoleId());
}
roleInfoMap = roleInfoMap.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors
.toMap(Map.Entry::getKey, Map.Entry::getValue, (oldValue, newValue) -> oldValue, LinkedHashMap::new));
String roleName = null;
if (!roleInfoMap.isEmpty()) {
Map.Entry<Integer, String> entry = roleInfoMap.entrySet().iterator().next();
roleName = entry.getValue();
} else {
roleName = null;
}
return 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