Add query access roles in subscription.
Change-Id: Id19706d1547f6eb91d198672de171a1b163c774d
diff --git a/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java b/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
index 2ded95c..42d2021 100644
--- a/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
+++ b/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
@@ -8,7 +8,6 @@
import org.springframework.transaction.annotation.Transactional;
import de.ids_mannheim.korap.constant.PredefinedRole;
-import de.ids_mannheim.korap.entity.QueryAccess;
import de.ids_mannheim.korap.entity.QueryDO_;
import de.ids_mannheim.korap.entity.Role;
import de.ids_mannheim.korap.entity.Role_;
@@ -24,6 +23,7 @@
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaDelete;
import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
import jakarta.persistence.criteria.Join;
import jakarta.persistence.criteria.JoinType;
import jakarta.persistence.criteria.ListJoin;
@@ -112,10 +112,10 @@
Root<Role> role = query.from(Role.class);
role.fetch("userGroup", JoinType.INNER);
- role.fetch("query", JoinType.INNER);
query.select(role);
if (hasQuery) {
+ role.fetch("query", JoinType.INNER);
query.where(cb.equal(role.get("userGroup").get("id"), groupId),
cb.isNotNull(role.get("query").get("id")));
}
@@ -127,6 +127,29 @@
List<Role> resultList = q.getResultList();
return new HashSet<Role>(resultList);
}
+
+ public Set<Role> retrieveRolesByGroupIdWithUniqueQuery (int groupId) {
+ CriteriaBuilder cb = entityManager.getCriteriaBuilder();
+ CriteriaQuery<Role> query = cb.createQuery(Role.class);
+
+ Root<Role> role = query.from(Role.class);
+ role.fetch("userGroup", JoinType.INNER);
+ role.fetch("query", JoinType.INNER);
+// role.fetch("userGroupMembers", JoinType.INNER);
+
+ Expression<?> queryId = role.get("query").get("id");
+
+ query.select(role);
+ query.where(
+ cb.equal(role.get("userGroup").get("id"), groupId)
+ );
+ query.groupBy(queryId);
+ query.having(cb.equal(cb.count(queryId), 1));
+
+ TypedQuery<Role> q = entityManager.createQuery(query);
+ List<Role> resultList = q.getResultList();
+ return new HashSet<Role>(resultList);
+ }
public Set<Role> retrieveRoleByQueryIdAndUsername (int queryId,
String username) {
diff --git a/src/main/java/de/ids_mannheim/korap/entity/Role.java b/src/main/java/de/ids_mannheim/korap/entity/Role.java
index 65568bf..da0a1e4 100644
--- a/src/main/java/de/ids_mannheim/korap/entity/Role.java
+++ b/src/main/java/de/ids_mannheim/korap/entity/Role.java
@@ -80,8 +80,10 @@
public String toString () {
return "id=" + id + ", name=" + name + ", privilege=" + privilege
- + ", usergroup=" + userGroup.getId() + ", members=" + userGroupMembers + ", query="
- + ((query!=null) ? query.getId() : query);
+ + ", usergroup=" + userGroup.getId()
+// + ", members=" + userGroupMembers
+ + ", query=" + ((query!=null) ? query.getId() : query)
+ ;
}
@Override
diff --git a/src/main/java/de/ids_mannheim/korap/service/QueryService.java b/src/main/java/de/ids_mannheim/korap/service/QueryService.java
index 8d9482d..212da68 100644
--- a/src/main/java/de/ids_mannheim/korap/service/QueryService.java
+++ b/src/main/java/de/ids_mannheim/korap/service/QueryService.java
@@ -581,7 +581,7 @@
if (adminDao.isAdmin(username)
|| userGroupService.isUserGroupAdmin(username, userGroup)) {
// accessList = accessDao.retrieveAllAccessByGroup(userGroup.getId());
- accessList = roleDao.retrieveRoleByGroupId(userGroup.getId(), false);
+ accessList = roleDao.retrieveRoleByGroupId(userGroup.getId(), true);
}
else {
diff --git a/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java b/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
index fa2a941..1bd6e74 100644
--- a/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
+++ b/src/main/java/de/ids_mannheim/korap/service/UserGroupService.java
@@ -172,8 +172,14 @@
Role r1 = new Role(PredefinedRole.GROUP_MEMBER,
PrivilegeType.DELETE_MEMBER, userGroup);
roleDao.addRole(r1);
- Set<Role>memberRoles = new HashSet<Role>(1);
+ Set<Role>memberRoles = new HashSet<Role>();
memberRoles.add(r1);
+
+ Set<Role> roles =
+ roleDao.retrieveRolesByGroupIdWithUniqueQuery(userGroup.getId());
+ for(Role r :roles) {
+ memberRoles.add(r);
+ }
return memberRoles;
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java
index f921a1c..533c2d3 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusControllerAdminTest.java
@@ -161,34 +161,31 @@
//
// return node.at("/accessId").asText();
// }
- private JsonNode testlistAccessByGroup (String groupName)
- throws KustvaktException {
- Response response = target().path(API_VERSION).path("vc").path("access")
- .queryParam("groupName", groupName).request()
- .header(Attributes.AUTHORIZATION, HttpAuthorizationHandler
- .createBasicAuthorizationHeaderValue(admin, "pass"))
- .get();
- String entity = response.readEntity(String.class);
- JsonNode node = JsonUtils.readTree(entity);
- assertEquals(2, node.size());
- return node.get(node.size() - 1);
- }
@Test
- public void testVCSharing () throws ProcessingException, KustvaktException {
+ public void testShareVC () throws ProcessingException, KustvaktException {
+ createMarlinGroup();
+
String vcCreator = "marlin";
String vcName = "marlin-vc";
String groupName = "marlin-group";
JsonNode node2 = testAdminListVC_UsingAdminToken(vcCreator,
ResourceType.PROJECT);
assertEquals(0, node2.size());
- testCreateVCAccess(vcCreator, vcName, groupName);
- JsonNode node = testlistAccessByGroup(groupName);
- String accessId = node.at("/accessId").asText();
- testDeleteVCAccess(accessId);
+ createAccess(vcCreator, vcName, groupName, admin);
+
+ JsonNode node = listAccessByGroup("admin",groupName);
+ assertEquals(1, node.size());
+ String roleId = node.at("/0/roleId").asText();
node2 = testAdminListVC_UsingAdminToken(vcCreator,
ResourceType.PROJECT);
assertEquals(1, node2.size());
+
+ Response response = deleteAccess("admin",roleId);
+ assertEquals(Status.OK.getStatusCode(), response.getStatus());
+ node = listAccessByGroup("admin",groupName);
+ assertEquals(0, node.size());
+
String json = "{\"type\": \"" + ResourceType.PRIVATE + "\"}";
editVC(admin, vcCreator, vcName, json);
node = retrieveVCInfo(admin, vcCreator, vcName);
@@ -197,27 +194,7 @@
node2 = testAdminListVC_UsingAdminToken(vcCreator,
ResourceType.PROJECT);
assertEquals(0, node2.size());
- }
-
- private void testCreateVCAccess (String vcCreator, String vcName,
- String groupName) throws ProcessingException, KustvaktException {
- Response response;
- // share VC
- response = target().path(API_VERSION).path("vc").path("~" + vcCreator)
- .path(vcName).path("share").path("@" + groupName).request()
- .header(Attributes.AUTHORIZATION, HttpAuthorizationHandler
- .createBasicAuthorizationHeaderValue(admin, "pass"))
- .post(Entity.form(new Form()));
- assertEquals(Status.OK.getStatusCode(), response.getStatus());
- }
-
- private void testDeleteVCAccess (String accessId)
- throws ProcessingException, KustvaktException {
- Response response = target().path(API_VERSION).path("vc").path("access")
- .path(accessId).request()
- .header(Attributes.AUTHORIZATION, HttpAuthorizationHandler
- .createBasicAuthorizationHeaderValue(admin, "pass"))
- .delete();
- assertEquals(Status.OK.getStatusCode(), response.getStatus());
+
+ deleteGroupByName(marlinGroupName, "marlin");
}
}
diff --git a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java
index b60fcd8..513beef 100644
--- a/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/controller/vc/VirtualCorpusInfoTest.java
@@ -71,10 +71,26 @@
@Test
public void testRetrieveProjectVC ()
throws ProcessingException, KustvaktException {
+ createDoryGroup();
+ inviteMember(doryGroupName, "dory", "nemo");
+ subscribe(doryGroupName, "nemo");
+
+ createAccess("dory", "group-vc", doryGroupName, "dory");
+
JsonNode node = retrieveVCInfo("nemo", "dory", "group-vc");
assertEquals(node.at("/name").asText(), "group-vc");
assertEquals(ResourceType.PROJECT.displayName(),
node.at("/type").asText());
+
+ inviteMember(doryGroupName, "dory", "pearl");
+ subscribe(doryGroupName, "pearl");
+
+ node = retrieveVCInfo("pearl", "dory", "group-vc");
+ assertEquals(node.at("/name").asText(), "group-vc");
+ assertEquals(ResourceType.PROJECT.displayName(),
+ node.at("/type").asText());
+
+ deleteGroupByName(doryGroupName, "dory");
}
@Test