UY-1409 fix bulk invitation with a user that is a member.

Author: ppiernik

engine-api/src/main/java/pl/edu/icm/unity/engine/api/project/ProjectAddInvitationResult.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021 Bixbit - Krzysztof Benedyczak. All rights reserved.
+ * See LICENCE.txt file for licensing information.
+ */
+
+package pl.edu.icm.unity.engine.api.project;
+
+import java.util.Set;
+import java.util.Collections;
+
+public class ProjectAddInvitationResult
+{
+	public final Set<String> projectAlreadyMemberEmails;
+
+	private ProjectAddInvitationResult(Builder builder)
+	{
+		this.projectAlreadyMemberEmails = builder.projectAlreadyMemberEmails;
+	}
+
+	public static Builder builder()
+	{
+		return new Builder();
+	}
+
+	public static final class Builder
+	{
+		private Set<String> projectAlreadyMemberEmails = Collections.emptySet();
+
+		private Builder()
+		{
+		}
+
+		public Builder withProjectAlreadyMemberEmails(Set<String> projectAlreadyMemberEmails)
+		{
+			this.projectAlreadyMemberEmails = projectAlreadyMemberEmails;
+			return this;
+		}
+
+		public ProjectAddInvitationResult build()
+		{
+			return new ProjectAddInvitationResult(this);
+		}
+	}
+	
+	
+}

engine-api/src/main/java/pl/edu/icm/unity/engine/api/project/ProjectInvitationsManagement.java

