provided repository pojo classes into one package

src/main/java/com/nisum/myteam/controller/AccountController.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.controller;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Account;
+import com.nisum.myteam.model.dao.Account;
 import com.nisum.myteam.service.IAccountService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/nisum/myteam/controller/AttendanceController.java

@@ -17,9 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.AttendenceData;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.service.IAttendanceService;
-import com.nisum.myteam.service.IEmployeeService;
 
 @RestController
 @RequestMapping("/attendance")

src/main/java/com/nisum/myteam/controller/BillingController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Billing;
+import com.nisum.myteam.model.dao.Billing;
 import com.nisum.myteam.service.IBillingService;
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/nisum/myteam/controller/DesignationController.java

@@ -16,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 import com.nisum.myteam.service.IDesignationService;
-import com.nisum.myteam.service.impl.DesignationService;
 
 @RestController
 public class DesignationController {

src/main/java/com/nisum/myteam/controller/DomainController.java

 package com.nisum.myteam.controller;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Domain;
+import com.nisum.myteam.model.dao.Domain;
 import com.nisum.myteam.service.IDomainService;
-import com.nisum.myteam.utils.MyTeamUtils;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/myteam/controller/EmployeeController.java

@@ -7,7 +7,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -22,8 +21,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.service.IEmployeeRoleService;
 import com.nisum.myteam.service.IEmployeeService;
 

src/main/java/com/nisum/myteam/controller/EmployeeLocationController.java

@@ -12,14 +12,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 import com.nisum.myteam.service.IEmployeeLocationService;
-import com.nisum.myteam.service.impl.EmployeeLocationService;
 
 @RestController
 public class EmployeeLocationController {

src/main/java/com/nisum/myteam/controller/MasterDataController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 import com.nisum.myteam.service.IMasterDataService;
 
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/nisum/myteam/controller/OrgLocationController.java

@@ -6,8 +6,6 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -18,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 import com.nisum.myteam.service.IOrgLocationService;
-import com.nisum.myteam.service.impl.OrgLocationService;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/myteam/controller/ProjectController.java

@@ -2,8 +2,8 @@ package com.nisum.myteam.controller;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Project;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Project;
 import com.nisum.myteam.service.IEmployeeService;
 import com.nisum.myteam.service.IProjectService;
 import com.nisum.myteam.utils.MyTeamUtils;

src/main/java/com/nisum/myteam/controller/ReportsController.java

@@ -32,17 +32,14 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Billing;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Billing;
 import com.nisum.myteam.model.ColumnChartData;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.model.GroupByCount;
 import com.nisum.myteam.model.ReportSeriesRecord;
-import com.nisum.myteam.model.Resource;
-import com.nisum.myteam.repository.BillingRepo;
-import com.nisum.myteam.repository.EmployeeVisaRepo;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.service.IEmployeeService;
-import com.nisum.myteam.service.IProjectService;
 import com.nisum.myteam.service.IResourceService;
 
 @RestController

src/main/java/com/nisum/myteam/controller/ResourceController.java

@@ -2,10 +2,10 @@ package com.nisum.myteam.controller;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeDashboardVO;
-import com.nisum.myteam.model.EmployeeVisa;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.EmployeeVisa;
+import com.nisum.myteam.model.dao.Resource;
+import com.nisum.myteam.model.vo.EmployeeDashboardVO;
 import com.nisum.myteam.repository.EmployeeVisaRepo;
 import com.nisum.myteam.service.IEmployeeService;
 import com.nisum.myteam.service.IProjectService;
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,15 +36,14 @@ public class ResourceController {
     private IProjectService projectService;
 
     @Autowired
-    private EmployeeVisaRepo employeeVisaRepo;
+   // private EmployeeVisaRepo employeeVisaRepo;
 
     @Autowired
     private IResourceService resourceService;
 
 
-    // @RequestMapping(value = "/addEmployeeToTeam"
     @RequestMapping(value = "/resources", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> addResourceToTeam(@RequestBody Resource resourceReq,
+    public ResponseEntity<?> createResource(@RequestBody Resource resourceReq,
                                                @RequestParam(value = "loginEmpId", required = true) String loginEmpId, HttpServletRequest request) throws MyTeamException {
         if (StringUtils.isNotBlank(loginEmpId)) {
             resourceReq.setActive(true);
@@ -61,7 +61,6 @@ public class ResourceController {
 
     }
 
-    // @RequestMapping(value = "/updateTeammate"
     @RequestMapping(value = "/resources", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> updateResource(@RequestBody Resource resourceReq,
                                             @RequestParam(value = "loginEmpId") String loginEmpId, HttpServletRequest request) throws MyTeamException {
@@ -78,7 +77,6 @@ public class ResourceController {
         return new ResponseEntity<ResponseDetails>(responseDetails, HttpStatus.OK);
     }
 
-    // @RequestMapping(value = "/deleteTeammate"
     @RequestMapping(value = "/resources", method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> deleteResource(@RequestBody Resource resourceReq,
                                             @RequestParam(value = "loginEmpId", required = true) String loginEmpId, HttpServletRequest request) throws MyTeamException {
@@ -95,7 +93,6 @@ public class ResourceController {
         return new ResponseEntity<ResponseDetails>(responseDetails, HttpStatus.OK);
     }
 
-    // @RequestMapping(value = "/getEmployeeProjectInfo"
     @RequestMapping(value = "/resources/employeeId/{employeeId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getResourcesSortByStartDate(@PathVariable(value = "employeeId", required = true) String employeeId, HttpServletRequest request)
             throws MyTeamException {
@@ -113,7 +110,6 @@ public class ResourceController {
 
     }
 
-    //@RequestMapping(value = "/getMyTeamDetails"
     @RequestMapping(value = "/resources/active", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getActiveResources(@RequestParam(value = "employeeId", required = false) String employeeId, HttpServletRequest request)
             throws MyTeamException {
@@ -131,7 +127,6 @@ public class ResourceController {
     }
 
 
-    // @RequestMapping(value = "/getShiftDetails"
     @RequestMapping(value = "/resources/shifts/{shift}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getResourcesForShift(@PathVariable(value = "shift", required = true) String shift, HttpServletRequest request)
             throws MyTeamException {
@@ -148,7 +143,6 @@ public class ResourceController {
 
     }
 
-    // @RequestMapping(value = "/getProjectAllocations"
     @RequestMapping(value = "/resources/projects", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getResourcesAllocatedForAllProjects(HttpServletRequest request) throws MyTeamException {
 
@@ -159,7 +153,6 @@ public class ResourceController {
 
     }
 
-    // @RequestMapping(value = "/getProjectDetails"
     @RequestMapping(value = "/resources/project/{projectId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getResourcesForProject(@PathVariable(value = "projectId", required = true) String projectId,
                                                     @RequestParam(value = "status", required = false, defaultValue = MyTeamUtils.ACTIVE) String status,
@@ -179,7 +172,6 @@ public class ResourceController {
     }
 
 
-    //@RequestMapping(value = "/getTeamDetails"
     @RequestMapping(value = "/resources/deliverylead/{deliveryLeadId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<?> getTeamDetails(@PathVariable(value = "deliveryLeadId", required = true) String deliveryLeadId, HttpServletRequest request)
             throws MyTeamException {
@@ -223,7 +215,9 @@ public class ResourceController {
         List<Employee> employees = new ArrayList<>();
 
         if (passport != null && !"passport".equalsIgnoreCase(passport)) {
+
             List<EmployeeVisa> employeeVisas = employeeVisaRepo.findByVisaName(passport);
+
             List<String> employeeIds = null;
             if (employeeVisas != null) {
                 employeeIds = employeeVisas.stream().map(EmployeeVisa::getEmployeeId).collect(Collectors.toList());
@@ -253,32 +247,20 @@ public class ResourceController {
 
 
     @RequestMapping(value = "/addEmployeeToTeamWithCheck", method = RequestMethod.POST, produces = MediaType.TEXT_PLAIN_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<String> addEmployeeToTeamWithCheck(@RequestBody Resource resource,
-                                                             @RequestParam(value = "loginEmpId") String loginEmpId) throws MyTeamException {
-        String response = projectService.addProjectTeamMateWithCheck(resource, loginEmpId);
-        return new ResponseEntity<>(response, HttpStatus.OK);
-    }
-
-}
-
-// @RequestMapping(value = "/employee", method = RequestMethod.GET,
-// public ResponseEntity<Employee> getEmployee(
-
-// @RequestMapping(value = "/updateEmployeeRole", method =
-// public ResponseEntity<Employee> updateEmployeeRole(@RequestBody Employee
-
-// @RequestMapping(value = "/deleteEmployee"
-// public ResponseEntity<String> deleteEmployee
-
-// @RequestMapping(value = "/getEmployeeRoleData",
-// public ResponseEntity<Employee> getEmployeeRoleData(
-
-// @RequestMapping(value = "/addProject"
-// public ResponseEntity<Project> addProject(
+    public ResponseEntity<?> addEmployeeToTeamWithCheck(@RequestBody Resource resourceReq,
+                                                        @RequestParam(value = "loginEmpId") String loginEmpId, HttpServletRequest request) throws MyTeamException {
 
-// @RequestMapping(value = "/getEmployeesToTeam"
-// public ResponseEntity<List<Employee>> getActiveEmployeesSortByName() throws
-// MyTimeException {
+        if (StringUtils.isNotBlank(loginEmpId)) {
+            HashMap<String, Object> responseMap = projectService.addProjectTeamMateWithCheck(resourceReq, loginEmpId);
 
+            ResponseDetails responseDetails = new ResponseDetails(new Date(), 602, responseMap.get("message").toString(),
+                    "List of Resources for dashboard", responseMap.get("resourceObj"), request.getRequestURI(), "Resource details", null);
+            return new ResponseEntity<ResponseDetails>(responseDetails, HttpStatus.OK);
+        }
+        ResponseDetails responseDetails = new ResponseDetails(new Date(), 602, "Please provide Valid Employee Id",
+                "Verification of resource in Bench Project", null, request.getRequestURI(), "Resource details", resourceReq);
+        return new ResponseEntity<ResponseDetails>(responseDetails, HttpStatus.OK);
 
+    }
 
+}

src/main/java/com/nisum/myteam/controller/ShiftController.java

@@ -16,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 import com.nisum.myteam.service.IShiftService;
-import com.nisum.myteam.service.impl.ShiftService;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/myteam/controller/SkillController.java

@@ -16,9 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.exception.handler.ResponseDetails;
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 import com.nisum.myteam.service.ISkillService;
-import com.nisum.myteam.service.impl.SkillService;
 
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/nisum/myteam/controller/VisaController.java

@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeVisa;
-import com.nisum.myteam.model.TravelRequest;
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
+import com.nisum.myteam.model.dao.TravelRequest;
+import com.nisum.myteam.model.dao.Visa;
 import com.nisum.myteam.service.IVisaService;
 
 @RestController
@@ -80,3 +80,4 @@ public class VisaController {
 		return new ResponseEntity<>("Success", HttpStatus.OK);
 	}
 }
+

src/main/java/com/nisum/myteam/model/DateCompare.java

@@ -4,6 +4,7 @@ import java.text.ParseException;
 import java.util.Comparator;
 import java.util.Date;
 
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.utils.MyTeamLogger;
 import com.nisum.myteam.utils.MyTeamUtils;
 

src/main/java/com/nisum/myteam/model/Account.java → src/main/java/com/nisum/myteam/model/dao/Account.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/com/nisum/myteam/model/Billing.java → src/main/java/com/nisum/myteam/model/dao/Billing.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;
 
+import com.nisum.myteam.model.AuditFields;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/nisum/myteam/model/Designation.java → src/main/java/com/nisum/myteam/model/dao/Designation.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Domain.java → src/main/java/com/nisum/myteam/model/dao/Domain.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/com/nisum/myteam/model/EmpLoginData.java → src/main/java/com/nisum/myteam/model/dao/EmpLoginData.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Employee.java → src/main/java/com/nisum/myteam/model/dao/Employee.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/nisum/myteam/model/EmployeeLocation.java → src/main/java/com/nisum/myteam/model/dao/EmployeeLocation.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;

src/main/java/com/nisum/myteam/model/EmployeeRole.java → src/main/java/com/nisum/myteam/model/dao/EmployeeRole.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import org.bson.types.ObjectId;

src/main/java/com/nisum/myteam/model/EmployeeShift.java → src/main/java/com/nisum/myteam/model/dao/EmployeeShift.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
+import com.nisum.myteam.model.AuditFields;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 

src/main/java/com/nisum/myteam/model/EmployeeVisa.java → src/main/java/com/nisum/myteam/model/dao/EmployeeVisa.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.util.Date;
 

src/main/java/com/nisum/myteam/model/MasterData.java → src/main/java/com/nisum/myteam/model/dao/MasterData.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/OrgLocation.java → src/main/java/com/nisum/myteam/model/dao/OrgLocation.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Project.java → src/main/java/com/nisum/myteam/model/dao/Project.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+import com.nisum.myteam.model.AuditFields;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/nisum/myteam/model/Resource.java → src/main/java/com/nisum/myteam/model/dao/Resource.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 import java.util.Date;
 
+import com.nisum.myteam.model.AuditFields;
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

src/main/java/com/nisum/myteam/model/Role.java → src/main/java/com/nisum/myteam/model/dao/Role.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Shift.java → src/main/java/com/nisum/myteam/model/dao/Shift.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/Skill.java → src/main/java/com/nisum/myteam/model/dao/Skill.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.io.Serializable;
 

src/main/java/com/nisum/myteam/model/TravelRequest.java → src/main/java/com/nisum/myteam/model/dao/TravelRequest.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import java.util.Date;
 

src/main/java/com/nisum/myteam/model/Visa.java → src/main/java/com/nisum/myteam/model/dao/Visa.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.dao;
 
 import org.springframework.data.mongodb.core.mapping.Document;
 

src/main/java/com/nisum/myteam/model/EmployeeDashboardVO.java → src/main/java/com/nisum/myteam/model/vo/EmployeeDashboardVO.java

-package com.nisum.myteam.model;
+package com.nisum.myteam.model.vo;
 
 import java.util.Date;
 

src/main/java/com/nisum/myteam/repository/AccountRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Account;
+import com.nisum.myteam.model.dao.Account;
 
 public interface AccountRepo extends MongoRepository<Account, String> {
 	

src/main/java/com/nisum/myteam/repository/BillingRepo.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Billing;
+import com.nisum.myteam.model.dao.Billing;
 
 public interface BillingRepo extends MongoRepository<Billing, String> {
 

src/main/java/com/nisum/myteam/repository/DesignationRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 
 public interface DesignationRepo extends MongoRepository<Designation, String> {
 	

src/main/java/com/nisum/myteam/repository/DomainRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 import java.util.List;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Domain;
+import com.nisum.myteam.model.dao.Domain;
 
 public interface DomainRepo extends MongoRepository<Domain, String> {
 

src/main/java/com/nisum/myteam/repository/EmployeeAttendanceRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 
 public interface EmployeeAttendanceRepo extends MongoRepository<EmpLoginData, Long> {
 

src/main/java/com/nisum/myteam/repository/EmployeeLocationRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 
 public interface EmployeeLocationRepo extends MongoRepository<EmployeeLocation, String> {
 

src/main/java/com/nisum/myteam/repository/EmployeeRepo.java

 package com.nisum.myteam.repository;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.Set;
 
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Employee;
 
 public interface EmployeeRepo
         extends MongoRepository<Employee, String> {

src/main/java/com/nisum/myteam/repository/EmployeeRoleRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeRole;
+import com.nisum.myteam.model.dao.EmployeeRole;
 
 public interface EmployeeRoleRepo extends MongoRepository<EmployeeRole, String> {
 

src/main/java/com/nisum/myteam/repository/EmployeeShiftRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeShift;
+import com.nisum.myteam.model.dao.EmployeeShift;
 
 public interface EmployeeShiftRepo extends MongoRepository<EmployeeShift, String> {
 	

src/main/java/com/nisum/myteam/repository/EmployeeVisaRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.EmployeeVisa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
 
 public interface EmployeeVisaRepo extends MongoRepository<EmployeeVisa, String> {
 	List<EmployeeVisa> findByVisaName(String visaName);

src/main/java/com/nisum/myteam/repository/MasterDataRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 
 public interface MasterDataRepo extends MongoRepository<MasterData, String> {
 	List<MasterData> findByMasterDataTypeAndMasterDataNameAndActiveStatus(String masterDataType, String masterDataName, boolean activeStatus);

src/main/java/com/nisum/myteam/repository/OrgLocationRepo.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 
 public interface OrgLocationRepo extends MongoRepository<OrgLocation, String> {
 	List<OrgLocation> findByLocationAndActiveStatus(String location, boolean activeStatus);

src/main/java/com/nisum/myteam/repository/ProjectRepo.java

@@ -5,7 +5,7 @@ import java.util.Set;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Project;
+import com.nisum.myteam.model.dao.Project;
 
 public interface ProjectRepo extends MongoRepository<Project, String> {
 

src/main/java/com/nisum/myteam/repository/ResourceRepo.java

@@ -6,7 +6,7 @@ import java.util.Optional;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Resource;
 
 public interface ResourceRepo
         extends MongoRepository<Resource, String> {

src/main/java/com/nisum/myteam/repository/RoleRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Role;
+import com.nisum.myteam.model.dao.Role;
 
 public interface RoleRepo extends MongoRepository<Role, String> {
 

src/main/java/com/nisum/myteam/repository/ShiftRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 
 public interface ShiftRepo extends MongoRepository<Shift, String> {
 	

src/main/java/com/nisum/myteam/repository/SkillRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 
 
 public interface SkillRepo extends MongoRepository<Skill, String> {

src/main/java/com/nisum/myteam/repository/TravelRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.TravelRequest;
+import com.nisum.myteam.model.dao.TravelRequest;
 
 public interface TravelRepo extends MongoRepository<TravelRequest, String> {
 	

src/main/java/com/nisum/myteam/repository/VisaRepo.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.repository;
 
 import org.springframework.data.mongodb.repository.MongoRepository;
 
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.Visa;
 
 public interface VisaRepo extends MongoRepository<Visa, String> {
 	

src/main/java/com/nisum/myteam/service/IAccountService.java

@@ -6,7 +6,7 @@ import java.util.Map;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
+import com.nisum.myteam.model.dao.Account;
 
 @Service
 public interface IAccountService {

src/main/java/com/nisum/myteam/service/IAttendanceService.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.AttendenceData;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 
 public interface IAttendanceService {
 

src/main/java/com/nisum/myteam/service/IBillingService.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Billing;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Billing;
+import com.nisum.myteam.model.dao.Employee;
 
 @Service
 public interface IBillingService {

src/main/java/com/nisum/myteam/service/IDesignationService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 
 @Service
 public interface IDesignationService {

src/main/java/com/nisum/myteam/service/IDomainService.java

 package com.nisum.myteam.service;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -8,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Domain;
+import com.nisum.myteam.model.dao.Domain;
 
 /**
  * @author Vijay

src/main/java/com/nisum/myteam/service/IEmployeeDataService.java

@@ -3,7 +3,7 @@ package com.nisum.myteam.service;
 import java.util.List;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 
 public interface IEmployeeDataService {
 	List<EmpLoginData> fetchEmployeeLoginsBasedOnDates(long employeeId, String fromDate, String toDate) throws MyTeamException;

src/main/java/com/nisum/myteam/service/IEmployeeLocationService.java

@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 
 @Service
 public interface IEmployeeLocationService {

src/main/java/com/nisum/myteam/service/IEmployeeRoleService.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Service;
 
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeRole;
+import com.nisum.myteam.model.dao.EmployeeRole;
 
 @Service
 public interface IEmployeeRoleService {

src/main/java/com/nisum/myteam/service/IEmployeeService.java

@@ -6,8 +6,8 @@ import java.util.Set;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Employee;
 
 @Service
 public interface IEmployeeService {

src/main/java/com/nisum/myteam/service/IEmployeeShiftService.java

@@ -2,7 +2,7 @@ package com.nisum.myteam.service;
 
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Resource;
 
 @Service
 public interface IEmployeeShiftService {

src/main/java/com/nisum/myteam/service/IMasterDataService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 
 @Service
 public interface IMasterDataService  {

src/main/java/com/nisum/myteam/service/IOrgLocationService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 
 @Service
 public interface IOrgLocationService {

src/main/java/com/nisum/myteam/service/IProjectService.java

@@ -5,7 +5,8 @@ import java.util.List;
 import java.util.Set;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.*;
+import com.nisum.myteam.model.dao.*;
+import com.nisum.myteam.model.vo.EmployeeDashboardVO;
 
 public interface IProjectService {
 
@@ -33,7 +34,7 @@ public interface IProjectService {
 
 	public List<EmployeeDashboardVO> getEmployeesDashBoard();
 
-	public String addProjectTeamMateWithCheck(Resource projectTeamMate, String loginEmpId) throws MyTeamException;
+	public HashMap<String,Object>  addProjectTeamMateWithCheck(Resource projectTeamMate, String loginEmpId) throws MyTeamException;
 
 	public List<HashMap<Object, Object>> getProjectsForEmployee(String empId);
 

src/main/java/com/nisum/myteam/service/IResourceService.java

@@ -6,9 +6,8 @@ import org.bson.types.ObjectId;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Billing;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.Resource;
 
 @Service
 public interface IResourceService {

src/main/java/com/nisum/myteam/service/IRoleService.java

@@ -3,7 +3,7 @@ package com.nisum.myteam.service;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Role;
+import com.nisum.myteam.model.dao.Role;
 
 @Service
 public interface IRoleService {

src/main/java/com/nisum/myteam/service/IShiftService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 
 @Service
 public interface IShiftService {

src/main/java/com/nisum/myteam/service/ISkillService.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 
 @Service
 public interface ISkillService {

src/main/java/com/nisum/myteam/service/IVisaService.java

@@ -5,12 +5,9 @@ package com.nisum.myteam.service;
 
 import java.util.List;
 
-import org.springframework.web.multipart.MultipartFile;
-
-import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeVisa;
-import com.nisum.myteam.model.TravelRequest;
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
+import com.nisum.myteam.model.dao.TravelRequest;
+import com.nisum.myteam.model.dao.Visa;
 
 /**
  * @author nisum

src/main/java/com/nisum/myteam/service/impl/AccountService.java

 package com.nisum.myteam.service.impl;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.repository.AccountRepo;
 import com.nisum.myteam.service.IAccountService;
 import com.nisum.myteam.service.IEmployeeRoleService;

src/main/java/com/nisum/myteam/service/impl/AttendanceService.java

@@ -3,13 +3,8 @@ package com.nisum.myteam.service.impl;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -20,8 +15,8 @@ import org.springframework.stereotype.Service;
 import com.nisum.myteam.configuration.DbConnection;
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.AttendenceData;
-import com.nisum.myteam.model.EmpLoginData;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.EmpLoginData;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.repository.ResourceRepo;
 import com.nisum.myteam.service.IAttendanceService;
 import com.nisum.myteam.utils.CommomUtil;

src/main/java/com/nisum/myteam/service/impl/BillingService.java

@@ -10,8 +10,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Billing;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Billing;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.repository.BillingRepo;
 import com.nisum.myteam.service.IBillingService;
 import com.nisum.myteam.utils.MyTeamUtils;

src/main/java/com/nisum/myteam/service/impl/DesignationService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Designation;
+import com.nisum.myteam.model.dao.Designation;
 import com.nisum.myteam.repository.DesignationRepo;
 import com.nisum.myteam.service.IDesignationService;
 

src/main/java/com/nisum/myteam/service/impl/DomainService.java

@@ -7,8 +7,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -18,8 +17,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Domain;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Domain;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.repository.DomainRepo;
 import com.nisum.myteam.service.IDomainService;
 import com.nisum.myteam.service.IEmployeeRoleService;

src/main/java/com/nisum/myteam/service/impl/EmployeeDataService.java

@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 
 import com.nisum.myteam.configuration.DbConnection;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.service.IEmployeeDataService;
 import com.nisum.myteam.utils.CommomUtil;
 import com.nisum.myteam.utils.MyTeamLogger;

src/main/java/com/nisum/myteam/service/impl/EmployeeLocationService.java

@@ -10,8 +10,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeLocation;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.EmployeeLocation;
 import com.nisum.myteam.repository.EmployeeLocationRepo;
 import com.nisum.myteam.service.IEmployeeLocationService;
 

src/main/java/com/nisum/myteam/service/impl/EmployeeRoleService.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Service;
 
 import com.mongodb.WriteResult;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmployeeRole;
+import com.nisum.myteam.model.dao.EmployeeRole;
 import com.nisum.myteam.repository.EmployeeRoleRepo;
 import com.nisum.myteam.repository.RoleRepo;
 import com.nisum.myteam.service.IEmployeeRoleService;

src/main/java/com/nisum/myteam/service/impl/EmployeeService.java

 package com.nisum.myteam.service.impl;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Domain;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Domain;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.repository.EmployeeRepo;
 import com.nisum.myteam.service.*;
 import com.nisum.myteam.utils.MyTeamUtils;

src/main/java/com/nisum/myteam/service/impl/EmployeeShiftService.java

@@ -6,8 +6,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.EmployeeShift;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.EmployeeShift;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.repository.EmployeeShiftRepo;
 import com.nisum.myteam.service.IEmployeeShiftService;
 import com.nisum.myteam.utils.MyTeamUtils;

src/main/java/com/nisum/myteam/service/impl/MasterDataService.java

@@ -6,10 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 import com.nisum.myteam.repository.MasterDataRepo;
 import com.nisum.myteam.service.IMasterDataService;
-import com.nisum.myteam.utils.MyTeamUtils;
 
 @Service("masterDataService")
 public class MasterDataService implements IMasterDataService {

src/main/java/com/nisum/myteam/service/impl/OrgLocationService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.OrgLocation;
+import com.nisum.myteam.model.dao.OrgLocation;
 import com.nisum.myteam.repository.OrgLocationRepo;
 import com.nisum.myteam.service.IOrgLocationService;
 

src/main/java/com/nisum/myteam/service/impl/ProjectService.java

 package com.nisum.myteam.service.impl;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.*;
+import com.nisum.myteam.model.dao.EmpLoginData;
+import com.nisum.myteam.model.dao.*;
+import com.nisum.myteam.model.vo.EmployeeDashboardVO;
 import com.nisum.myteam.repository.*;
 import com.nisum.myteam.service.IAccountService;
 import com.nisum.myteam.service.IDomainService;
@@ -18,8 +20,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
-import com.nisum.myteam.model.Domain;
-
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -314,7 +314,7 @@ public class ProjectService implements IProjectService {
     
     
 	
-	public Resource addNewBeanchAllocation(Employee employee,String loginEmpId)
+	public Resource addNewBeanchAllocation(Employee employee, String loginEmpId)
 	{
 		Resource resourcePersisted=null;
 	    Resource resourceBench = new Resource();
@@ -512,18 +512,21 @@ public class ProjectService implements IProjectService {
     }
 
 
-
 	@Override
-	public String addProjectTeamMateWithCheck(Resource resource, String loginEmpId) throws MyTeamException {
+	public HashMap<String,Object> addProjectTeamMateWithCheck(Resource resource, String loginEmpId) throws MyTeamException {
 		boolean flag = false;
 		String projectName = null;
 		String fromDate = null;
 		String toDate = null;
 		String result = null;
+		HashMap<String, Object> responseMap = new HashMap<>();
+		Resource resourcePersisted = null;
+
 		List<Resource> teamMateList = resourceRepo.findByEmployeeId(resource.getEmployeeId()).stream()
 				.filter(e -> !("Nisum0000".equalsIgnoreCase(e.getProjectId())))
 				.sorted(Comparator.comparing(Resource::getEndDate).reversed())
 				.collect(Collectors.toList());
+
 		// Checking, if resource has existing project assignment.
 		for (Resource projectMate : teamMateList) {
 			if (projectMate.getEndDate() != null && (projectMate.getEndDate().compareTo(new Date()) > 0)) {
@@ -537,14 +540,18 @@ public class ProjectService implements IProjectService {
 		if (flag) {// If yes, error thrown to user.
 			result = "Resource " + resource.getEmployeeId() + " already Assigned to the " + projectName
 					+ " Project" + " from " + fromDate + "to " + toDate;
+
 		} else {// If no, validating new project assignment start date against previous project end date.
 			result = validateNewProjectAssignmentStartDate(teamMateList, resource);
 			if (result == null) {
-				resourceService.addResource(resource, loginEmpId);
+				resourcePersisted = resourceService.addResource(resource, loginEmpId);
 				result = "TeamMate added successfuly";
+
 			}
 		}
-		return result;
+		responseMap.put("message", result);
+		responseMap.put("resourceObj", resourcePersisted);
+		return responseMap;
 
 	}
 	

src/main/java/com/nisum/myteam/service/impl/ResourceService.java

@@ -16,11 +16,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Billing;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeShift;
-import com.nisum.myteam.model.Project;
-import com.nisum.myteam.model.Resource;
+import com.nisum.myteam.model.dao.Billing;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.Project;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.repository.BillingRepo;
 import com.nisum.myteam.repository.EmployeeRepo;
 import com.nisum.myteam.repository.ProjectRepo;

src/main/java/com/nisum/myteam/service/impl/RoleService.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Role;
+import com.nisum.myteam.model.dao.Role;
 import com.nisum.myteam.repository.RoleRepo;
 import com.nisum.myteam.service.IRoleService;
 

src/main/java/com/nisum/myteam/service/impl/ShiftService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Shift;
+import com.nisum.myteam.model.dao.Shift;
 import com.nisum.myteam.repository.ShiftRepo;
 import com.nisum.myteam.service.IShiftService;
 

src/main/java/com/nisum/myteam/service/impl/SkillService.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Skill;
 import com.nisum.myteam.repository.SkillRepo;
 import com.nisum.myteam.service.ISkillService;
 

src/main/java/com/nisum/myteam/service/impl/UploadXLService.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.Employee;
+import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.service.IUploadXLService;
 import com.nisum.myteam.utils.DataValidations;
 import com.nisum.myteam.utils.MyTeamUtils;

src/main/java/com/nisum/myteam/service/impl/VisaService.java

@@ -8,9 +8,9 @@ import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.EmployeeVisa;
-import com.nisum.myteam.model.TravelRequest;
-import com.nisum.myteam.model.Visa;
+import com.nisum.myteam.model.dao.EmployeeVisa;
+import com.nisum.myteam.model.dao.TravelRequest;
+import com.nisum.myteam.model.dao.Visa;
 import com.nisum.myteam.repository.EmployeeRepo;
 import com.nisum.myteam.repository.EmployeeVisaRepo;
 import com.nisum.myteam.repository.TravelRepo;
@@ -37,7 +37,7 @@ public class VisaService implements IVisaService {
     private IEmployeeService userService;
     
     @Autowired
-    private EmployeeRepo employeeRolesRepo;
+    private EmployeeRepo employeeRepo;
     
 
     @Override

src/main/java/com/nisum/myteam/utils/DataValidations.java

@@ -8,7 +8,7 @@ import java.util.regex.Pattern;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.nisum.myteam.model.MasterData;
+import com.nisum.myteam.model.dao.MasterData;
 import com.nisum.myteam.service.IMasterDataService;
 import com.nisum.myteam.service.impl.OrgLocationService;
 

src/main/java/com/nisum/myteam/utils/PdfReportGenerator.java

@@ -24,7 +24,7 @@ import com.itextpdf.text.pdf.PdfPCell;
 import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;
 import com.nisum.myteam.exception.handler.MyTeamException;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.service.IAttendanceService;
 import com.nisum.myteam.service.impl.EmployeeDataService;
 

src/test/java/com/nisum/myteam/controllertest/AccountControllerTest.java

@@ -26,8 +26,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nisum.myteam.controller.AccountController;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.service.IAccountService;
+import com.nisum.myteam.model.dao.Account;
 import com.nisum.myteam.service.impl.AccountService;
 
 public class AccountControllerTest {

src/test/java/com/nisum/myteam/controllertest/AttendanceControllerTest.java

@@ -19,9 +19,8 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import com.nisum.myteam.controller.AttendanceController;
 import com.nisum.myteam.model.AttendenceData;
-import com.nisum.myteam.model.EmpLoginData;
+import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.service.IAttendanceService;
-import com.nisum.myteam.service.IEmployeeService;
 
 public class AttendanceControllerTest {
 

src/test/java/com/nisum/myteam/controllertest/DomainControllerTest.java

@@ -25,7 +25,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nisum.myteam.controller.DomainController;
-import com.nisum.myteam.model.Domain;
+import com.nisum.myteam.model.dao.Domain;
 import com.nisum.myteam.service.IDomainService;
 
 

src/test/java/com/nisum/myteam/controllertest/EmployeeControllerTest.java

@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.bson.types.ObjectId;
 import org.junit.Before;
@@ -30,15 +29,15 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nisum.myteam.controller.EmployeeController;
-import com.nisum.myteam.model.Account;
-import com.nisum.myteam.model.Designation;
-import com.nisum.myteam.model.Domain;
-import com.nisum.myteam.model.Employee;
-import com.nisum.myteam.model.EmployeeLocation;
-import com.nisum.myteam.model.MasterData;
-import com.nisum.myteam.model.OrgLocation;
-import com.nisum.myteam.model.Shift;
-import com.nisum.myteam.model.Skill;
+import com.nisum.myteam.model.dao.Account;
+import com.nisum.myteam.model.dao.Designation;
+import com.nisum.myteam.model.dao.Domain;
+import com.nisum.myteam.model.dao.Employee;
+import com.nisum.myteam.model.dao.EmployeeLocation;
+import com.nisum.myteam.model.dao.MasterData;
+import com.nisum.myteam.model.dao.OrgLocation;
+import com.nisum.myteam.model.dao.Shift;
+import com.nisum.myteam.model.dao.Skill;
 import com.nisum.myteam.service.IEmployeeRoleService;
 import com.nisum.myteam.service.IEmployeeService;
 import com.nisum.myteam.service.impl.DesignationService;