|
|
|
@ -95,8 +95,8 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|
|
|
|
if (user == null) {
|
|
|
|
|
_log.warn("USER IS NULL setting testing user and Running OUTSIDE PORTAL");
|
|
|
|
|
user = "test.user";
|
|
|
|
|
user = "massimiliano.assante";
|
|
|
|
|
SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube/devsec/devVRE");
|
|
|
|
|
// user = "massimiliano.assante";
|
|
|
|
|
// SessionManager.getInstance().getASLSession(sessionID, user).setScope("/gcube/devsec/devVRE");
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
withinPortal = true;
|
|
|
|
@ -187,19 +187,6 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//User Own Feeds
|
|
|
|
|
ArrayList<Feed> userFeeds = (ArrayList<Feed>) store.getRecentFeedsByUser(userName, feedsNoPerCategory);
|
|
|
|
|
for (Feed feed : userFeeds) {
|
|
|
|
|
feedsMap.put(feed.getKey(), feed);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//UserFriends Feeds
|
|
|
|
|
ArrayList<String> userFriendsIds = (ArrayList<String>)store.getFriends(userName);
|
|
|
|
|
for (String userid : userFriendsIds) {
|
|
|
|
|
for (Feed feed : store.getRecentFeedsByUser(userid, feedsNoPerCategory)) {
|
|
|
|
|
feedsMap.put(feed.getKey(), feed);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//Portal Feeds
|
|
|
|
|
ArrayList<Feed> portalFeeds = (ArrayList<Feed>) store.getAllPortalPrivacyLevelFeeds();
|
|
|
|
@ -221,6 +208,9 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|
|
|
|
toMerge.add(feedsMap.get(key));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//sort the feeds in reverse chronological order
|
|
|
|
|
Collections.sort(toMerge, Collections.reverseOrder());
|
|
|
|
|
|
|
|
|
|
ArrayList<Feed> toReturn = new ArrayList<Feed>();
|
|
|
|
|
//return only <MAX_FEEDS_NO> feeds
|
|
|
|
|
if (toMerge.size() > MAX_FEEDS_NO)
|
|
|
|
@ -372,6 +362,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
Collections.sort(userFeeds, Collections.reverseOrder());
|
|
|
|
|
return enhanceFeeds(userFeeds, 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -385,6 +376,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
Collections.sort(userFeeds, Collections.reverseOrder());
|
|
|
|
|
return enhanceFeeds(userFeeds, 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -479,14 +471,9 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
|
|
|
|
|
private ArrayList<EnhancedFeed> enhanceFeeds(ArrayList<Feed> toEnhance, int commentsNumberPerFeed) {
|
|
|
|
|
ArrayList<EnhancedFeed> toReturn = new ArrayList<EnhancedFeed>();
|
|
|
|
|
String username = getASLSession().getUsername();
|
|
|
|
|
//sort the Feeds
|
|
|
|
|
Collections.sort(toEnhance, Collections.reverseOrder());
|
|
|
|
|
|
|
|
|
|
ArrayList<String> likedFeeds = (ArrayList<String>) store.getAllLikedFeedIdsByUser(getASLSession().getUsername());
|
|
|
|
|
// System.out.println("Liked Feed for " + username);
|
|
|
|
|
// for (String liked : likedFeeds) {
|
|
|
|
|
// System.out.println(liked);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (Feed feed : toEnhance) {
|
|
|
|
|
feed.setDescription(replaceAmpersand(feed.getDescription()));
|
|
|
|
|
if (! feed.isApplicationFeed())
|
|
|
|
|