Changed Active and inactive condition for the resource allocated in the project

src/main/java/com/nisum/myteam/MyTeamApplication.java

@@ -14,7 +14,6 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
 
 @SpringBootApplication
-@EnableAutoConfiguration
 @EnableMongoRepositories(basePackages = { "com.nisum.myteam.repository" })
 public class MyTeamApplication extends SpringBootServletInitializer {
 

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

+package com.nisum.myteam.model.dao;
+
+
+import lombok.*;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.Date;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+@Document(collection = "employeeSubStatus")
+public class EmployeeSubStatus {
+
+    @Id
+    private ObjectId id;
+    @NonNull
+    private String employeeID;
+    @NonNull
+    private String subStatus;
+    @NonNull
+    private Date fromDate;
+    @NonNull
+    private Date toDate;
+}

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

@@ -135,19 +135,19 @@ public class ResourceService implements IResourceService {
                     respMap.put("statusCode", 811);
                     respMap.put("message", "Resource is already allocated after "+latestAllocation.getBillingStartDate());
                 }else{
-                    if (resourceReq.getBillingEndDate().compareTo(new Date()) < 0) {
-                        resourceReq.setStatus(MyTeamUtils.RELEASED_STATUS);//update Status of allocation
-                        Resource resourceBench = new Resource();
-                        resourceBench.setProjectId(MyTeamUtils.BENCH_PROJECT_ID);
-                        resourceBench.setEmployeeId(resourceReq.getEmployeeId());
-                        resourceBench.setResourceRole(resourceReq.getResourceRole());
-                        resourceBench.setStatus(MyTeamUtils.RELEASED_STATUS);//add alocation status as Released
-                        resourceBench.setBillingStartDate(MyTeamDateUtils.getDayMoreThanDate(resourceReq.getBillingEndDate()));
-                        resourceBench.setBillingEndDate(projectService.getProjectByProjectId(MyTeamUtils.BENCH_PROJECT_ID).getProjectEndDate());
-                        resourceBench.setBillableStatus(MyTeamUtils.BENCH_BILLABILITY_STATUS);
-                        resourceBench.setAuditFields(loginEmpId, MyTeamUtils.CREATE);
-                        resourceRepo.save(resourceBench);
-                    }
+//                    if (resourceReq.getBillingEndDate().compareTo(new Date()) < 0) {
+//                        resourceReq.setStatus(MyTeamUtils.RELEASED_STATUS);//update Status of allocation
+//                        Resource resourceBench = new Resource();
+//                        resourceBench.setProjectId(MyTeamUtils.BENCH_PROJECT_ID);
+//                        resourceBench.setEmployeeId(resourceReq.getEmployeeId());
+//                        resourceBench.setResourceRole(resourceReq.getResourceRole());
+//                        resourceBench.setStatus(MyTeamUtils.RELEASED_STATUS);//add alocation status as Released
+//                        resourceBench.setBillingStartDate(MyTeamDateUtils.getDayMoreThanDate(resourceReq.getBillingEndDate()));
+//                        resourceBench.setBillingEndDate(projectService.getProjectByProjectId(MyTeamUtils.BENCH_PROJECT_ID).getProjectEndDate());
+//                        resourceBench.setBillableStatus(MyTeamUtils.BENCH_BILLABILITY_STATUS);
+//                        resourceBench.setAuditFields(loginEmpId, MyTeamUtils.CREATE);
+//                        resourceRepo.save(resourceBench);
+//                    }
                     this.updateExistedResource(resourceReq);
                 }
             }else{
@@ -500,11 +500,10 @@ public class ResourceService implements IResourceService {
 
 
                 // Active
-                if (statusFlag.equals(ResourceStatus.ACTIVE.getStatus()) && billingEndDate.compareTo(new Date()) >= 0 &&
-                        !resource.getStatus().equals(MyTeamUtils.STATUS_PROPOSED)) {
+                if (statusFlag.equals(ResourceStatus.ACTIVE.getStatus()) && resource.getStatus().equals(MyTeamUtils.STATUS_ENGAGED)) {
                     resourceVO.setResourceStatus(ResourceStatus.ACTIVE.getStatus());
                     resourcesList.add(resourceVO);
-                } else if (statusFlag.equals(ResourceStatus.IN_ACTIVE.getStatus()) && billingEndDate.compareTo(new Date()) < 0) {
+                } else if (statusFlag.equals(ResourceStatus.IN_ACTIVE.getStatus()) && resource.getStatus().equals(MyTeamUtils.RELEASED_STATUS)) {
                     resourceVO.setResourceStatus(ResourceStatus.IN_ACTIVE.getStatus());
                     resourcesList.add(resourceVO);
                 } else if (statusFlag.equals(MyTeamUtils.STATUS_PROPOSED) && resource.getStatus().equals(MyTeamUtils.STATUS_PROPOSED)){

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

@@ -14,7 +14,7 @@ public class MyTeamUtils {
 	//public final static String driverUrl = "jdbc:ucanaccess://";
 	//public final static String msdriveUrl ="jdbc:sqlserver://";
 	public final static String RELEASED_STATUS="Released";
-	public final static String Engaged_STATUS="Engaged";
+	public final static String STATUS_ENGAGED ="Engaged";
 	public static final String STATUS_PROPOSED ="Proposed" ;
 
 	public final static DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");