From fe1bc7310877c787e72d6becb2258dbe06e10800 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Wed, 31 Jan 2024 18:08:31 +0100 Subject: [PATCH] Compatible with social model 2.0.0 --- CHANGELOG.md | 1 + pom.xml | 12 +++++-- .../client/StatisticsPanel.java | 6 ++-- ...ShowFeedsRelatedToUserStatisticsEvent.java | 2 +- .../client/ui/ActivityWidget.java | 2 +- .../server/UserStatisticsServiceImpl.java | 33 ++++++++++--------- .../userstatisticsportlet/Statistics.gwt.xml | 2 +- 7 files changed, 34 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1374735..b8cac96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Removed HomeLibrary - Updated GWT version to latest +- Removed Social Networking Library dependency #26534 ## [v2.3.0] - 2021-02-02 diff --git a/pom.xml b/pom.xml index b79533d..93aee3d 100644 --- a/pom.xml +++ b/pom.xml @@ -112,10 +112,16 @@ gcube-widgets compile + - org.gcube.portal - social-networking-library - provided + org.gcube.social-networking + social-service-model + [1.2.0-SNAPSHOT, 2.0.0] + + + org.gcube.social-networking + social-service-client + [2.0.0-SNAPSHOT, 3.0.0) org.gcube.common diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java index 770f739..0fa37e2 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/StatisticsPanel.java @@ -1,8 +1,8 @@ package org.gcube.portlet.user.userstatisticsportlet.client; -import org.gcube.portal.databook.client.GCubeSocialNetworking; -import org.gcube.portal.databook.client.util.Encoder; -import org.gcube.portal.databook.shared.ShowUserStatisticAction; +import org.gcube.social_networking.socialnetworking.model.client.GCubeSocialNetworking; +import org.gcube.social_networking.socialnetworking.model.client.util.Encoder; +import org.gcube.social_networking.socialnetworking.model.shared.ShowUserStatisticAction; import org.gcube.portlet.user.userstatisticsportlet.client.events.PageBusEvents; import org.gcube.portlet.user.userstatisticsportlet.client.events.ShowFeedsRelatedToUserStatisticsEvent; import org.gcube.portlet.user.userstatisticsportlet.client.events.ShowFeedsRelatedToUserStatisticsEventHandler; diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/events/ShowFeedsRelatedToUserStatisticsEvent.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/events/ShowFeedsRelatedToUserStatisticsEvent.java index 382136b..0b1ede8 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/events/ShowFeedsRelatedToUserStatisticsEvent.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/events/ShowFeedsRelatedToUserStatisticsEvent.java @@ -1,6 +1,6 @@ package org.gcube.portlet.user.userstatisticsportlet.client.events; -import org.gcube.portal.databook.shared.ShowUserStatisticAction; +import org.gcube.social_networking.socialnetworking.model.shared.ShowUserStatisticAction; import com.google.gwt.event.shared.GwtEvent; diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java index cebb42c..c9efa23 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/client/ui/ActivityWidget.java @@ -1,6 +1,6 @@ package org.gcube.portlet.user.userstatisticsportlet.client.ui; -import org.gcube.portal.databook.shared.ShowUserStatisticAction; +import org.gcube.social_networking.socialnetworking.model.shared.ShowUserStatisticAction; import org.gcube.portlet.user.userstatisticsportlet.client.events.ShowFeedsRelatedToUserStatisticsEvent; import com.github.gwtbootstrap.client.ui.Button; diff --git a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java index d890f63..019a396 100644 --- a/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java +++ b/src/main/java/org/gcube/portlet/user/userstatisticsportlet/server/UserStatisticsServiceImpl.java @@ -17,9 +17,8 @@ import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.portal.custom.communitymanager.SiteManagerUtil; -import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl; -import org.gcube.portal.databook.server.DatabookStore; -import org.gcube.portal.databook.shared.Feed; +import org.gcube.social_networking.social_networking_client_library.LibClient; +import org.gcube.social_networking.socialnetworking.model.shared.Post; import org.gcube.portlet.user.userstatisticsportlet.client.UserStatisticsService; import org.gcube.portlet.user.userstatisticsportlet.server.cache.UserInfrastructureQuotaStorageCache; import org.gcube.portlet.user.userstatisticsportlet.server.cache.UserInfrastructureSpaceCache; @@ -50,7 +49,7 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U // private static final org.slf4j.Logger logger = LoggerFactory.getLogger(UserStatisticsServiceImpl.class); private static final Log logger = LogFactoryUtil.getLog(UserStatisticsServiceImpl.class); - private DatabookStore store; + private LibClient libClient; private String quotaServiceBaseUrl; private static final String CUSTOM_FIELD_NAME_USER_STATISTICS_VISIBILITY = "show_user_statistics_other_people"; private UserManager userManager = new LiferayUserManager(); @@ -59,18 +58,22 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U @Override public void init() { logger.info("Getting connection to Cassandra.."); - store = new DBCassandraAstyanaxImpl(); + try { + libClient = new LibClient(); + } catch (Exception e) { + throw new RuntimeException(e); + } ServerUtils.createUserCustomField(CUSTOM_FIELD_NAME_USER_STATISTICS_VISIBILITY, true); logger.info("Retrieving quota service endpoint"); quotaServiceBaseUrl = DiscoverQuotaServiceEndPoint.discover(); } - @Override + /*@Override public void destroy(){ logger.info("Closing connection to Cassandra"); store.closeConnection(); - } + }*/ @Override public QuotaInfo getQuotaStorage(String userid) { @@ -284,9 +287,9 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U try { long userId = userManager.getUserId(statisticsOfUsername); - List userPosts = store.getRecentFeedsByUserAndDate(statisticsOfUsername, oneYearAgo.getTimeInMillis()); + List userPosts = libClient.getRecentPostsByUserAndDateLib(statisticsOfUsername, oneYearAgo.getTimeInMillis()); logger.debug("store.getRecentFeedsByUserAndDate"); - List recentLikedFeeds = store.getRecentLikedFeedsByUserAndDate(statisticsOfUsername, oneYearAgo.getTimeInMillis()); + List recentLikedFeeds = libClient.getRecentLikedPostsByUserAndDateLib(statisticsOfUsername, oneYearAgo.getTimeInMillis()); logger.debug("store.getRecentLikedFeedsByUserAndDate"); // Evaluate the contexts to use @@ -304,17 +307,17 @@ public class UserStatisticsServiceImpl extends RemoteServiceServlet implements U long postCreated = 0, likesGot = 0, commentsGot = 0, commentsMade = 0, likesMade = 0; - for (Feed feed : userPosts) { + for (Post post : userPosts) { - if(contexts.contains(feed.getVreid())){ + if(contexts.contains(post.getVreid())){ postCreated ++; - commentsGot += Integer.parseInt(feed.getCommentsNo()); - likesGot += Integer.parseInt(feed.getLikesNo()); + commentsGot += Integer.parseInt(post.getCommentsNo()); + likesGot += Integer.parseInt(post.getLikesNo()); } } - for (Feed feed : recentLikedFeeds) { + for (Post post : recentLikedFeeds) { - if(contexts.contains(feed.getVreid())) + if(contexts.contains(post.getVreid())) likesMade ++; } diff --git a/src/main/resources/org/gcube/portlet/user/userstatisticsportlet/Statistics.gwt.xml b/src/main/resources/org/gcube/portlet/user/userstatisticsportlet/Statistics.gwt.xml index 94bd433..bdc9ee5 100644 --- a/src/main/resources/org/gcube/portlet/user/userstatisticsportlet/Statistics.gwt.xml +++ b/src/main/resources/org/gcube/portlet/user/userstatisticsportlet/Statistics.gwt.xml @@ -5,7 +5,7 @@ - +