Changeset 5556 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

Timestamp:

08/18/14 09:50:16 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Unit test for getting profiles and components from groups. A little bug is fixed

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java (modified) (7 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

@@ -155 +155 @@
         }
     }
-    
-    @Override
-    public Number makeGroupMember(String principalName, String groupName) throws  UserUnauthorizedException, ItemNotFoundException{
+
+    @Override
+    public Number makeGroupMember(String principalName, String groupName) throws UserUnauthorizedException, ItemNotFoundException {
         RegistryUser regOwner = userDao.getPrincipalNameById(registryOwner.getId());
-        if  (groupService.isUserOwnerOfGroup(groupName, regOwner.getPrincipalName()) || 
-                configuration.isAdminUser(regOwner.getPrincipalName())) {
-        return groupService.makeMember(principalName, groupName);
+        if (groupService.isUserOwnerOfGroup(groupName, regOwner.getPrincipalName())
+                || configuration.isAdminUser(regOwner.getPrincipalName())) {
+            return groupService.makeMember(principalName, groupName);
         } else {
             throw new UserUnauthorizedException("The registry owner is not the admin or not the owner of the group and cannot add users to the group");
         }
     }
-    
+
 //    @Override
 //    public long removeGroupMember(String principalName, String groupName) throws  UserUnauthorizedException, ItemNotFoundException{
@@ -177 +177 @@
 //        }
 //    }
-    
-   
-    @Override
-    public List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException {
+    @Override
+    public List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         try {
             switch (registrySpace) {
@@ -234 +232 @@
 
     @Override
-    public List<ComponentDescription> getComponentDescriptions() throws ComponentRegistryException, UserUnauthorizedException {
+    public List<ComponentDescription> getComponentDescriptions() throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         try {
             switch (registrySpace) {
@@ -861 +859 @@
 
     private List<ComponentDescription> getComponentDescriptionsInGroup(Number groupId)
-            throws ComponentRegistryException, UserUnauthorizedException {
+            throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
 
         String principalName = userDao.getPrincipalNameById(registryOwner.getId()).getPrincipalName();
-
-        if (!groupService.userGroupMember(principalName, groupId.toString())) {
+        String groupName = groupService.getGroupNameById(groupId.longValue());
+        if (!groupService.userGroupMember(principalName, groupId.toString())
+                && !groupService.isUserOwnerOfGroup(groupName, principalName)) {
             throw new UserUnauthorizedException("The user \'" + principalName + "\' does not have access to components of the group " + groupId);
         }
@@ -880 +879 @@
     }
 
-    private List<ProfileDescription> getProfileDescriptionsInGroup(Number groupId) throws ComponentRegistryException, UserUnauthorizedException {
+    private List<ProfileDescription> getProfileDescriptionsInGroup(Number groupId) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
 
         String principalName = userDao.getPrincipalNameById(registryOwner.getId()).getPrincipalName();
-
-        if (!groupService.userGroupMember(principalName, groupId.toString())) {
+        String groupName = groupService.getGroupNameById(groupId.longValue());
+        if (!groupService.userGroupMember(principalName, groupId.toString())
+                && !groupService.isUserOwnerOfGroup(groupName, principalName)) {
             throw new UserUnauthorizedException("The user \'" + principalName + "\' does not have access to profiles of the group " + groupId);
         }
@@ -900 +900 @@
 
     @Override
-    public List<ProfileDescription> getProfileDescriptionsForMetadaEditor(Number groupId) throws UserUnauthorizedException,
-            ComponentRegistryException {
+    public List<ProfileDescription> getProfileDescriptionsForMetadaEditor(Number groupId) throws ComponentRegistryException, UserUnauthorizedException, ItemNotFoundException {
         return this.getProfileDescriptionsInGroup(groupId.longValue());
     }
@@ -984 +983 @@
         }
     }
-    
-    
 }