Changs for pull request for mail id flag changes

src/main/java/com/geekster/chatApplication/Util/CommonUtils.java

@@ -11,13 +11,13 @@ public static boolean isValidPassword(String password) {
         Matcher m = p.matcher(password);
         return m.matches();
     }
-    public static boolean isValidEmail(String email){
-        String emailRegex = "^[a-zA-Z0-9_+&*-]+(?:\\."+
+    public static boolean isValiduser_email(String user_email){
+        String user_emailRegex = "^[a-zA-Z0-9_+&*-]+(?:\\."+
                 "[a-zA-Z0-9_+&*-]+)*@" +
                 "(?:[a-zA-Z0-9-]+\\.)+[a-z" +
                 "A-Z]{2,7}$";
-        Pattern pat = Pattern.compile(emailRegex);
-        return pat.matcher(email).matches();
+        Pattern pat = Pattern.compile(user_emailRegex);
+        return pat.matcher(user_email).matches();
     }
 
     public static boolean isValidPhoneNumber(String phoneNumber) {

src/main/java/com/geekster/chatApplication/controller/UserController.java

@@ -152,13 +152,13 @@ private JSONObject validateUserRequest(String userData) {
             errorList.put("firstName", "Missing parameter");
         }
 
-        if(userJson.has("email")) {
-            String email = userJson.getString("email");
-            if(!CommonUtils.isValidEmail(email)) {
-                errorList.put("email", "Please enter a valid email");
+        if(userJson.has("user_email")) {
+            String user_email = userJson.getString("user_email");
+            if(!CommonUtils.isValiduser_email(user_email)) {
+                errorList.put("user_email", "Please enter a valid user_email");
             }
         } else {
-            errorList.put("email", "Missing parameter");
+            errorList.put("user_email", "Missing parameter");
         }
 
         if(userJson.has("phoneNumber")) {
@@ -178,7 +178,7 @@ private Users setUser(String userData)  {
         Users user = new Users();
         JSONObject json = new JSONObject(userData);
 
-        user.setEmail(json.getString("email"));
+        user.setuser_email(json.getString("user_email"));
         if(!json.has("isUpdate")) {
             user.setPassword(json.getString("password"));
         }

src/main/java/com/geekster/chatApplication/model/Users.java

@@ -21,8 +21,8 @@ public class Users {
     private String username;
     @Column(name="password")
     private String password;
-    @Column(name="email")
-    private String email;
+    @Column(name="user_email")
+    private String user_email;
     @Column(name="phone_number")
     private String phoneNumber;
     @Column(name="gender")

src/main/java/com/geekster/chatApplication/service/UserService.java

@@ -63,7 +63,7 @@ private JSONObject createResponse(Users user) {
         jsonObj.put("firstName", user.getFirstName());
         jsonObj.put("lastName", user.getLastName());
         jsonObj.put("age", user.getAge());
-        jsonObj.put("email", user.getEmail());
+        jsonObj.put("user_email", user.getuser_email());
         jsonObj.put("phoneNumber", user.getPhoneNumber());
         jsonObj.put("gender", user.getGender());
         jsonObj.put("createdDate", user.getCreatedDate());