From 3f9c5d406f3f8700e7d6aa40cd36c2315171416c Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 5 May 2022 13:38:47 +0200 Subject: [PATCH] many notification added --- .../ws/methods/v2/Notifications.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java index 34afbd9..c3c9581 100644 --- a/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java +++ b/src/main/java/org/gcube/portal/social/networking/ws/methods/v2/Notifications.java @@ -46,9 +46,13 @@ import org.gcube.portal.social.networking.ws.utils.ErrorMessages; import org.gcube.social_networking.socialnetworking.model.beans.JobNotificationBean; import org.gcube.social_networking.socialnetworking.model.beans.workspace.WorkspaceEvent; import org.gcube.social_networking.socialnetworking.model.beans.workspace.AddedItemEvent; +import org.gcube.social_networking.socialnetworking.model.beans.workspace.DeletedItemEvent; +import org.gcube.social_networking.socialnetworking.model.beans.workspace.FolderAddedUserEvent; +import org.gcube.social_networking.socialnetworking.model.beans.workspace.FolderRemovedUserEvent; import org.gcube.social_networking.socialnetworking.model.beans.workspace.RenamedFolderEvent; import org.gcube.social_networking.socialnetworking.model.beans.workspace.SharedFolderEvent; import org.gcube.social_networking.socialnetworking.model.beans.workspace.UnsharedFolderEvent; +import org.gcube.social_networking.socialnetworking.model.beans.workspace.UpdatedItemEvent; import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.UserManager; import org.gcube.vomanagement.usermanagement.exception.GroupRetrievalFault; @@ -224,7 +228,7 @@ public class Notifications { logger.error("Context not a VRE"); status = Status.BAD_REQUEST; responseBean.setSuccess(false); - responseBean.setMessage("CNot a VRE Context, only VRE is supported"); + responseBean.setMessage("Not a VRE Context, only VREs are supported"); return Response.status(status).entity(responseBean).build(); } else { // it is a context and it is a valid VRE String[] userIdsToNotify = getUsernamesByContext(scope).toArray(new String[0]); //resolve the members @@ -275,6 +279,14 @@ public class Notifications { AddedItemEvent itemBean = (AddedItemEvent) event; return nm.notifyAddedItem(idToNotify, WorkspaceItemMapper.getFileItem(itemBean.getItem()), WorkspaceItemMapper.getSharedFolder(itemBean.getItem().getParent())); } + case ITEM_UPDATE: { + UpdatedItemEvent itemBean = (UpdatedItemEvent) event; + return nm.notifyUpdatedItem(idToNotify, WorkspaceItemMapper.getFileItem(itemBean.getItem()), WorkspaceItemMapper.getSharedFolder(itemBean.getItem().getParent())); + } + case ITEM_DELETE: { + DeletedItemEvent itemBean = (DeletedItemEvent) event; + return nm.notifyRemovedItem(idToNotify, itemBean.getItemName(), WorkspaceItemMapper.getSharedFolder(itemBean.getFolder())); + } case FOLDER_SHARE: { SharedFolderEvent itemBean = (SharedFolderEvent) event; return nm.notifyFolderSharing(idToNotify, WorkspaceItemMapper.getSharedFolder(itemBean.getFolder())); @@ -287,6 +299,14 @@ public class Notifications { RenamedFolderEvent itemBean = (RenamedFolderEvent) event; return nm.notifyFolderRenaming(idToNotify, itemBean.getPreviousName(), itemBean.getNewName(), itemBean.getRenamedFolderId()); } + case FOLDER_ADDEDUSER: { + FolderAddedUserEvent itemBean = (FolderAddedUserEvent) event; + return nm.notifyFolderAddedUsers(idToNotify, WorkspaceItemMapper.getSharedFolder(itemBean.getFolder()), itemBean.getNewAddedUserIds()); + } + case FOLDER_REMOVEDUSER: { + FolderRemovedUserEvent itemBean = (FolderRemovedUserEvent) event; + return nm.notifyFolderRemovedUser(idToNotify, WorkspaceItemMapper.getSharedFolder(itemBean.getFolder())); + } default: break; }