added support to alert the users of a VRE when posting in to a VRE. Added new notification type
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/social-networking-library@92660 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
a9a9025017
commit
f4100c709b
17662
.gwt/.gwt-log
17662
.gwt/.gwt-log
File diff suppressed because it is too large
Load Diff
1
pom.xml
1
pom.xml
|
|
@ -65,7 +65,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.liferay.portal</groupId>
|
<groupId>com.liferay.portal</groupId>
|
||||||
<artifactId>portal-service</artifactId>
|
<artifactId>portal-service</artifactId>
|
||||||
<version>6.0.6</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.portlet</groupId>
|
<groupId>javax.portlet</groupId>
|
||||||
|
|
|
||||||
|
|
@ -926,13 +926,13 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* called when you add new notification types where the setting does not exist yet
|
* called when you add new notification types where the setting does not exist yet
|
||||||
* please note: by default we set only portal notifications
|
* please note: by default we set all notifications
|
||||||
*/
|
*/
|
||||||
private List<NotificationChannelType> createNewNotificationType(String userid, NotificationType notificationType) {
|
private List<NotificationChannelType> createNewNotificationType(String userid, NotificationType notificationType) {
|
||||||
List<NotificationChannelType> toReturn = new ArrayList<NotificationChannelType>();
|
List<NotificationChannelType> toReturn = new ArrayList<NotificationChannelType>();
|
||||||
MutationBatch m = conn.getKeyspace().prepareMutationBatch();
|
MutationBatch m = conn.getKeyspace().prepareMutationBatch();
|
||||||
String valueToInsert = "";
|
String valueToInsert = "";
|
||||||
NotificationChannelType[] wpTypes = { NotificationChannelType.PORTAL };
|
NotificationChannelType[] wpTypes = NotificationChannelType.values();
|
||||||
|
|
||||||
for (int i = 0; i < wpTypes.length; i++) {
|
for (int i = 0; i < wpTypes.length; i++) {
|
||||||
valueToInsert += wpTypes[i];
|
valueToInsert += wpTypes[i];
|
||||||
|
|
@ -1001,12 +1001,12 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
|
||||||
|
|
||||||
for (int i = 0; i < NotificationType.values().length; i++) {
|
for (int i = 0; i < NotificationType.values().length; i++) {
|
||||||
//TODO: Potential bug in NotificationType for workspace are refactored
|
//TODO: Potential bug in NotificationType for workspace are refactored
|
||||||
//create a map with all notification enabled except for workflow notifications (They start with WP_) it was the only quick way
|
//create a map with all notification enabled except for workspace notifications (They start with WP_) it was the only quick way
|
||||||
if (NotificationType.values()[i].toString().startsWith("WP_") || NotificationType.values()[i].toString().startsWith("CALENDAR")) {
|
// if (NotificationType.values()[i].toString().startsWith("WP_") || NotificationType.values()[i].toString().startsWith("CALENDAR")) {
|
||||||
NotificationChannelType[] wpTypes = { NotificationChannelType.PORTAL };
|
// NotificationChannelType[] wpTypes = { NotificationChannelType.PORTAL };
|
||||||
toCreate.put(NotificationType.values()[i], wpTypes);
|
// toCreate.put(NotificationType.values()[i], wpTypes);
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
toCreate.put(NotificationType.values()[i], NotificationChannelType.values());
|
toCreate.put(NotificationType.values()[i], NotificationChannelType.values());
|
||||||
}
|
}
|
||||||
setUserNotificationPreferences(userid, toCreate); //commit the map
|
setUserNotificationPreferences(userid, toCreate); //commit the map
|
||||||
|
|
@ -1472,6 +1472,9 @@ public final class DBCassandraAstyanaxImpl implements DatabookStore {
|
||||||
else if (type.compareTo("MESSAGE") == 0) {
|
else if (type.compareTo("MESSAGE") == 0) {
|
||||||
return NotificationType.MESSAGE;
|
return NotificationType.MESSAGE;
|
||||||
}
|
}
|
||||||
|
else if (type.compareTo("POST_ALERT") == 0) {
|
||||||
|
return NotificationType.POST_ALERT;
|
||||||
|
}
|
||||||
else if (type.compareTo("REQUEST_CONNECTION") == 0) {
|
else if (type.compareTo("REQUEST_CONNECTION") == 0) {
|
||||||
return NotificationType.REQUEST_CONNECTION;
|
return NotificationType.REQUEST_CONNECTION;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ public class DatabookCassandraTest {
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public static void setup() throws Exception {
|
public static void setup() throws Exception {
|
||||||
store = new DBCassandraAstyanaxImpl(false); //set to true if you want to drop the KeySpace and recreate it
|
store = new DBCassandraAstyanaxImpl(); //set to true if you want to drop the KeySpace and recreate it
|
||||||
}
|
}
|
||||||
|
|
||||||
@AfterClass
|
@AfterClass
|
||||||
|
|
@ -38,50 +38,50 @@ public class DatabookCassandraTest {
|
||||||
System.out.println("End");
|
System.out.println("End");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
/**
|
// /**
|
||||||
* use exclusively to add a new CF to a keyspace
|
// * use exclusively to add a new CF to a keyspace
|
||||||
*/
|
// */
|
||||||
@Test
|
// @Test
|
||||||
public void addNotifPreferencesColumnFamily() {
|
// public void addNotifPreferencesColumnFamily() {
|
||||||
// ColumnFamily<String, String> cf_UserNotificationsPreferences = new ColumnFamily<String, String>(
|
// // ColumnFamily<String, String> cf_UserNotificationsPreferences = new ColumnFamily<String, String>(
|
||||||
// DBCassandraAstyanaxImpl.USER_NOTIFICATIONS_PREFERENCES, // Column Family Name
|
// // DBCassandraAstyanaxImpl.USER_NOTIFICATIONS_PREFERENCES, // Column Family Name
|
||||||
// StringSerializer.get(), // Key Serializer
|
// // StringSerializer.get(), // Key Serializer
|
||||||
// StringSerializer.get()); // Column Serializer
|
// // StringSerializer.get()); // Column Serializer
|
||||||
//
|
// //
|
||||||
// try {
|
// // try {
|
||||||
// new CassandraClusterConnection(false).getKeyspace().createColumnFamily(cf_UserNotificationsPreferences, ImmutableMap.<String, Object>builder()
|
// // new CassandraClusterConnection(false).getKeyspace().createColumnFamily(cf_UserNotificationsPreferences, ImmutableMap.<String, Object>builder()
|
||||||
// .put("default_validation_class", "UTF8Type")
|
// // .put("default_validation_class", "UTF8Type")
|
||||||
// .put("key_validation_class", "UTF8Type")
|
// // .put("key_validation_class", "UTF8Type")
|
||||||
// .put("comparator_type", "UTF8Type")
|
// // .put("comparator_type", "UTF8Type")
|
||||||
// .build());
|
// // .build());
|
||||||
// } catch (ConnectionException e) {
|
// // } catch (ConnectionException e) {
|
||||||
// e.printStackTrace();
|
// // e.printStackTrace();
|
||||||
// }
|
// // }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
public void testFriendships() {
|
// public void testFriendships() {
|
||||||
assertTrue(store.requestFriendship("massimiliano.assante", "leonardo.candela"));
|
// assertTrue(store.requestFriendship("massimiliano.assante", "leonardo.candela"));
|
||||||
assertTrue(store.requestFriendship("massimiliano.assante", "ermit"));
|
// assertTrue(store.requestFriendship("massimiliano.assante", "ermit"));
|
||||||
assertTrue(store.requestFriendship("massimiliano.assante", "giorgino"));
|
// assertTrue(store.requestFriendship("massimiliano.assante", "giorgino"));
|
||||||
assertTrue(store.requestFriendship("barabba", "massimiliano.assante"));
|
// assertTrue(store.requestFriendship("barabba", "massimiliano.assante"));
|
||||||
|
//
|
||||||
assertTrue(store.approveFriendship("leonardo.candela", "massimiliano.assante"));
|
// assertTrue(store.approveFriendship("leonardo.candela", "massimiliano.assante"));
|
||||||
assertTrue(store.approveFriendship("ermit", "massimiliano.assante"));
|
// assertTrue(store.approveFriendship("ermit", "massimiliano.assante"));
|
||||||
|
//
|
||||||
assertTrue(store.denyFriendship("giorgino", "massimiliano.assante"));
|
// assertTrue(store.denyFriendship("giorgino", "massimiliano.assante"));
|
||||||
System.out.println("Pending Connections for massimiliano.assante:");
|
// System.out.println("Pending Connections for massimiliano.assante:");
|
||||||
for (String userid: store.getPendingFriendRequests("massimiliano.assante")) {
|
// for (String userid: store.getPendingFriendRequests("massimiliano.assante")) {
|
||||||
System.out.println(userid);
|
// System.out.println(userid);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
System.out.println("Connections for massimiliano.assante:");
|
// System.out.println("Connections for massimiliano.assante:");
|
||||||
for (String userid: store.getFriends("massimiliano.assante")) {
|
// for (String userid: store.getFriends("massimiliano.assante")) {
|
||||||
System.out.println(userid);
|
// System.out.println(userid);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
@Test
|
@Test
|
||||||
public void testLikedFeedsRetrieval() {
|
public void testLikedFeedsRetrieval() {
|
||||||
try {
|
try {
|
||||||
|
|
@ -92,290 +92,290 @@ public class DatabookCassandraTest {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
public void testSingleNotificationPreference() {
|
// public void testSingleNotificationPreference() {
|
||||||
try {
|
// try {
|
||||||
for (NotificationChannelType channel : store.getUserNotificationChannels("massimiliano.assante", NotificationType.COMMENT)) {
|
// for (NotificationChannelType channel : store.getUserNotificationChannels("massimiliano.assante", NotificationType.COMMENT)) {
|
||||||
System.out.println(channel);
|
// System.out.println(channel);
|
||||||
}
|
// }
|
||||||
} catch (NotificationChannelTypeNotFoundException e) {
|
// } catch (NotificationChannelTypeNotFoundException e) {
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
} catch (NotificationTypeNotFoundException e) {
|
// } catch (NotificationTypeNotFoundException e) {
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
};
|
// };
|
||||||
HashMap<NotificationType, NotificationChannelType[]> toCreate = new HashMap<NotificationType, NotificationChannelType[]>();
|
// HashMap<NotificationType, NotificationChannelType[]> toCreate = new HashMap<NotificationType, NotificationChannelType[]>();
|
||||||
for (int i = 0; i < NotificationType.values().length; i++) {
|
// for (int i = 0; i < NotificationType.values().length; i++) {
|
||||||
if (i == 0)
|
// if (i == 0)
|
||||||
toCreate.put(NotificationType.values()[i], null);
|
// toCreate.put(NotificationType.values()[i], null);
|
||||||
else if (i ==3) {
|
// else if (i ==3) {
|
||||||
NotificationChannelType[] nots = {NotificationChannelType.PORTAL};
|
// NotificationChannelType[] nots = {NotificationChannelType.PORTAL};
|
||||||
toCreate.put(NotificationType.values()[i], nots);
|
// toCreate.put(NotificationType.values()[i], nots);
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
toCreate.put(NotificationType.values()[i], NotificationChannelType.values());
|
// toCreate.put(NotificationType.values()[i], NotificationChannelType.values());
|
||||||
}
|
// }
|
||||||
store.setUserNotificationPreferences("antonio.gioia", toCreate);
|
// store.setUserNotificationPreferences("antonio.gioia", toCreate);
|
||||||
|
//
|
||||||
|
//
|
||||||
try {
|
// try {
|
||||||
for (NotificationChannelType channel : store.getUserNotificationChannels("antonio.gioia", NotificationType.WP_FOLDER_RENAMED)) { //i == 3
|
// for (NotificationChannelType channel : store.getUserNotificationChannels("antonio.gioia", NotificationType.WP_FOLDER_RENAMED)) { //i == 3
|
||||||
System.out.println(channel);
|
// System.out.println(channel);
|
||||||
}
|
// }
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
public void testSingleNotification() {
|
// public void testSingleNotification() {
|
||||||
Notification not = new Notification(
|
// Notification not = new Notification(
|
||||||
UUID.randomUUID().toString(),
|
// UUID.randomUUID().toString(),
|
||||||
NotificationType.LIKE,
|
// NotificationType.LIKE,
|
||||||
"leonardo.candela",
|
// "leonardo.candela",
|
||||||
"MESSAGEID",
|
// "MESSAGEID",
|
||||||
new Date(),
|
// new Date(),
|
||||||
"uri",
|
// "uri",
|
||||||
"This is notification about a like",
|
// "This is notification about a like",
|
||||||
false,
|
// false,
|
||||||
"leonardo.candela", "Leonardo Candela",
|
// "leonardo.candela", "Leonardo Candela",
|
||||||
"thumburl");
|
// "thumburl");
|
||||||
assertTrue(store.saveNotification(not));
|
// assertTrue(store.saveNotification(not));
|
||||||
|
//
|
||||||
not = new Notification(
|
// not = new Notification(
|
||||||
UUID.randomUUID().toString(),
|
// UUID.randomUUID().toString(),
|
||||||
NotificationType.MESSAGE,
|
// NotificationType.MESSAGE,
|
||||||
"massimiliano.assante",
|
// "massimiliano.assante",
|
||||||
"MESSAGEID",
|
// "MESSAGEID",
|
||||||
new Date(),
|
// new Date(),
|
||||||
"uri",
|
// "uri",
|
||||||
"This is notification about a like",
|
// "This is notification about a like",
|
||||||
false,
|
// false,
|
||||||
"antonio.gioia", "Antonio Gioia",
|
// "antonio.gioia", "Antonio Gioia",
|
||||||
"thumburl");
|
// "thumburl");
|
||||||
assertTrue(store.saveNotification(not));
|
// assertTrue(store.saveNotification(not));
|
||||||
System.out.println("Writing one Notification " + not);
|
// System.out.println("Writing one Notification " + not);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
public void testNotifications() {
|
// public void testNotifications() {
|
||||||
Notification not = null;
|
// Notification not = null;
|
||||||
System.out.println("Writing 18 Notifications");
|
// System.out.println("Writing 18 Notifications");
|
||||||
int count = 18;
|
// int count = 18;
|
||||||
for (int i = 0; i < count; i++) {
|
// for (int i = 0; i < count; i++) {
|
||||||
if (i % 2 != 0) {
|
// if (i % 2 != 0) {
|
||||||
not = new Notification(UUID.randomUUID().toString(), NotificationType.JOB_COMPLETED_OK,
|
// not = new Notification(UUID.randomUUID().toString(), NotificationType.JOB_COMPLETED_OK,
|
||||||
"leonardo.candela", "TWEETID", new Date(), "uri", "This is notification about job completed OK #"+i, false, "pasquale.pagano", "Pasquale Pagano", "thumburl");
|
// "leonardo.candela", "TWEETID", new Date(), "uri", "This is notification about job completed OK #"+i, false, "pasquale.pagano", "Pasquale Pagano", "thumburl");
|
||||||
} else {
|
// } else {
|
||||||
not = new Notification(UUID.randomUUID().toString(), NotificationType.JOB_COMPLETED_NOK,
|
// not = new Notification(UUID.randomUUID().toString(), NotificationType.JOB_COMPLETED_NOK,
|
||||||
"massimiliano.assante", "MESSAGEID", new Date(), "uri", "This is notification about completed NOK #"+i, false, "leonardo.candela", "Leonardo Candela", "thumburl");
|
// "massimiliano.assante", "MESSAGEID", new Date(), "uri", "This is notification about completed NOK #"+i, false, "leonardo.candela", "Leonardo Candela", "thumburl");
|
||||||
}
|
// }
|
||||||
assertTrue(store.saveNotification(not));
|
// assertTrue(store.saveNotification(not));
|
||||||
try {
|
// try {
|
||||||
Thread.sleep(150);
|
// Thread.sleep(150);
|
||||||
} catch (InterruptedException e) {
|
// } catch (InterruptedException e) {
|
||||||
// TODO Auto-generated catch block
|
// // TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
Notification rNot= null;
|
// Notification rNot= null;
|
||||||
try {
|
// try {
|
||||||
|
//
|
||||||
//read
|
// //read
|
||||||
rNot = store.readNotification(not.getKey().toString());
|
// rNot = store.readNotification(not.getKey().toString());
|
||||||
assertNotNull(rNot);
|
// assertNotNull(rNot);
|
||||||
System.out.println("Reading one Notification " + rNot.getKey() + ": " + rNot.getDescription() + " Type: " + rNot.getType());
|
// System.out.println("Reading one Notification " + rNot.getKey() + ": " + rNot.getDescription() + " Type: " + rNot.getType());
|
||||||
|
//
|
||||||
//set Read
|
// //set Read
|
||||||
assertTrue(store.setNotificationRead(rNot.getKey().toString()));
|
// assertTrue(store.setNotificationRead(rNot.getKey().toString()));
|
||||||
|
//
|
||||||
System.out.println("Notification " + rNot.getKey() + " of Type: " + rNot.getType() + " was set to READ");
|
// System.out.println("Notification " + rNot.getKey() + " of Type: " + rNot.getType() + " was set to READ");
|
||||||
|
//
|
||||||
not = new Notification(UUID.randomUUID().toString(), NotificationType.LIKE,
|
// not = new Notification(UUID.randomUUID().toString(), NotificationType.LIKE,
|
||||||
"leonardo.candela", "FEEDID", new Date(), "uri", "This is notification of a Liked Leo feed by Massi", false, "massimiliano.assante", "Massimiliano Assante", "thumburl");
|
// "leonardo.candela", "FEEDID", new Date(), "uri", "This is notification of a Liked Leo feed by Massi", false, "massimiliano.assante", "Massimiliano Assante", "thumburl");
|
||||||
assertTrue(store.saveNotification(not));
|
// assertTrue(store.saveNotification(not));
|
||||||
try {
|
// try {
|
||||||
Thread.sleep(150);
|
// Thread.sleep(150);
|
||||||
} catch (InterruptedException e) {
|
// } catch (InterruptedException e) {
|
||||||
// TODO Auto-generated catch block
|
// // TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
// }
|
||||||
rNot = store.readNotification(not.getKey().toString());
|
// rNot = store.readNotification(not.getKey().toString());
|
||||||
System.out.println("Reading another Notification " + rNot.getKey() + " of Type: " + rNot.getType() + " Read:? " + rNot.isRead());
|
// System.out.println("Reading another Notification " + rNot.getKey() + " of Type: " + rNot.getType() + " Read:? " + rNot.isRead());
|
||||||
// //set Read
|
// // //set Read
|
||||||
// assertTrue(store.setNotificationRead(rNot.getKey().toString()));
|
// // assertTrue(store.setNotificationRead(rNot.getKey().toString()));
|
||||||
// System.out.println("Notification " + rNot.getKey() + " of Type: " + rNot.getType() + " was set to READ subject was this: " + rNot.getSubjectid());
|
// // System.out.println("Notification " + rNot.getKey() + " of Type: " + rNot.getType() + " was set to READ subject was this: " + rNot.getSubjectid());
|
||||||
//
|
// //
|
||||||
Random randomGenerator = new Random();
|
// Random randomGenerator = new Random();
|
||||||
|
//
|
||||||
System.out.println("leonardo.candela Notifications: ");
|
// System.out.println("leonardo.candela Notifications: ");
|
||||||
List<Notification> recentNots = store.getAllNotificationByUser("leonardo.candela", randomGenerator.nextInt(50));
|
// List<Notification> recentNots = store.getAllNotificationByUser("leonardo.candela", randomGenerator.nextInt(50));
|
||||||
assertNotNull(recentNots);
|
// assertNotNull(recentNots);
|
||||||
for (Notification notif :recentNots)
|
// for (Notification notif :recentNots)
|
||||||
System.out.println(notif);
|
// System.out.println(notif);
|
||||||
|
//
|
||||||
|
//
|
||||||
System.out.println("massimiliano.assante Notifications: ");
|
// System.out.println("massimiliano.assante Notifications: ");
|
||||||
recentNots = store.getUnreadNotificationsByUser("massimiliano.assante");
|
// recentNots = store.getUnreadNotificationsByUser("massimiliano.assante");
|
||||||
assertNotNull(recentNots);
|
// assertNotNull(recentNots);
|
||||||
for (Notification notif :recentNots)
|
// for (Notification notif :recentNots)
|
||||||
System.out.println(notif);
|
// System.out.println(notif);
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
public void testFeeds() {
|
// public void testFeeds() {
|
||||||
int count = 18;
|
// int count = 18;
|
||||||
Feed feed = null;
|
// Feed feed = null;
|
||||||
for (int i = 0; i < count; i++) {
|
// for (int i = 0; i < count; i++) {
|
||||||
if (i % 2 != 0) {
|
// if (i % 2 != 0) {
|
||||||
feed = new Feed(UUID.randomUUID().toString(), FeedType.JOIN, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
// feed = new Feed(UUID.randomUUID().toString(), FeedType.JOIN, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
||||||
"www.d4science.org/monitor", "thumbUri", "This is feed# "+ i, PrivacyLevel.VRES, "Massimiliano Assante", "massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host");
|
// "www.d4science.org/monitor", "thumbUri", "This is feed# "+ i, PrivacyLevel.VRES, "Massimiliano Assante", "massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host");
|
||||||
} else {
|
// } else {
|
||||||
feed = new Feed(UUID.randomUUID().toString(), FeedType.TWEET, "leonardo.candela", new Date(), "",
|
// feed = new Feed(UUID.randomUUID().toString(), FeedType.TWEET, "leonardo.candela", new Date(), "",
|
||||||
"www.d4science.org/web/guest", "thumbUri", "This is feed# "+ i, PrivacyLevel.PORTAL, "Leonardo Candela", "leonardo.candela@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host");
|
// "www.d4science.org/web/guest", "thumbUri", "This is feed# "+ i, PrivacyLevel.PORTAL, "Leonardo Candela", "leonardo.candela@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host");
|
||||||
}
|
// }
|
||||||
assertTrue(store.saveUserFeed(feed));
|
// assertTrue(store.saveUserFeed(feed));
|
||||||
try {
|
// try {
|
||||||
Thread.sleep(150);
|
// Thread.sleep(150);
|
||||||
} catch (InterruptedException e) {
|
// } catch (InterruptedException e) {
|
||||||
// TODO Auto-generated catch block
|
// // TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
Feed rFeed = null;
|
// Feed rFeed = null;
|
||||||
try {
|
// try {
|
||||||
rFeed = store.readFeed(feed.getKey().toString());
|
// rFeed = store.readFeed(feed.getKey().toString());
|
||||||
rFeed = store.readFeed(feed.getKey().toString());
|
// rFeed = store.readFeed(feed.getKey().toString());
|
||||||
rFeed = store.readFeed(feed.getKey().toString());
|
// rFeed = store.readFeed(feed.getKey().toString());
|
||||||
rFeed = store.readFeed(feed.getKey().toString());
|
// rFeed = store.readFeed(feed.getKey().toString());
|
||||||
assertNotNull(rFeed);
|
// assertNotNull(rFeed);
|
||||||
|
//
|
||||||
String feedIdToDelete = UUID.randomUUID().toString();
|
// String feedIdToDelete = UUID.randomUUID().toString();
|
||||||
feed = new Feed(feedIdToDelete, FeedType.PUBLISH, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
// feed = new Feed(feedIdToDelete, FeedType.PUBLISH, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
||||||
"www.d4science.org/monitor", "thumbUri", "This is feed to be deleted", PrivacyLevel.VRES, "Massimiliano Assante", "massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host", false);
|
// "www.d4science.org/monitor", "thumbUri", "This is feed to be deleted", PrivacyLevel.VRES, "Massimiliano Assante", "massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host", false);
|
||||||
assertTrue(store.saveUserFeed(feed));
|
// assertTrue(store.saveUserFeed(feed));
|
||||||
try {
|
// try {
|
||||||
Thread.sleep(250);
|
// Thread.sleep(250);
|
||||||
} catch (InterruptedException e) {
|
// } catch (InterruptedException e) {
|
||||||
// TODO Auto-generated catch block
|
// // TODO Auto-generated catch block
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
// }
|
||||||
System.out.println("Test Delete Feed ");
|
// System.out.println("Test Delete Feed ");
|
||||||
assertTrue(store.deleteFeed(feedIdToDelete));
|
// assertTrue(store.deleteFeed(feedIdToDelete));
|
||||||
|
//
|
||||||
System.out.println("massimiliano.assante ALL FEEDS: ");
|
// System.out.println("massimiliano.assante ALL FEEDS: ");
|
||||||
for (Feed recFeed : store.getAllFeedsByUser("massimiliano.assante"))
|
// for (Feed recFeed : store.getAllFeedsByUser("massimiliano.assante"))
|
||||||
System.out.println(recFeed);
|
// System.out.println(recFeed);
|
||||||
|
//
|
||||||
Random randomGenerator = new Random();
|
// Random randomGenerator = new Random();
|
||||||
|
//
|
||||||
System.out.println("leonardo.candela TIMELINE: ");
|
// System.out.println("leonardo.candela TIMELINE: ");
|
||||||
List<Feed> recentFeeds = store.getRecentFeedsByUser("leonardo.candela", randomGenerator.nextInt(50));
|
// List<Feed> recentFeeds = store.getRecentFeedsByUser("leonardo.candela", randomGenerator.nextInt(50));
|
||||||
assertNotNull(recentFeeds);
|
// assertNotNull(recentFeeds);
|
||||||
for (Feed recFeed :recentFeeds)
|
// for (Feed recFeed :recentFeeds)
|
||||||
System.out.println(recFeed);
|
// System.out.println(recFeed);
|
||||||
|
//
|
||||||
|
//
|
||||||
System.out.println("/gcube/devsec/devVRE TIMELINE: ");
|
// System.out.println("/gcube/devsec/devVRE TIMELINE: ");
|
||||||
recentFeeds = store.getRecentFeedsByVRE("/gcube/devsec/devVRE", randomGenerator.nextInt(50));
|
// recentFeeds = store.getRecentFeedsByVRE("/gcube/devsec/devVRE", randomGenerator.nextInt(50));
|
||||||
assertNotNull(recentFeeds);
|
// assertNotNull(recentFeeds);
|
||||||
for (Feed recFeed :recentFeeds)
|
// for (Feed recFeed :recentFeeds)
|
||||||
System.out.println(recFeed);
|
// System.out.println(recFeed);
|
||||||
|
//
|
||||||
System.out.println("PORTAL TIMELINE: ");
|
// System.out.println("PORTAL TIMELINE: ");
|
||||||
recentFeeds = store.getAllPortalPrivacyLevelFeeds();
|
// recentFeeds = store.getAllPortalPrivacyLevelFeeds();
|
||||||
assertNotNull(recentFeeds);
|
// assertNotNull(recentFeeds);
|
||||||
for (Feed recFeed :recentFeeds)
|
// for (Feed recFeed :recentFeeds)
|
||||||
System.out.println(recFeed);
|
// System.out.println(recFeed);
|
||||||
|
//
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
e.printStackTrace();
|
// e.printStackTrace();
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
// @Test
|
// // @Test
|
||||||
// public void testNotifications() {
|
// // public void testNotifications() {
|
||||||
// int count = 10;
|
// // int count = 10;
|
||||||
// Notification notf = null;
|
// // Notification notf = null;
|
||||||
// for (int i = 0; i < count; i++) {
|
// // for (int i = 0; i < count; i++) {
|
||||||
// notf = new Notification(UUID.randomUUID().toString(), NotificationType.MESSAGE, "massimiliano.assante", new Date(), "http://urir.com", "Desc #"+i, "Gino Camillo", false);
|
// // notf = new Notification(UUID.randomUUID().toString(), NotificationType.MESSAGE, "massimiliano.assante", new Date(), "http://urir.com", "Desc #"+i, "Gino Camillo", false);
|
||||||
// assertTrue(store.saveNotification(notf));
|
// // assertTrue(store.saveNotification(notf));
|
||||||
// }
|
// // }
|
||||||
// try {
|
// // try {
|
||||||
// assertNotNull(store.getAllNotificationByUser("massimiliano.assante"));
|
// // assertNotNull(store.getAllNotificationByUser("massimiliano.assante"));
|
||||||
// } catch (Exception e) {
|
// // } catch (Exception e) {
|
||||||
// e.printStackTrace();
|
// // e.printStackTrace();
|
||||||
// }
|
// // }
|
||||||
// }
|
// // }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
public void testComments() {
|
// public void testComments() {
|
||||||
int count = 10;
|
// int count = 10;
|
||||||
Feed feed = new Feed(UUID.randomUUID().toString(), FeedType.SHARE, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
// Feed feed = new Feed(UUID.randomUUID().toString(), FeedType.SHARE, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
||||||
"http://www.d4science.org/monitor", "thumbUri", "This is feed that is going to be commented ", PrivacyLevel.PUBLIC, "Massimiliano Assante",
|
// "http://www.d4science.org/monitor", "thumbUri", "This is feed that is going to be commented ", PrivacyLevel.PUBLIC, "Massimiliano Assante",
|
||||||
"massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host", false);
|
// "massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host", false);
|
||||||
assertTrue(store.saveUserFeed(feed));
|
// assertTrue(store.saveUserFeed(feed));
|
||||||
|
//
|
||||||
Comment toDelete = null;
|
// Comment toDelete = null;
|
||||||
for (int i = 0; i < count; i++) {
|
// for (int i = 0; i < count; i++) {
|
||||||
try {
|
// try {
|
||||||
toDelete = new Comment(UUID.randomUUID().toString(),"leonardo.candela",
|
// toDelete = new Comment(UUID.randomUUID().toString(),"leonardo.candela",
|
||||||
new Date(), feed.getKey().toString(), "This comment #"+i, "Leonardo Candela", "thumbUrl");
|
// new Date(), feed.getKey().toString(), "This comment #"+i, "Leonardo Candela", "thumbUrl");
|
||||||
assertTrue(store.addComment(toDelete));
|
// assertTrue(store.addComment(toDelete));
|
||||||
|
//
|
||||||
} catch (FeedIDNotFoundException e) {
|
// } catch (FeedIDNotFoundException e) {
|
||||||
System.out.println("Exception feed id not found");
|
// System.out.println("Exception feed id not found");
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
System.out.println("GetAllCOmmentsByFeed ");
|
// System.out.println("GetAllCOmmentsByFeed ");
|
||||||
for (Comment cm : store.getAllCommentByFeed(feed.getKey().toString())) {
|
// for (Comment cm : store.getAllCommentByFeed(feed.getKey().toString())) {
|
||||||
System.out.println(cm.getText());
|
// System.out.println(cm.getText());
|
||||||
};
|
// };
|
||||||
|
//
|
||||||
try {
|
// try {
|
||||||
assertTrue(store.deleteComment(toDelete.getKey(), toDelete.getFeedid()));
|
// assertTrue(store.deleteComment(toDelete.getKey(), toDelete.getFeedid()));
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
System.out.println("Exception feed id not found");
|
// System.out.println("Exception feed id not found");
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Test
|
// @Test
|
||||||
public void testLikes() {
|
// public void testLikes() {
|
||||||
int count = 10;
|
// int count = 10;
|
||||||
Feed feed = new Feed(UUID.randomUUID().toString(), FeedType.SHARE, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
// Feed feed = new Feed(UUID.randomUUID().toString(), FeedType.SHARE, "massimiliano.assante", new Date(), "/gcube/devsec/devVRE",
|
||||||
"http://www.d4science.org/monitor", "thumbUri", "This feed is Liked ", PrivacyLevel.PUBLIC,
|
// "http://www.d4science.org/monitor", "thumbUri", "This feed is Liked ", PrivacyLevel.PUBLIC,
|
||||||
"Massimiliano Assante", "massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host", false);
|
// "Massimiliano Assante", "massimiliano.assante@isti.cnr.it", "thumburl", "linkTitle", "linkDesc", "host", false);
|
||||||
assertTrue(store.saveUserFeed(feed));
|
// assertTrue(store.saveUserFeed(feed));
|
||||||
Like toUnlike = new Like(UUID.randomUUID().toString(),"massimiliano.assante",
|
// Like toUnlike = new Like(UUID.randomUUID().toString(),"massimiliano.assante",
|
||||||
new Date(), feed.getKey().toString(), "Massi Pallino", "thumbUrl");
|
// new Date(), feed.getKey().toString(), "Massi Pallino", "thumbUrl");
|
||||||
|
//
|
||||||
try {
|
// try {
|
||||||
assertTrue(store.like(toUnlike));
|
// assertTrue(store.like(toUnlike));
|
||||||
for (int i = 0; i < count; i++)
|
// for (int i = 0; i < count; i++)
|
||||||
assertTrue(store.like(new Like(UUID.randomUUID().toString(),"massimiliano.assante",
|
// assertTrue(store.like(new Like(UUID.randomUUID().toString(),"massimiliano.assante",
|
||||||
new Date(), feed.getKey().toString(), "Rino Pallino", "thumbUrl")));
|
// new Date(), feed.getKey().toString(), "Rino Pallino", "thumbUrl")));
|
||||||
|
//
|
||||||
System.out.println("massimiliano.assante liked the following feeds: ");
|
// System.out.println("massimiliano.assante liked the following feeds: ");
|
||||||
for (String feedid : store.getAllLikedFeedIdsByUser("massimiliano.assante")) {
|
// for (String feedid : store.getAllLikedFeedIdsByUser("massimiliano.assante")) {
|
||||||
System.out.println(feedid);
|
// System.out.println(feedid);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
for (Like like : store.getAllLikesByFeed(feed.getKey().toString())) {
|
// for (Like like : store.getAllLikesByFeed(feed.getKey().toString())) {
|
||||||
System.out.println(like);
|
// System.out.println(like);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
System.out.println("trying unlike");
|
// System.out.println("trying unlike");
|
||||||
assertTrue(store.unlike(toUnlike.getKey(), toUnlike.getFeedid()));
|
// assertTrue(store.unlike(toUnlike.getKey(), toUnlike.getFeedid()));
|
||||||
|
//
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
System.out.println("Exception feed id not found");
|
// System.out.println("Exception feed id not found");
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,10 @@ public enum NotificationType {
|
||||||
* use to notify a user he got a message
|
* use to notify a user he got a message
|
||||||
*/
|
*/
|
||||||
MESSAGE,
|
MESSAGE,
|
||||||
|
/**
|
||||||
|
* use to notify every user of a VRE/Group that the post was made
|
||||||
|
*/
|
||||||
|
POST_ALERT,
|
||||||
/**
|
/**
|
||||||
* use to notify a user that someone in his VRE created a new Event in the Calendar
|
* use to notify a user that someone in his VRE created a new Event in the Calendar
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue