From c5976d893853d8f586a48b39c4f07552fcbd6087 Mon Sep 17 00:00:00 2001
From: "massimiliano.assante" <massimiliano.assante@isti.cnr.it>
Date: Thu, 28 Feb 2019 15:42:30 +0000
Subject: [PATCH] Feature #16194, Isolate Gateway user list in Messages

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/message-conversations@178377 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                        |  8 ++++----
 .settings/org.eclipse.wst.common.component        |  6 ------
 distro/changelog.xml                              |  4 ++++
 pom.xml                                           |  6 +++++-
 .../server/ConvServiceImpl.java                   | 15 ++++++---------
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/.classpath b/.classpath
index cefd118..3e1d99d 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/messages-2.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/messages-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/messages-2.1.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/messages-2.3.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -22,7 +22,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/messages-2.1.0-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
+	<classpathentry kind="src" output="target/messages-2.3.0-SNAPSHOT/WEB-INF/classes" path="target/generated-sources/gwt">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -35,5 +35,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/messages-2.1.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/messages-2.3.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 29adda4..f48cf24 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,12 +5,6 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-        <dependent-module archiveName="workspace-explorer-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-explorer-TRUNK-1.5.0-SNAPSHOT/workspace-explorer-TRUNK-1.5.0-SNAPSHOT">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="storagehub-icons-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/storagehub-icons-library/storagehub-icons-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="client-context-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/client-context-library/client-context-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 63c4429..2b2db5d 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.messages.2-3-0"
+		date="2019-02-28">
+		<Change>Feature #16194, Isolate Gateway user list in Messages</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.messages.2-1-0"
 		date="2018-06-14">
 		<Change>Updated Workspace Explorer dependency</Change>
diff --git a/pom.xml b/pom.xml
index a5ef0a4..b1f9235 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.portets.user</groupId>
 	<artifactId>messages</artifactId>
 	<packaging>war</packaging>
-	<version>2.1.0-SNAPSHOT</version>
+	<version>2.3.0-SNAPSHOT</version>
 	<description>
 		gCube Messages Portlet for exchanging messages with other users.
 	</description>
@@ -60,6 +60,10 @@
 			<artifactId>workspace-explorer</artifactId>
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>storagehub-client-library</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslsocial</artifactId>
diff --git a/src/main/java/org/gcube/portets/user/message_conversations/server/ConvServiceImpl.java b/src/main/java/org/gcube/portets/user/message_conversations/server/ConvServiceImpl.java
index 56de4d3..c7005ad 100644
--- a/src/main/java/org/gcube/portets/user/message_conversations/server/ConvServiceImpl.java
+++ b/src/main/java/org/gcube/portets/user/message_conversations/server/ConvServiceImpl.java
@@ -43,11 +43,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
-import com.liferay.portal.kernel.dao.orm.QueryUtil;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.util.OrderByComparator;
-import com.liferay.portal.kernel.util.OrderByComparatorFactoryUtil;
 import com.liferay.portal.model.User;
 import com.liferay.portal.service.GroupLocalServiceUtil;
 import com.liferay.portal.service.UserLocalServiceUtil;
@@ -340,14 +337,14 @@ public class ConvServiceImpl extends RemoteServiceServlet implements MessageServ
 	public ArrayList<WSUser> searchUsers(String keyword) {
 		ArrayList<WSUser> toReturn = new ArrayList<>();
 		if (isWithinPortal()) {
-			OrderByComparator comparator = OrderByComparatorFactoryUtil.create("User_", "screenname", true);
+			long gatewayGroupId = pContext.getCurrentGroupId(this.getThreadLocalRequest());
 			try {
 				_log.debug("Searching " + keyword);
-				List<User> lrUsers = UserLocalServiceUtil.search(ManagementUtils.getCompany().getCompanyId(), keyword, 0, null, QueryUtil.ALL_POS, QueryUtil.ALL_POS, comparator);
-				for (User user : lrUsers) {
-					toReturn.add(new WSUser(""+user.getUserId(), user.getScreenName(), user.getFullName(), extractDomainFromEmail(user.getEmailAddress())));
-				}
-			} catch (SystemException | PortalException e) {
+				List<GCubeUser> users = um.searchUsersByGroup(keyword, gatewayGroupId);
+				for (GCubeUser user : users) {
+					toReturn.add(new WSUser(""+user.getUserId(), user.getUsername(), user.getFullname(), extractDomainFromEmail(user.getEmail())));
+				}				
+			} catch (Exception e) {
 				e.printStackTrace();
 			}
 		} else { //development