Converting CompanyUser model to hibernate entity (#670)

* Converting one of the wherehows-frontend model to hibernate

* Converting few models and UserDAO to use hibernate

wherehows-dao/src/main/java/wherehows/models/CompanyUser.java

@@ -13,8 +13,23 @@
  */
 package wherehows.models;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name = "dir_external_user_info")
 public class CompanyUser {
 
-    public String userName;
+    @Id
-    public String displayName;
+    @Column(name = "user_id")
+    private String userName;
+
+    @Column(name = "display_name")
+    private String displayName;
 }

wherehows-dao/src/main/java/wherehows/models/Group.java

@@ -13,7 +13,19 @@
  */
 package wherehows.models;
 
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name = "dir_external_group_user_map")
 public class Group {
 
-    public String name;
+    @Id
+    @Column(name = "group_id")
+    private String name;
 }

wherehows-dao/src/main/java/wherehows/models/User.java

@@ -13,12 +13,33 @@
  */
 package wherehows.models;
 
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@Entity
+@Table(name = "users")
 public class User {
 
-    public int id;
+    @Id
-    public String userName; // ldap user id
+    @Column(name = "id")
-    public int departmentNum;
+    private int id;
-    public String email;
+
-    public String name; // ldap display name
+    @Column(name = "username")
-    public UserSetting userSetting;
+    private String userName; // ldap user id
+
+    @Column(name = "department_number")
+    private int departmentNum;
+
+    @Column(name = "email")
+    private String email;
+
+    @Column(name = "name")
+    private String name; // ldap display name
+
+    UserSetting userSetting;
 }

wherehows-dao/src/main/java/wherehows/models/UserSetting.java

@@ -13,8 +13,11 @@
  */
 package wherehows.models;
 
+import lombok.Data;
+
+@Data
 public class UserSetting {
 
-    public String detailDefaultView;
+    private String detailDefaultView;
-    public String defaultWatch;
+    private String defaultWatch;
 }

wherehows-frontend/app/controllers/api/v1/User.java

@@ -43,7 +43,7 @@ public class User extends Controller {
     }
 
     wherehows.models.User user = UserDAO.getCurrentUser(username);
-    if (StringUtils.isBlank(user.userName)) {
+    if (StringUtils.isBlank(user.getUserName())) {
       result.put("status", "failed");
       result.put("message", "can't find user info");
       return ok(result);

wherehows-frontend/app/dao/DatasetRowMapper.java

@@ -78,9 +78,9 @@ public class DatasetRowMapper implements RowMapper<Dataset>
             for (int i = 0; i < owners.length; i++)
             {
                 User user = new User();
-                user.userName = owners[i];
+                user.setUserName(owners[i]);
-                user.name = ownerNames[i];
+                user.setName(ownerNames[i]);
-                user.email = ownerEmail[i];
+                user.setEmail(ownerEmail[i]);
                 dataset.owners.add(user);
             }
         }

wherehows-frontend/app/dao/DatasetWithUserRowMapper.java

@@ -80,9 +80,9 @@ public class DatasetWithUserRowMapper implements RowMapper<Dataset>
             for (int i = 0; i < owners.length; i++)
             {
                 User user = new User();
-                user.userName = owners[i];
+                user.setUserName(owners[i]);
-                user.name = ownerNames[i];
+                user.setName(ownerNames[i]);
-                user.email = ownerEmail[i];
+                user.setEmail(ownerEmail[i]);
                 dataset.owners.add(user);
             }
         }

wherehows-frontend/app/dao/DatasetsDAO.java

@@ -501,18 +501,18 @@ public class DatasetsDAO extends AbstractMySQLOpenSourceDAO
 							for (int i = 0; i < owners.length; i++)
 							{
 								User datasetOwner = new User();
-								datasetOwner.userName = owners[i];
+								datasetOwner.setUserName(owners[i]);
-								if (datasetOwner.userName.equalsIgnoreCase(user))
+								if (datasetOwner.getUserName().equalsIgnoreCase(user))
 								{
 									ds.isOwned = true;
 								}
 								if (StringUtils.isBlank(ownerNames[i]) || ownerNames[i].equalsIgnoreCase("*"))
 								{
-									datasetOwner.name = owners[i];
+									datasetOwner.setName(owners[i]);
 								}
 								else
 								{
-									datasetOwner.name = ownerNames[i];
+									datasetOwner.setName(ownerNames[i]);
 								}
 								ds.owners.add(datasetOwner);
 							}