@@ -16,7 +16,7 @@
  */
 public interface ProjectInvitationsManagement
 {
-	void addInvitations(Set<ProjectInvitationParam> param) throws EngineException;
+	ProjectAddInvitationResult addInvitations(Set<ProjectInvitationParam> param) throws EngineException;
 
 	/**
 	 * Gets all project invitations

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

@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -32,6 +33,7 @@
 import pl.edu.icm.unity.engine.api.RegistrationsManagement;
 import pl.edu.icm.unity.engine.api.entity.EntityWithContactInfo;
 import pl.edu.icm.unity.engine.api.identity.UnknownEmailException;
+import pl.edu.icm.unity.engine.api.project.ProjectAddInvitationResult;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitation;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitationParam;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitationsManagement;
@@ -95,7 +97,7 @@ public ProjectInvitationsManagementImpl(@Qualifier("insecure") InvitationManagem
 	}
 
 	@Override
-	public void addInvitations(Set<ProjectInvitationParam> invitationParams) throws EngineException
+	public ProjectAddInvitationResult addInvitations(Set<ProjectInvitationParam> invitationParams) throws EngineException
 	{
 		for (String project: invitationParams.stream().map(p -> p.project).collect(Collectors.toSet()))
 		{
@@ -112,32 +114,43 @@ public void addInvitations(Set<ProjectInvitationParam> invitationParams) throws
 		{
 			// ok
 		}
+		
+		
+		Set<ProjectInvitationParam> toSkip = new HashSet<>();
+		
 		if (entities != null && !entities.isEmpty())
 		{
-
 			for (ProjectInvitationParam invitation : invitationParams)
 			{
-				assertNotMemberAlready(entities.stream()
+				if (assertNotMemberAlready(entities.stream()
 						.filter(e -> e.contactEmail.equals(invitation.contactAddress))
-						.collect(Collectors.toSet()), invitation.project);
+						.collect(Collectors.toSet()), invitation.project))
+				{
+					toSkip.add(invitation);
+				}
 			}
-
 		}
-		for (ProjectInvitationParam param : invitationParams)
+		for (ProjectInvitationParam param : invitationParams.stream().filter(i -> !toSkip.contains(i)).collect(Collectors.toSet()))
 		{
 			String code = invitationMan.addInvitation(createComboInvitation(param));
 			invitationMan.sendInvitation(code);
 		}
 
+		return ProjectAddInvitationResult.builder()
+				.withProjectAlreadyMemberEmails(toSkip.stream()
+						.map(a -> a.contactAddress)
+						.collect(Collectors.toSet()))
+				.build();
+		
 	}
 
-	private void assertNotMemberAlready(Set<EntityWithContactInfo> collect, String project)
+	private boolean assertNotMemberAlready(Set<EntityWithContactInfo> collect, String project)
 	{
 		if (collect.stream().filter(e -> e.groups.contains(project)).findAny().isPresent())
 		{
-			throw new AlreadyMemberException();
+			return true;
 		}
-		
+		return false;
 	}
 
 	private ComboInvitationParam createComboInvitation(ProjectInvitationParam param) throws EngineException

web-upman/src/main/java/io/imunity/upman/front/views/invitations/InvitationsService.java

@@ -13,6 +13,7 @@
 import org.springframework.stereotype.Service;
 import pl.edu.icm.unity.MessageSource;
 import pl.edu.icm.unity.base.utils.Log;
+import pl.edu.icm.unity.engine.api.project.ProjectAddInvitationResult;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitation;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitationParam;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitationsManagement;
@@ -131,7 +132,14 @@ public void addInvitations(InvitationRequest invitationRequest)
 
 		try
 		{
-			invitationMan.addInvitations(toAdd);
+			 ProjectAddInvitationResult addInvitations = invitationMan.addInvitations(toAdd);
+			 if (!addInvitations.projectAlreadyMemberEmails.isEmpty())
+			 {
+					notificationPresenter.showWarning("",
+							msg.getMessage("InvitationsController.alreadyAMember",
+									String.join(",", addInvitations.projectAlreadyMemberEmails)));
+				 }
+			 
 		} catch (EngineException | AlreadyMemberException e)
 		{
 			log.warn("Can not add invitations", e);

web-upman/src/main/resources/messages/upman/messages.properties

@@ -138,7 +138,7 @@ InvitationsController.alreadyAMember=User is already a member of the project
 InvitationsController.addInvitationError=Can not add invitation
 InvitationsController.notAdd=Invitations were not added
 InvitationsController.partiallyAdded=Invitations are added only for following emails:{0}
-InvitationsController.alreadyAMember=User(s): {0} are already a member of the project
+InvitationsController.alreadyAMember=Invitations to user(s): {0} has been skipped, because are already a member of the project. 
 
 UpdateRequest.operation=Operation
 UpdateRequest.name=Name

web-upman/src/test/java/io/imunity/upman/front/views/invitations/TestInvitationService.java

@@ -5,6 +5,8 @@
 
 package io.imunity.upman.front.views.invitations;
 
+import static org.mockito.ArgumentMatchers.any;
+
 import io.imunity.upman.front.model.Group;
 import io.imunity.upman.front.model.GroupTreeNode;
 import io.imunity.upman.front.model.ProjectGroup;
@@ -17,6 +19,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import pl.edu.icm.unity.MessageSource;
+import pl.edu.icm.unity.engine.api.project.ProjectAddInvitationResult;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitationParam;
 import pl.edu.icm.unity.engine.api.project.ProjectInvitationsManagement;
 import pl.edu.icm.unity.exceptions.EngineException;
@@ -31,7 +34,7 @@
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-
+import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
 public class TestInvitationService
@@ -63,6 +66,8 @@ public void shouldAdd() throws EngineException
 		ProjectGroup project = new ProjectGroup("/project", "project", "regForm", "singupForm");
 		Group group = new Group("/", new I18nString("group"), "group", false, false, "", false, 0);
 		GroupTreeNode node = new GroupTreeNode(group, 0);
+		when(mockInvitationMan.addInvitations(any())).thenReturn(ProjectAddInvitationResult.builder()
+				.build());
 		service.addInvitations(new InvitationRequest(project, List.of("demo@demo.com", "demo2@demo.com"), Set.of(node),
 				false, expiration));
 
@@ -71,12 +76,23 @@ public void shouldAdd() throws EngineException
 		verify(mockInvitationMan, times(1)).addInvitations(argument.capture());
 
 		List<Set<ProjectInvitationParam>> arguments = argument.getAllValues();
-		assertThat(arguments.get(0).size()).isEqualTo(2);
-
-		assertThat(arguments.get(0).iterator().next().project).isEqualTo("/project");
-		assertThat(arguments.get(0).stream().map(p -> p.contactAddress).collect(Collectors.toSet())).isEqualTo(Set.of("demo@demo.com", "demo2@demo.com"));
-		assertThat(arguments.get(0).iterator().next().groups.iterator().next()).isEqualTo("/");
-		assertThat(arguments.get(0).iterator().next().expiration).isEqualTo(expiration);
+		assertThat(arguments.get(0)
+				.size()).isEqualTo(2);
+
+		assertThat(arguments.get(0)
+				.iterator()
+				.next().project).isEqualTo("/project");
+		assertThat(arguments.get(0)
+				.stream()
+				.map(p -> p.contactAddress)
+				.collect(Collectors.toSet())).isEqualTo(Set.of("demo@demo.com", "demo2@demo.com"));
+		assertThat(arguments.get(0)
+				.iterator()
+				.next().groups.iterator()
+						.next()).isEqualTo("/");
+		assertThat(arguments.get(0)
+				.iterator()
+				.next().expiration).isEqualTo(expiration);
 	}
 
 	@Test