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

Timestamp:

08/15/14 16:02:36 (10 years ago)

Author:

olhsha@mpi.nl

Message:

fixing serialisation issues for List<String>. Adding unit tests for goup service

File:

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

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

@@ -48 +48 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataAccessException;
+import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -154 +155 @@
         }
     }
-
+    
+    @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);
+        } 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{
+//        RegistryUser regOwner = userDao.getPrincipalNameById(registryOwner.getId());
+//        if  (groupService.isUserOwnerOfGroup(groupName, regOwner.getPrincipalName()) || 
+//                configuration.isAdminUser(regOwner.getPrincipalName())) {
+//        return groupService.removeMember(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 List<ProfileDescription> getProfileDescriptions() throws ComponentRegistryException, UserUnauthorizedException {
@@ -960 +984 @@
         }
     }
+    
+    
 }