@@ -678,8 +678,8 @@ public class DatasetsDAO extends AbstractMySQLOpenSourceDAO
 				dislayName = ownerId;
 			}
 			User owner = new User();
-			owner.userName = ownerId;
+			owner.setUserName(ownerId);
-			owner.name = dislayName;
+			owner.setName(dislayName);
 			owners.add(owner);
 		}
 		if (result)
@@ -717,8 +717,8 @@ public class DatasetsDAO extends AbstractMySQLOpenSourceDAO
 				dislayName = ownerId;
 			}
 			User owner = new User();
-			owner.userName = ownerId;
+			owner.setUserName(ownerId);
-			owner.name = dislayName;
+			owner.setName(dislayName);
 			owners.add(owner);
 			int updatedRows = getJdbcTemplate().update(UPDATE_DATASET_OWNER_SORT_ID, sortId++, id, ownerId, namespace);
 			if (ret <= 0)

wherehows-frontend/app/dao/UserDAO.java

@@ -112,13 +112,13 @@ public class UserDAO extends AbstractMySQLOpenSourceDAO
 
 	public static void addLdapUser(User user)
 	{
-		if (user != null && StringUtils.isNotBlank(user.userName))
+		if (user != null && StringUtils.isNotBlank(user.getUserName()))
 		{
 			getJdbcTemplate().update(CREATE_LDAP_USER,
-				user.name,
+				user.getName(),
-				user.userName,
+				user.getUserName(),
-				user.email,
+				user.getEmail(),
-				user.departmentNum);
+				user.getDepartmentNum());
 		}
 	}
 
@@ -284,8 +284,8 @@ public class UserDAO extends AbstractMySQLOpenSourceDAO
 				String displayName = (String) row.get(UserRowMapper.USER_FULL_NAME_COLUMN);
 				if (StringUtils.isNotBlank(userName)) {
 					CompanyUser user = new CompanyUser();
-					user.userName = userName;
+					user.setUserName(userName);
-					user.displayName = displayName;
+					user.setDisplayName(displayName);
 					users.add(user);
 				}
 			}
@@ -301,7 +301,7 @@ public class UserDAO extends AbstractMySQLOpenSourceDAO
 				String name = (String) row.get(UserRowMapper.USER_FULL_NAME_COLUMN);
 				if (StringUtils.isNotBlank(name)) {
 					Group group = new Group();
-					group.name = name;
+					group.setName(name);
 					groups.add(group);
 				}
 			}

wherehows-frontend/app/dao/UserRowMapper.java

@@ -44,14 +44,14 @@ public class UserRowMapper implements RowMapper<User>
 
         User user = new User();
         UserSetting userSetting = new UserSetting();
-        userSetting.detailDefaultView = defaultView;
+        userSetting.setDetailDefaultView(defaultView);
-        userSetting.defaultWatch = defaultWatch;
+        userSetting.setDefaultWatch(defaultWatch);
-        user.id = id;
+        user.setId(id);
-        user.name = name;
+        user.setName(name);
-        user.email = email;
+        user.setEmail(email);
-        user.userName = username;
+        user.setUserName(username);
-        user.departmentNum = departmentNum;
+        user.setDepartmentNum(departmentNum);
-        user.userSetting = userSetting;
+        user.setUserSetting(userSetting);
 
         return user;
     }

wherehows-frontend/app/security/AuthenticationManager.java

@@ -177,10 +177,10 @@ public class AuthenticationManager {
       }
     }
     User user = new User();
-    user.email = email;
+    user.setEmail(email);
-    user.userName = userName;
+    user.setUserName(userName);
-    user.name = firstName + " " + lastName;
+    user.setName(firstName + " " + lastName);
-    user.departmentNum = departmentNum;
+    user.setDepartmentNum(departmentNum);
     return user;
   }
 }