Changeset 5549 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/GroupServiceImpl.java

Timestamp:

08/11/14 16:07:55 (10 years ago)

Author:

olhsha@mpi.nl

Message:

Added group service. Tested via the tomcat on loclahots (test URI and postman), old unit tests are adjusted and work well. Todo: retest on localhost tomcat, look at run-time exceptions, add new unit tests, adjust front-end

File:

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

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
 
+import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -235 +236 @@
                 ownerships.addAll(ownershipDao.findOwnershipByComponentId(itemId));
                 Set<Group> groups = new HashSet<Group>();
-                for (Ownership ownership : ownerships)
+                for (Ownership ownership : ownerships) {
                         groups.add(groupDao.findOne(ownership.getGroupId()));
+                }
                 List<Group> groupList = new ArrayList<Group>(groups);
                 Collections.sort(groupList, new Comparator<Group>() {
@@ -247 +249 @@
                 return groupList;
         }
+        
+        
 
         @ManagedOperation(description = "Make a component owned by a group instead of a user")
@@ -254 +258 @@
                         @ManagedOperationParameter(name = "componentId", description = "Id of component") })
         @Override
-        public void transferItemOwnershipFromUserToGroup(String principal, String groupName, String itemId) {
-
+        public void transferItemOwnershipFromUserToGroup(String principal, String groupName, String itemId) throws UserUnauthorizedException{
+                
+                           
                 BaseDescription item = null;
                 item = componentDao.getByCmdId(itemId);
-                if (item == null)
+                if (item == null) {
                         throw new ValidationException("No profile or component found with ID " + itemId);
+                }
                 Group group = groupDao.findGroupByName(groupName);
-                if (group == null)
+                if (group == null) {
                         throw new ValidationException("No group found with name " + groupName);
+                }
+                
+                if (!this.userGroupMember(principal, String.valueOf(group.getId()))) {
+                   throw new UserUnauthorizedException("User " + principal+ " is not a member of group "+groupName); 
+                }
+                
+                String creatorName = item.getCreatorName();
+                if (!creatorName.equals(principal)) {
+                   throw new UserUnauthorizedException("User " + principal+ " is not creator of the item  "+item.getName()); 
+                }
+                
+                
                 Ownership ownership = null;
                 List<Ownership> oldOwnerships = ownershipDao.findOwnershipByComponentId(itemId);
@@ -273 +291 @@
 
         @Override
-        public void transferItemOwnershipFromUserToGroupId(String principal, long groupId, String componentId) {
+        public void transferItemOwnershipFromUserToGroupId(String principal, long groupId, String componentId) throws UserUnauthorizedException{
                 Group group = groupDao.findOne(groupId);
-                if (group == null)
+                if (group == null) {
                         throw new ValidationException("No group found with id " + groupId);
-                transferItemOwnershipFromUserToGroup(principal, group.getName(), componentId);
-        }
-
+                }
+                this.transferItemOwnershipFromUserToGroup(principal, group.getName(), componentId);
+        }
+
+        @Override
+        public boolean userGroupMember(String principalName, String groupId) {
+            RegistryUser user = userDao.getByPrincipalName(principalName);
+            GroupMembership gm = groupMembershipDao.findMembership(user.getId(), Long.parseLong(groupId));
+            return gm != null;
+        }
 }