Commit 1e50d0c9 authored by Md Suleman's avatar Md Suleman

small fixes in effective time period

parent 7e3df43f
package com.nisum.myteam.controller;
import com.nisum.myteam.exception.handler.MyTeamException;
import com.nisum.myteam.model.dao.EffectiveLoginData;
import com.nisum.myteam.model.dao.Employee;
import com.nisum.myteam.service.IEffectiveLoginTimeService;
import com.nisum.myteam.service.IEmployeeService;
import lombok.extern.slf4j.Slf4j;
......@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@RestController
......@@ -24,15 +29,17 @@ public class EffectiveLoginTimeController {
@Autowired
private IEmployeeService employeeService;
// @GetMapping("/effecitveLoginTime")
// public EffectiveLoginData getLoginData(@RequestParam("loginId") String loginEmpId) throws MyTeamException {
//// List<Employee> allEmployees = employeeService.getActiveEmployees();
//// for(Employee employee:allEmployees){
//// EffectiveLoginData effectiveLoginData =
//// effectiveLoginTimeService.calculateEffectiveLoginTimeForEmpAndSave(employee.getEmployeeId());
//// }
// return effectiveLoginTimeService.calculateEffectiveLoginTimeForEmpAndSave(loginEmpId);
// }
@GetMapping("/updateLogins")
public List<EffectiveLoginData> getLoginData() throws MyTeamException {
List<EffectiveLoginData> loginData = new ArrayList<>();
List<Employee> allEmployees = employeeService.getActiveEmployees();
for(Employee employee:allEmployees){
EffectiveLoginData effectiveLoginData =
effectiveLoginTimeService.calculateEffectiveLoginTimeForEmpAndSave(employee);
loginData.add(effectiveLoginData);
}
return loginData;
}
@GetMapping("/effectiveLogin")
public Map<String,Object> getAllEmployeesLoginData(
@RequestParam("employeeId") long employeeId,
......
......@@ -26,6 +26,7 @@ public class EffectiveLoginData implements Serializable{
@Id
private ObjectId id;
private String name;
private String employeeId;
private Date date;
private String loginTime;
......
......@@ -29,7 +29,7 @@ public class EffectiveLoginTimeScheduler {
List<Employee> allEmployees = employeeService.getActiveEmployees();
for(Employee employee:allEmployees){
EffectiveLoginData effectiveLoginData =
effectiveLoginTimeService.calculateEffectiveLoginTimeForEmpAndSave(employee.getEmployeeId());
effectiveLoginTimeService.calculateEffectiveLoginTimeForEmpAndSave(employeex);
}
}
}
......@@ -3,6 +3,7 @@ package com.nisum.myteam.service;
import com.nisum.myteam.exception.handler.MyTeamException;
import com.nisum.myteam.model.EmployeeLoginData;
import com.nisum.myteam.model.dao.EffectiveLoginData;
import com.nisum.myteam.model.dao.Employee;
import java.text.ParseException;
import java.util.Date;
......@@ -11,7 +12,7 @@ import java.util.Map;
public interface IEffectiveLoginTimeService {
public EffectiveLoginData calculateEffectiveLoginTimeForEmpAndSave(String employeeId) throws MyTeamException;
public EffectiveLoginData calculateEffectiveLoginTimeForEmpAndSave(Employee employee) throws MyTeamException;
public Map<String,Object> getEmployeesEffLoginData(long employeeId, Date fromDate, Date toDate) throws ParseException;
}
......@@ -4,6 +4,7 @@ import com.nisum.myteam.configuration.DbConnection;
import com.nisum.myteam.exception.handler.MyTeamException;
import com.nisum.myteam.model.EmployeeLoginData;
import com.nisum.myteam.model.dao.EffectiveLoginData;
import com.nisum.myteam.model.dao.Employee;
import com.nisum.myteam.repository.EffectiveLoginDataRepo;
import com.nisum.myteam.service.IEffectiveLoginTimeService;
import com.nisum.myteam.utils.CommomUtil;
......@@ -33,9 +34,9 @@ public class EffectiveLoginTimeService implements IEffectiveLoginTimeService {
private EffectiveLoginDataRepo effectiveLoginDataRepo;
@Override
public EffectiveLoginData calculateEffectiveLoginTimeForEmpAndSave(String employeeId) throws MyTeamException {
public EffectiveLoginData calculateEffectiveLoginTimeForEmpAndSave(Employee employee) throws MyTeamException {
String query = String.format(MyTeamUtils.EMPLOYEE_YESTERDAY_LOGIN_DETAILS_QUERY,employeeId);
String query = String.format(MyTeamUtils.EMPLOYEE_YESTERDAY_LOGIN_DETAILS_QUERY,employee.getEmployeeId());
EffectiveLoginData effectiveLoginData = null;
try (Connection connection = dbConnection.getDBConnection();
Statement statement = connection.createStatement();
......@@ -61,6 +62,7 @@ public class EffectiveLoginTimeService implements IEffectiveLoginTimeService {
if(Strings.isNullOrEmpty(entryType)){
effectiveLoginData = new EffectiveLoginData();
entryType = employeeLoginData.getEntryType();
effectiveLoginData.setName(employee.getEmployeeName());
effectiveLoginData.setEmployeeId(employeeLoginData.getEmployeeId());
effectiveLoginData.setDate(employeeLoginData.getDate());
effectiveLoginData.setLoginTime(employeeLoginData.getTime().toString());
......
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