UY-1563 disabled entities are skiped in upman

Author: ppiernik

engine/src/main/java/pl/edu/icm/unity/engine/project/DelegatedGroupManagementImpl.java

@@ -25,6 +25,7 @@
 import pl.edu.icm.unity.base.attribute.Attribute;
 import pl.edu.icm.unity.base.entity.Entity;
 import pl.edu.icm.unity.base.entity.EntityParam;
+import pl.edu.icm.unity.base.entity.EntityState;
 import pl.edu.icm.unity.base.exceptions.EngineException;
 import pl.edu.icm.unity.base.exceptions.InternalException;
 import pl.edu.icm.unity.base.group.Group;
@@ -419,15 +420,18 @@ private List<DelegatedGroupMember> getDelegatedGroupMembersInternal(String proje
 			List<String> projectAttrs = getProjectAttrs(projectPath);
 			for (GroupMembership member : orgMembers)
 			{
-				long entity = member.getEntityId();
+				Entity entity = getEntity(member.getEntityId());
+				if (!entity.getEntityInformation().getState().equals(EntityState.valid))
+					continue;
+				Long entityId = entity.getId();
 				VerifiableElementBase emailId = getEmailIdentity(entity);
-				DelegatedGroupMember entry = new DelegatedGroupMember(member.getEntityId(), projectPath,
-						member.getGroup(), getGroupAuthRoleAttr(entity, path),
-						projectAttrHelper.getAttributeFromMeta(entity, "/",
+				DelegatedGroupMember entry = new DelegatedGroupMember(entityId, projectPath,
+						member.getGroup(), getGroupAuthRoleAttr(entityId, path),
+						projectAttrHelper.getAttributeFromMeta(entityId, "/",
 								EntityNameMetadataProvider.NAME),
-						emailId != null ? emailId : projectAttrHelper.getVerifiableAttributeFromMeta(entity, "/",
+						emailId != null ? emailId : projectAttrHelper.getVerifiableAttributeFromMeta(entityId, "/",
 								ContactEmailMetadataProvider.NAME),
-						Optional.ofNullable(getProjectMemberAttributes(entity, projectPath, projectAttrs)));
+						Optional.ofNullable(getProjectMemberAttributes(entityId, projectPath, projectAttrs)));
 				members.add(entry);
 			}
 		}
@@ -513,9 +517,13 @@ private void addToGroupRecursive(final Deque<String> notMember, long entity) thr
 		addToGroupRecursive(notMember, entity);
 	}
 
-	private VerifiableElementBase getEmailIdentity(long entityId) throws EngineException
+	private Entity getEntity(long entityId) throws EngineException
+	{
+		return identitiesMan.getEntity(new EntityParam(entityId));
+	}
+	
+	private VerifiableElementBase getEmailIdentity(Entity entity) throws EngineException
 	{
-		Entity entity = identitiesMan.getEntity(new EntityParam(entityId));
 		for (IdentityParam id : entity.getIdentities())
 		{
 			if (id != null && id.getTypeId().equals(EmailIdentity.ID))

engine/src/test/java/pl/edu/icm/unity/engine/project/TestDelegatedGroupManagement.java

@@ -32,7 +32,9 @@
 import pl.edu.icm.unity.base.attribute.AttributeExt;
 import pl.edu.icm.unity.base.attribute.AttributeType;
 import pl.edu.icm.unity.base.entity.Entity;
+import pl.edu.icm.unity.base.entity.EntityInformation;
 import pl.edu.icm.unity.base.entity.EntityParam;
+import pl.edu.icm.unity.base.entity.EntityState;
 import pl.edu.icm.unity.base.exceptions.EngineException;
 import pl.edu.icm.unity.base.group.Group;
 import pl.edu.icm.unity.base.group.GroupContents;
@@ -255,7 +257,7 @@ public void shouldGetGroupMembersWithExtraAttrs() throws EngineException
 				.thenReturn(new Entity(
 						Arrays.asList(new Identity(EmailIdentity.ID, "demo@demo.com", 1,
 								new UsernameIdentity().getComparableValue("", "", ""))),
-						null, null));
+						new EntityInformation(1), null));
 
 		when(mockGroupMan.getContents(any(), anyInt())).thenReturn(con);
 		when(mockGroupMan.getContents(any(), anyInt())).thenReturn(con);
@@ -289,6 +291,43 @@ public void shouldGetGroupMembersWithExtraAttrs() throws EngineException
 		assertThat(firstMember.attributes.iterator().next().getValues().iterator().next()).isEqualTo("extraValue");
 
 	}
+	
+	@Test
+	public void shouldSkipDisabledEntity() throws EngineException
+	{
+
+		GroupContents con = getConfiguredGroupContents("/project");
+		GroupMembership member1 = new GroupMembership("/project", 1L, new Date());
+		GroupMembership member2 = new GroupMembership("/project", 2L, new Date());
+
+		con.setMembers(List.of(member1, member2));
+		con.getGroup().setDelegationConfiguration(new GroupDelegationConfiguration(true, false, null, null, null, null,
+				Arrays.asList("extraAttr"), List.of()));
+
+		EntityInformation disabledEntityInfo = new EntityInformation(1);
+		disabledEntityInfo.setState(EntityState.disabled);
+		
+		when(mockIdMan.getEntity(new EntityParam(1L)))
+				.thenReturn(new Entity(
+						Arrays.asList(new Identity(EmailIdentity.ID, "demo@demo.com", 1,
+								new UsernameIdentity().getComparableValue("", "", ""))),
+						disabledEntityInfo, null));
+		
+		when(mockIdMan.getEntity(new EntityParam(2L)))
+		.thenReturn(new Entity(
+				Arrays.asList(new Identity(EmailIdentity.ID, "demo2@demo.com", 2,
+						new UsernameIdentity().getComparableValue("", "", ""))),
+				new EntityInformation(2L), null));
+
+		when(mockGroupMan.getContents(any(), anyInt())).thenReturn(con);
+		when(mockGroupMan.getContents(any(), anyInt())).thenReturn(con);
+
+		List<DelegatedGroupMember> delegatedGroupMemebers = dGroupManNoAuthz.getDelegatedGroupMembers("/project",
+				"/project");
+
+		assertThat(delegatedGroupMemebers.size()).isEqualTo(1);
+		assertThat(delegatedGroupMemebers.iterator().next().entityId).isEqualTo(2L);
+	}
 
 	@Test
 	public void shouldForbidGetDisplayNameOfNonProjectAttribute() throws EngineException
@@ -363,7 +402,7 @@ public void shouldForbidRemoveLastManagerInProjectGroup() throws EngineException
 		.thenReturn(new Entity(
 				Arrays.asList(new Identity(UsernameIdentity.ID, "xx", 1,
 						new UsernameIdentity().getComparableValue("", "", ""))),
-				null, null));
+				new EntityInformation(1), null));
 
 		when(mockGroupMan.getContents(eq("/project"), anyInt()))
 				.thenReturn(getEnabledGroupContentsWithDefaultMember("/project"));