public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-13 09:46:17 +00:00
Code Issues Releases Wiki Activity

#18: GET /group + fix JUnit

Browse Source
This commit is contained in:
jendib
2016-03-19 23:42:36 +01:00
parent 3b9a66d1d8
commit c1c2228937
8 changed files with 78 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/AclDao.java
View File

@@ -68,7 +68,8 @@ public class AclDao {
@SuppressWarnings("unchecked")
public List<AclDto> getBySourceId(String sourceId) {
EntityManager em = ThreadLocalContext.get().getEntityManager();
StringBuilder sb = new StringBuilder("select a.ACL_ID_C, a.ACL_PERM_C, a.ACL_TARGETID_C, u.USE_USERNAME_C, s.SHA_NAME_C, g.GRP_NAME_C ");
StringBuilder sb = new StringBuilder("select a.ACL_ID_C, a.ACL_PERM_C, a.ACL_TARGETID_C, ");
sb.append(" u.USE_USERNAME_C, s.SHA_ID_C, s.SHA_NAME_C, g.GRP_NAME_C ");
sb.append(" from T_ACL a ");
sb.append(" left join T_USER u on u.USE_ID_C = a.ACL_TARGETID_C ");
sb.append(" left join T_SHARE s on s.SHA_ID_C = a.ACL_TARGETID_C ");
@@ -89,13 +90,14 @@ public class AclDao {
aclDto.setPerm(PermType.valueOf((String) o[i++]));
aclDto.setTargetId((String) o[i++]);
String userName = (String) o[i++];
String shareId = (String) o[i++];
String shareName = (String) o[i++];
String groupName = (String) o[i++];
if (userName != null) {
aclDto.setTargetName(userName);
aclDto.setTargetType(AclTargetType.USER.name());
}
if (shareName != null) {
if (shareId != null) { // Use ID because share name is nullable
aclDto.setTargetName(shareName);
aclDto.setTargetType(AclTargetType.SHARE.name());
}

6
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/GroupDao.java
View File

@@ -152,11 +152,12 @@ public class GroupDao {
Map<String, Object> parameterMap = new HashMap<String, Object>();
List<String> criteriaList = new ArrayList<String>();
StringBuilder sb = new StringBuilder("select g.GRP_ID_C as c0, g.GRP_NAME_C as c1, g.GRP_IDPARENT_C as c2 ");
StringBuilder sb = new StringBuilder("select g.GRP_ID_C as c0, g.GRP_NAME_C as c1, g.GRP_IDPARENT_C as c2, gp.GRP_NAME_C as c3 ");
if (criteria.getUserId() != null) {
sb.append(" , ug.UGP_ID_C ");
}
sb.append(" from T_GROUP g ");
sb.append(" left join T_GROUP gp on g.GRP_IDPARENT_C = gp.GRP_ID_C ");
// Add search criterias
if (criteria.getSearch() != null) {
@@ -190,7 +191,8 @@ public class GroupDao {
GroupDto groupDto = new GroupDto()
.setId((String) o[i++])
.setName((String) o[i++])
.setParentId((String) o[i++]);
.setParentId((String) o[i++])
.setParentName((String) o[i++]);
groupDtoList.add(groupDto);
if (criteria.getUserId() != null && o[i++] != null) {
userGroupDtoList.add(groupDto);

14
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/dto/GroupDto.java
View File

@@ -21,6 +21,11 @@ public class GroupDto {
*/
private String parentId;
/**
* Parent name.
*/
private String parentName;
public String getId() {
return id;
}
@@ -48,6 +53,15 @@ public class GroupDto {
return this;
}
public String getParentName() {
return parentName;
}
public GroupDto setParentName(String parentName) {
this.parentName = parentName;
return this;
}
@Override
public boolean equals(Object obj) {
return id.equals(((GroupDto) obj).getId());

6
docs-core/src/main/java/com/sismics/docs/core/model/jpa/Acl.java
View File

@@ -30,20 +30,20 @@ public class Acl implements Loggable {
/**
* ACL permission.
*/
@Column(name = "ACL_PERM_C", length = 30)
@Column(name = "ACL_PERM_C", length = 30, nullable = false)
@Enumerated(EnumType.STRING)
private PermType perm;
/**
* ACL source ID.
*/
@Column(name = "ACL_SOURCEID_C", length = 36)
@Column(name = "ACL_SOURCEID_C", length = 36, nullable = false)
private String sourceId;
/**
* ACL target ID.
*/
@Column(name = "ACL_TARGETID_C", length = 36)
@Column(name = "ACL_TARGETID_C", length = 36, nullable = false)
private String targetId;
/**