Merge branch 'FEATURE/REPORTS_ENHANCEMENTS' of E:\MyTime\mytime with conflicts.

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

@@ -10,7 +10,6 @@ import com.nisum.myteam.repository.EmployeeVisaRepo;
 import com.nisum.myteam.service.IEmployeeService;
 import com.nisum.myteam.service.IProjectService;
 import com.nisum.myteam.service.impl.ResourceService;
-import com.nisum.myteam.statuscodes.ResourceAllocationStatus;
 import com.nisum.myteam.utils.MyTeamUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -50,14 +49,15 @@ public class ResourceController {
 
             if (resourceService.validateBillingStartEndDateAgainstProjectStartEndDate(resourceAllocationReq, loginEmpId)) {
                 if (resourceService.validateBillingStartDateAgainstDOJ(resourceAllocationReq)) {
-                    if (!resourceService.isResourceAssignedToAnyProject(resourceAllocationReq)) {
-                        if(resourceService.validateAllocationAgainstPrevAllocation(resourceAllocationReq)) {
+                    if (resourceService.isResourceAvailable(resourceAllocationReq)) {
+                        if (resourceService.validateAllocationAgainstPrevAllocation(resourceAllocationReq)) {
                             Resource resourcePersisted = resourceService.addResource(resourceAllocationReq, loginEmpId);
 
                             ResponseDetails createResponseDetails = new ResponseDetails(new Date(), 800, "Resource has been created",
                                     "Resource description", null, request.getContextPath(), "details", resourcePersisted);
                             return new ResponseEntity<ResponseDetails>(createResponseDetails, HttpStatus.OK);
                         }
+
                     }
                 }
             }

src/main/resources/application.properties

@@ -2,16 +2,16 @@ server.port=8080
 server.context-path=/myTeam/
 
 #Production configuration
-spring.data.mongodb.host=10.3.45.11
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=mytimedb
-spring.data.mongodb.username=mytime
-spring.data.mongodb.password=nisum@123
+#spring.data.mongodb.host=10.3.45.11
+#spring.data.mongodb.port=27017
+#spring.data.mongodb.database=mytimedb
+#spring.data.mongodb.username=mytime
+#spring.data.mongodb.password=nisum@123
 
 #Local Database configuration
-#spring.data.mongodb.host=localhost
-#spring.data.mongodb.port=27017
-#spring.data.mongodb.database=mytime
+spring.data.mongodb.host=localhost
+spring.data.mongodb.port=27017
+spring.data.mongodb.database=mytime
 
 quartz.enabled=true
 cron.expression=0 45 10/3 1/1 * ? *