UY-1409 CR-1100 fixes

Author: ppiernik

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

@@ -7,14 +7,17 @@
 
 import java.util.Set;
 import java.util.Collections;
+import java.util.Optional;
 
 public class ProjectAddInvitationResult
 {
 	public final Set<String> projectAlreadyMemberEmails;
 
 	private ProjectAddInvitationResult(Builder builder)
 	{
-		this.projectAlreadyMemberEmails = builder.projectAlreadyMemberEmails;
+		this.projectAlreadyMemberEmails = Optional.ofNullable(builder.projectAlreadyMemberEmails)
+				.map(Set::copyOf)
+				.orElse(Set.of());
 	}
 
 	public static Builder builder()

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

@@ -60,8 +60,4 @@ public ProjectMisconfiguredException(String projectPath)
 			super("Misconfigured project group " + projectPath);
 		}
 	}
-	
-	public static class AlreadyMemberException extends RuntimeException
-	{
-	}
 }

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

@@ -122,7 +122,7 @@ public ProjectAddInvitationResult addInvitations(Set<ProjectInvitationParam> inv
 		{
 			for (ProjectInvitationParam invitation : invitationParams)
 			{
-				if (assertNotMemberAlready(entities.stream()
+				if (checkIsAlreadyMember(entities.stream()
 						.filter(e -> e.contactEmail.equals(invitation.contactAddress))
 						.collect(Collectors.toSet()), invitation.project))
 				{
@@ -144,7 +144,7 @@ public ProjectAddInvitationResult addInvitations(Set<ProjectInvitationParam> inv
 
 	}
 
-	private boolean assertNotMemberAlready(Set<EntityWithContactInfo> collect, String project)
+	private boolean checkIsAlreadyMember(Set<EntityWithContactInfo> collect, String project)
 	{
 		if (collect.stream().filter(e -> e.groups.contains(project)).findAny().isPresent())
 		{

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

@@ -17,7 +17,6 @@
 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;
-import pl.edu.icm.unity.engine.api.project.ProjectInvitationsManagement.AlreadyMemberException;
 import pl.edu.icm.unity.exceptions.EngineException;
 
 import java.util.ArrayList;
@@ -132,15 +131,14 @@ public void addInvitations(InvitationRequest invitationRequest)
 
 		try
 		{
-			 ProjectAddInvitationResult addInvitations = invitationMan.addInvitations(toAdd);
-			 if (!addInvitations.projectAlreadyMemberEmails.isEmpty())
-			 {
-					notificationPresenter.showWarning("",
-							msg.getMessage("InvitationsController.alreadyAMember",
-									String.join(",", addInvitations.projectAlreadyMemberEmails)));
-				 }
-			 
-		} catch (EngineException | AlreadyMemberException e)
+			ProjectAddInvitationResult addInvitations = invitationMan.addInvitations(toAdd);
+			if (!addInvitations.projectAlreadyMemberEmails.isEmpty())
+			{
+				notificationPresenter.showWarning("", msg.getMessage("InvitationsController.alreadyAMember",
+						String.join(",", addInvitations.projectAlreadyMemberEmails)));
+			}
+
+		} catch (EngineException e)
 		{
 			log.warn("Can not add invitations", e);
 			notificationPresenter.showError(msg.getMessage("InvitationsController.addInvitationError"),

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=Invitations to user(s): {0} has been skipped, because are already a member of the project. 
+InvitationsController.alreadyAMember=Invitations to user(s): {0} has been skipped, because they are already a member of the project. 
 
 UpdateRequest.operation=Operation
 UpdateRequest.name=Name