yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-01 11:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converting CompanyUser model to hibernate entity (#670)

Browse Source 
* Converting one of the wherehows-frontend model to hibernate

* Converting few models and UserDAO to use hibernate
This commit is contained in:
Shridhar Sattur 2017-08-16 21:24:01 -07:00 committed by Mars Lan
parent 336b750d17
commit cc1699761e
11 changed files with 97 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wherehows-dao/src/main/java/wherehows/models/CompanyUser.java
View File

@ -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;
public String displayName;
@Id
@Column(name = "user_id")
private String userName;
@Column(name = "display_name")
private String displayName;
}

14
wherehows-dao/src/main/java/wherehows/models/Group.java
View File

@ -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;
}

33
wherehows-dao/src/main/java/wherehows/models/User.java
View File

@ -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;
public String userName; // ldap user id
public int departmentNum;
public String email;
public String name; // ldap display name
public UserSetting userSetting;
@Id
@Column(name = "id")
private int id;
@Column(name = "username")
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;
}

7
wherehows-dao/src/main/java/wherehows/models/UserSetting.java
View File

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

2
wherehows-frontend/app/controllers/api/v1/User.java
View File

@ -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);

6
wherehows-frontend/app/dao/DatasetRowMapper.java
View File

@ -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.name = ownerNames[i];
user.email = ownerEmail[i];
user.setUserName(owners[i]);
user.setName(ownerNames[i]);
user.setEmail(ownerEmail[i]);
dataset.owners.add(user);
}
}

6
wherehows-frontend/app/dao/DatasetWithUserRowMapper.java
View File

@ -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.name = ownerNames[i];
user.email = ownerEmail[i];
user.setUserName(owners[i]);
user.setName(ownerNames[i]);
user.setEmail(ownerEmail[i]);
dataset.owners.add(user);
}
}

16
wherehows-frontend/app/dao/DatasetsDAO.java
View File

@ -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];
if (datasetOwner.userName.equalsIgnoreCase(user))
datasetOwner.setUserName(owners[i]);
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.name = dislayName;
owner.setUserName(ownerId);
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.name = dislayName;
owner.setUserName(ownerId);
owner.setName(dislayName);
owners.add(owner);
int updatedRows = getJdbcTemplate().update(UPDATE_DATASET_OWNER_SORT_ID, sortId++, id, ownerId, namespace);
if (ret <= 0)

16
wherehows-frontend/app/dao/UserDAO.java
View File

@ -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.userName,
user.email,
user.departmentNum);
user.getName(),
user.getUserName(),
user.getEmail(),
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.displayName = displayName;
user.setUserName(userName);
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);
}
}

16
wherehows-frontend/app/dao/UserRowMapper.java
View File

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

8
wherehows-frontend/app/security/AuthenticationManager.java
View File

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