Issue fixed for uploading employee xl file

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

@@ -27,6 +27,9 @@ public class UploadXLService implements IUploadXLService {
 	@Autowired
 	EmployeeService employeeService;
 
+	@Autowired
+    DataValidations dataValidations;
+
 	@Override
 	public String importDataFromExcelFile(MultipartFile file, String logInEmpId) throws MyTeamException {
 		String result = "";
@@ -190,31 +193,32 @@ public class UploadXLService implements IUploadXLService {
 	private boolean importExcelMandatoryColumnsValidation(Employee emp) {
 		boolean mandatoryFlag = true;
 
-		if (!DataValidations.validateNumber(emp.getEmployeeId())) {
+		if (!dataValidations.validateNumber(emp.getEmployeeId())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.validateName(emp.getEmployeeName())) {
+		} else if (!dataValidations.validateName(emp.getEmployeeName())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidGender(emp.getGender())) {
+		} else if (!dataValidations.isValidGender(emp.getGender())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidDate(emp.getDateOfJoining())) {
+		} else if (!dataValidations.isValidDate(emp.getDateOfJoining())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidFunctionalGroup(emp.getFunctionalGroup())) {
+		} else if (!dataValidations.isValidFunctionalGroup(emp.getFunctionalGroup())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidDesignation(emp.getDesignation())) {
+		} else if (!dataValidations.isValidDesignation(emp.getDesignation())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidWorkLocation(emp.getEmpLocation())) {
+		} else if (!dataValidations.isValidWorkLocation(emp.getEmpLocation())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidEmploymentType(emp.getEmploymentType())) {
+		} else if (!dataValidations.isValidEmploymentType(emp.getEmploymentType())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidRole(emp.getRole())) {
+		} else if (!dataValidations.isValidRole(emp.getRole())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isYesOrNo(emp.getHasPassort())) {
+		} else if (!dataValidations.isYesOrNo(emp.getHasPassort())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isYesOrNo(emp.getHasB1())) {
+		} else if (!dataValidations.isYesOrNo(emp.getHasB1())) {
 			mandatoryFlag = false;
-		} else if (!DataValidations.isValidEmail(emp.getEmailId())) {
+		} else if (!dataValidations.isValidEmail(emp.getEmailId())) {
 			mandatoryFlag = false;
 		}
+
 		return mandatoryFlag;
 	}
 
@@ -226,20 +230,22 @@ public class UploadXLService implements IUploadXLService {
 		}
 		if (MyTeamUtils.YES.equalsIgnoreCase(emp.getHasPassort().trim())
 				|| MyTeamUtils.STRING_Y.equalsIgnoreCase(emp.getHasPassort().trim())) {
-			if (!DataValidations.isFutureDate(emp.getPassportExpiryDate())) {
+			if (!dataValidations.isFutureDate(emp.getPassportExpiryDate())) {
 				addInValidRecord(inValidEmpRecList, invalidEmpRecs, emp, rowNumber);
 				return;
 			}
 		}
+
 		if (emp.getHasPassort().trim().isEmpty() || MyTeamUtils.NO.equalsIgnoreCase(emp.getHasPassort().trim())
 				|| MyTeamUtils.STRING_N.equalsIgnoreCase(emp.getHasPassort().trim())) {
-			if (null != emp.getPassportExpiryDate() || null != emp.getHasB1().trim() || null != emp.getB1ExpiryDate()) {
+			if (null != emp.getPassportExpiryDate()) {
 				addInValidRecord(inValidEmpRecList, invalidEmpRecs, emp, rowNumber);
 				return;
 			}
 		}
+
 		if ((MyTeamUtils.YES.equals(emp.getHasB1()) || MyTeamUtils.STRING_Y.equals(emp.getHasB1()))
-				&& !DataValidations.isFutureDate(emp.getB1ExpiryDate())) {
+				&& !dataValidations.isFutureDate(emp.getB1ExpiryDate())) {
 			addInValidRecord(inValidEmpRecList, invalidEmpRecs, emp, rowNumber);
 			return;
 		}

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

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,13 +14,14 @@ import com.nisum.myteam.service.IMasterDataService;
 import com.nisum.myteam.service.impl.OrgLocationService;
 
 @Service
+@Slf4j
 public class DataValidations {
 	
 	@Autowired
-	static IMasterDataService masterDataService;
+	 IMasterDataService masterDataService;
 	
 	@Autowired
-	static OrgLocationService orgLocationService;
+	 OrgLocationService orgLocationService;
 	
 	public static boolean validateNumber(String number) {
 		boolean flag = false;
@@ -39,16 +41,17 @@ public class DataValidations {
     	boolean flag = false;
     	name = name.trim();
     	if(!MyTeamUtils.EMPTY_STRING.equals(name)) {
-			String regx =  "^[\\p{L}]+$";
+			String regx =  "^[\\p{L} ]+$";
 		    Pattern pattern = Pattern.compile(regx,Pattern.CASE_INSENSITIVE);
 		    Matcher matcher = pattern.matcher(name);
 		    flag = matcher.find();
+		    log.info("flag:"+flag);
     	}
 		return flag;
 	}
 	 
 				
-	public static boolean isValidGender(String gender) {
+	public  static boolean isValidGender(String gender) {
 		boolean flag =  false;
 		gender = gender.trim();
 		if( !MyTeamUtils.EMPTY_STRING.equals(gender)) {
@@ -79,17 +82,23 @@ public class DataValidations {
 		return flag;
 	}
 		
-	public  static boolean isValidFunctionalGroup(String functionalGroup) {
+	public   boolean isValidFunctionalGroup(String functionalGroup) {
 		boolean flag = false;
 		functionalGroup = functionalGroup.trim();
 		if(!MyTeamUtils.EMPTY_STRING.equals(functionalGroup)) {
 			List<MasterData> fsData = masterDataService.findByMasterDataTypeAndMasterDataNameAndActiveStatus(MyTeamUtils.MASTERDATA_FG, functionalGroup, true);
-			flag = fsData.size() > MyTeamUtils.INT_ZERO;
+			log.info("FunctionalGroup Data::"+fsData);
+			if(fsData!=null)
+			{
+				flag = fsData.size() > MyTeamUtils.INT_ZERO;
+				log.info("flag value::"+flag);
+			}
+
 		}
 		return flag;
 	}
 		
-	public  static boolean isValidDesignation(String designation) {
+	public   boolean isValidDesignation(String designation) {
 		boolean flag = false;
 		designation = designation.trim();
 		if( !MyTeamUtils.EMPTY_STRING.equals(designation)) {
@@ -100,7 +109,7 @@ public class DataValidations {
 	}
 		
 		
-	public  static boolean isValidEmploymentType(String employmentType) {
+	public   boolean isValidEmploymentType(String employmentType) {
 		boolean flag = false;
 		employmentType = employmentType.trim();
 		if(MyTeamUtils.EMPTY_STRING.equals(employmentType)){
@@ -112,7 +121,7 @@ public class DataValidations {
 		return flag;
 	}
 		
-	public  static boolean isValidRole(String role) {
+	public   boolean isValidRole(String role) {
 		boolean flag = false;
 		role =  role.trim();
 		if( MyTeamUtils.EMPTY_STRING.equals(role)){
@@ -151,7 +160,7 @@ public class DataValidations {
 	}
 	
 	
-	public  static boolean isValidWorkLocation(String workLocation) {
+	public   boolean isValidWorkLocation(String workLocation) {
 		boolean flag = false;
 		workLocation = workLocation.trim();
 		if(!MyTeamUtils.EMPTY_STRING.equals(workLocation)) {