Renamed the references of ResourceAlloc to resources in all other files

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

@@ -4,12 +4,11 @@ import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.ColumnChartData;
 import com.nisum.myteam.model.GroupByCount;
 import com.nisum.myteam.model.ReportSeriesRecord;
-import com.nisum.myteam.model.dao.Account;
 import com.nisum.myteam.model.dao.Employee;
-import com.nisum.myteam.model.dao.ResourceAllocation;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.model.vo.ResourceVO;
 import com.nisum.myteam.service.IEmployeeService;
-import com.nisum.myteam.service.IResourceAllocationService;
+import com.nisum.myteam.service.IResourceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -47,7 +46,7 @@ public class ReportsController {
     private IEmployeeService employeeService;
 
     @Autowired
-    private IResourceAllocationService resourceService;
+    private IResourceService resourceService;
 
    //Ok Response
     @RequestMapping(value = "/getEmployeesByFunctionalGroup1",
@@ -132,7 +131,7 @@ public class ReportsController {
 
 
         // Convert the aggregation result into a List
-        AggregationResults<ColumnChartData> groupResults = mongoTemplate.aggregate(aggregate, ResourceAllocation.class,
+        AggregationResults<ColumnChartData> groupResults = mongoTemplate.aggregate(aggregate, Resource.class,
                         ColumnChartData.class);
         List<ColumnChartData> result = groupResults.getMappedResults();
         List<String> statusList = new ArrayList();
@@ -246,7 +245,7 @@ public class ReportsController {
 
             // Convert the aggregation result into a List
             AggregationResults<ColumnChartData> groupResults1 = mongoTemplate
-                    .aggregate(agg1, ResourceAllocation.class,
+                    .aggregate(agg1, Resource.class,
                             ColumnChartData.class);
             List<ColumnChartData> result1 = groupResults1.getMappedResults();
 
@@ -341,11 +340,11 @@ public class ReportsController {
     @RequestMapping(value = "/fetchEmployeeDetailsByDateBillability",
             method = RequestMethod.GET,
             produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<List<ResourceAllocation>> fetchEmployeeDetailsByDateBillability(
+    public ResponseEntity<List<Resource>> fetchEmployeeDetailsByDateBillability(
             @RequestParam("billabilityStatus") String billabilityStatus,
             @RequestParam("reportDate") String reportDateString)
             throws MyTeamException {
-        List<ResourceAllocation> empList = new ArrayList<>();
+        List<Resource> empList = new ArrayList<>();
         if (reportDateString != null && !reportDateString.isEmpty()) {
             String pattern = "MM-dd-yyyy";
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
@@ -368,7 +367,7 @@ public class ReportsController {
                     criteriaV1.orOperator(criteriaV21, criteriaV22));
             Query query = new Query();
             query.addCriteria(criteriaV221);
-            empList = mongoTemplate.find(query, ResourceAllocation.class);
+            empList = mongoTemplate.find(query, Resource.class);
         }
         return new ResponseEntity<>(empList, HttpStatus.OK);
     }

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

@@ -17,7 +17,7 @@ import java.util.Date;
 @NoArgsConstructor
 @ToString
 @Document(collection = "resourceAllocation")
-public class ResourceAllocation extends AuditFields implements Serializable {
+public class Resource extends AuditFields implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,22 +2,21 @@ package com.nisum.myteam.repository;
 
 
 import com.nisum.myteam.model.dao.Resource;
-import com.nisum.myteam.model.dao.ResourceAllocation;
 import org.bson.types.ObjectId;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.List;
 
-public interface ResourceAllocationRepo
-        extends MongoRepository<ResourceAllocation, String> {
+public interface ResourceRepo
+        extends MongoRepository<Resource, String> {
 
-    List<ResourceAllocation> findByProjectId(String projectId);
+    List<Resource> findByProjectId(String projectId);
 
-    List<ResourceAllocation> findByEmployeeId(String employeeId);
+    List<Resource> findByEmployeeId(String employeeId);
 
-    ResourceAllocation findById(ObjectId id);
+    Resource findById(ObjectId id);
 
-    List<ResourceAllocation> findByEmployeeIdAndProjectId(String employeeId, String projectId);
+    List<Resource> findByEmployeeIdAndProjectId(String employeeId, String projectId);
 
    // List<Resource> findByEmployeeIdAndActive(String employeeId, boolean status);
 

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

@@ -4,7 +4,7 @@ import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.dao.Account;
 import com.nisum.myteam.model.dao.EmpLoginData;
 import com.nisum.myteam.model.dao.Project;
-import com.nisum.myteam.model.dao.ResourceAllocation;
+import com.nisum.myteam.model.dao.Resource;
 
 import java.util.HashMap;
 import java.util.List;
@@ -58,7 +58,7 @@ public interface IProjectService {
 
     public List<Project> getProjectsForDeliveryLead(String deliveryLeadId);
 
-    List<ResourceAllocation> getResourcesUnderProject(String empId);
+    List<Resource> getResourcesUnderProject(String empId);
 
 
 }

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

@@ -2,40 +2,40 @@ package com.nisum.myteam.service;
 
 import com.nisum.myteam.exception.handler.MyTeamException;
 import com.nisum.myteam.model.dao.Employee;
-import com.nisum.myteam.model.dao.ResourceAllocation;
+import com.nisum.myteam.model.dao.Resource;
 import com.nisum.myteam.model.vo.EmployeeShiftsVO;
 import com.nisum.myteam.model.vo.MyProjectAllocationVO;
 import com.nisum.myteam.model.vo.ResourceVO;
 
 import java.util.List;
 
-public interface IResourceAllocationService {
+public interface IResourceService {
 
 
-    ResourceAllocation addResourceAllocation(ResourceAllocation resourceAllocation, String loginEmpId) throws MyTeamException;
+    Resource addResource(Resource resourceAllocation, String loginEmpId) throws MyTeamException;
 
-    public void updateExistedResourceAlloc(ResourceAllocation resourceAlloc) throws MyTeamException;
+    public void updateExistedResource(Resource resourceAlloc) throws MyTeamException;
 
-    public void insertNewResourceAllocWithNewStatus(ResourceAllocation resourceAllocReq, String loginEmpId) throws MyTeamException;
+    public void insertNewResourceWithNewStatus(Resource resourceAllocReq, String loginEmpId) throws MyTeamException;
 
-    void deleteResource(ResourceAllocation resource, String loginEmpId);
+    void deleteResource(Resource resource, String loginEmpId);
 
-    List<ResourceAllocation> getAllResourcesForAllActiveProjects();
+    List<Resource> getAllResourcesForAllActiveProjects();
 
-    List<ResourceAllocation> getResourcesSortByBillingStartDate(String employeeId);
+    List<Resource> getResourcesSortByBillingStartDate(String employeeId);
 
     List<ResourceVO> getActiveResources(String empId);
 
 
     public List<ResourceVO> getResourcesForProject(String projectId, String statusFlag);
 
-    public List<ResourceAllocation> getResourcesUnderDeliveryLead(String empId);
+    public List<Resource> getResourcesUnderDeliveryLead(String empId);
 
 
     public List<ResourceVO> getBillingsForEmployee(String empId);
 
 
-    public List<ResourceAllocation> getBillingsForProject(String empId, String projectId);
+    public List<Resource> getBillingsForProject(String empId, String projectId);
 
 
     public List<MyProjectAllocationVO> getWorkedProjectsForResource(String empId);
@@ -43,13 +43,13 @@ public interface IResourceAllocationService {
 
     public List<Employee> getUnAssignedEmployees();
 
-    public List<ResourceAllocation> getAllResources();
+    public List<Resource> getAllResources();
 
     public List<ResourceVO> getAllResourcesVO();
 
     public void deleteResourcesUnderProject(String projectId);
 
-    public ResourceAllocation addResourceToBenchProject(Employee employee, String loginEmpId) throws MyTeamException;
+    public Resource addResourceToBenchProject(Employee employee, String loginEmpId) throws MyTeamException;
 
 
     public List<EmployeeShiftsVO> getResourcesForShift(String shift);

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

@@ -2,13 +2,12 @@ package com.nisum.myteam.service.impl;
 
 import com.nisum.myteam.model.dao.Employee;
 import com.nisum.myteam.model.dao.Project;
-import com.nisum.myteam.model.dao.ResourceAllocation;
 import com.nisum.myteam.model.vo.EmployeeDashboardVO;
 import com.nisum.myteam.model.vo.ResourceVO;
 import com.nisum.myteam.service.IDashboardService;
 import com.nisum.myteam.service.IEmployeeService;
 import com.nisum.myteam.service.IProjectService;
-import com.nisum.myteam.service.IResourceAllocationService;
+import com.nisum.myteam.service.IResourceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +23,7 @@ public class DashboardService implements IDashboardService {
     private IEmployeeService employeeService;
 
     @Autowired
-    private IResourceAllocationService resourceService;
+    private IResourceService resourceService;
 
     @Autowired
     private IProjectService projectService;
@@ -39,7 +38,7 @@ public class DashboardService implements IDashboardService {
         Map<String, Object> teamMatesStatusMap = new HashMap();
 
         // Find all active employees
-        //List<ResourceAllocation> resources = resourceService.getAllResources();
+        //List<Resource> resources = resourceService.getAllResources();
 
         List<ResourceVO> resources = resourceService.getAllResourcesVO();
 

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

@@ -49,7 +49,7 @@ public class EmployeeService implements IEmployeeService {
     private IEmployeeLocationService empLocationService;
 
     @Autowired
-    private IResourceAllocationService resourceService;
+    private IResourceService resourceService;
 
     @Override
     public Employee createEmployee(Employee employee, String loginEmpId) throws MyTeamException {

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

@@ -40,7 +40,7 @@ public class ProjectService implements IProjectService {
     private IDomainService domainService;
 
     @Autowired
-    private ResourceAllocationService resourceAllocService;
+    private ResourceService resourceService;
 
     @Autowired
     private IEmployeeService employeeService;
@@ -130,7 +130,7 @@ public class ProjectService implements IProjectService {
         Project project = projectRepo.findByProjectId(projectId);
         projectRepo.delete(project);
 
-        resourceAllocService.deleteResourcesUnderProject(projectId);
+        resourceService.deleteResourcesUnderProject(projectId);
     }
 
 
@@ -198,19 +198,19 @@ public class ProjectService implements IProjectService {
     }
 
     @Override
-    public List<ResourceAllocation> getResourcesUnderProject(String empId) {
+    public List<Resource> getResourcesUnderProject(String empId) {
         List<String> projectsIdsList = new ArrayList<>();
-        List<ResourceAllocation> resourcesList = new ArrayList<>();
+        List<Resource> resourcesList = new ArrayList<>();
 
         List<Project> projectsList = projectRepo.findByDeliveryLeadIds(empId);
         for (Project project : projectsList)
             projectsIdsList.add(project.getProjectId());
 
         Query query = new Query(Criteria.where("projectId").in(projectsIdsList));
-        List<ResourceAllocation> resourcesListPersisted = mongoTemplate.find(query, ResourceAllocation.class);
+        List<Resource> resourcesListPersisted = mongoTemplate.find(query, Resource.class);
 
 
-        for (ResourceAllocation resource : resourcesListPersisted) {
+        for (Resource resource : resourcesListPersisted) {
             if (!resource.getEmployeeId().equals(empId))
                 resourcesList.add(resource);
         }
@@ -247,7 +247,7 @@ public class ProjectService implements IProjectService {
     }
 
 
-    private String validateAgainstDOJ(ResourceAllocation resource) {
+    private String validateAgainstDOJ(Resource resource) {
         String response = null;
         Date empDoj = employeeService.getEmployeeById(resource.getEmployeeId()).getDateOfJoining();
         if (resource.getBillingStartDate().compareTo(empDoj) < 0) {
@@ -405,7 +405,7 @@ public class ProjectService implements IProjectService {
 
 
 //    public Resource addNewBeanchAllocation(Employee employee, String loginEmpId) {
-//        ResourceAllocation resourcePersisted = null;
+//        Resource resourcePersisted = null;
 //        Resource resourceBench = new Resource();
 //        resourceBench.setAccount(MyTeamUtils.BENCH_ACCOUNT);
 //        resourceBench.setBillableStatus(MyTeamUtils.BENCH_BILLABILITY_STATUS);