Merge remote-tracking branch 'origin/develop' into IM-518-Error-in-k.…

…hub-when-refreshing-a-page

klab.hub/src/main/java/org/integratedmodelling/klab/hub/tags/controllers/TagNotificationController.java

@@ -59,7 +59,7 @@ public class TagNotificationController {
             TagNotification tagNotification = tagNotificationService.createTagNotification(
                     ITagElementEnum.valueOf(tagRequest.getiTagElement()), tagRequest.getiTagElementId(),
                     HubNotificationMessage.Type.valueOf(tagRequest.getType()), Boolean.valueOf(tagRequest.getVisible()),
-                    tagRequest.getName(), tagRequest.getTitle(), tagRequest.getMessage());
+                    tagRequest.getName(), tagRequest.getTitle(), tagRequest.getMessage(), tagRequest.getNavigateTo());
 
             return ResponseEntity.status(HttpStatus.OK).body(tagNotification);
         } catch (Exception e) {

klab.hub/src/main/java/org/integratedmodelling/klab/hub/tags/dto/TagNotification.java

@@ -32,10 +32,28 @@ public class TagNotification {
     @DBRef
     private MongoTag tag;
 
+    /**
+     * Type  of notification
+     */
     @Enumerated(EnumType.STRING)
     private Type type;
 
+    /**
+     * Title of notification
+     */
     private String title;
+
+    /**
+     * Message of notification
+     */
+    private String message;
+
+    /**
+     * Indicates whether navigation is required and where to navigate to execute an action.
+     */
+    private String navigateTo;
+
+
     public String getTitle() {
         return title;
     }
@@ -44,7 +62,6 @@ public void setTitle(String title) {
         this.title = title;
     }
 
-    private String message;
 
     public void setTag(MongoTag tag) {
         this.tag = tag;
@@ -77,5 +94,7 @@ public void setType(Type type) {
     public void setMessage(String message) {
         this.message = message;
     }
+
+
 
 }

klab.hub/src/main/java/org/integratedmodelling/klab/hub/tags/payload/TagRequest.java

@@ -10,6 +10,7 @@ public class TagRequest {
     private String title;
     private String message;
     private String visible;
+    private String navigateTo;
 
     public String getId() {
         return id;
@@ -59,5 +60,11 @@ public String getVisible() {
     public void setVisible(String visible) {
         this.visible = visible;
     }
-
+    public String getNavigateTo() {
+        return navigateTo;
+    }
+    public void setNavigateTo(String navigateTo) {
+        this.navigateTo = navigateTo;
+    }
+
 }

klab.hub/src/main/java/org/integratedmodelling/klab/hub/tags/services/TagNotificationService.java

@@ -51,7 +51,7 @@ public class TagNotificationService {
      * @return
      */
     public TagNotification createTagNotification(ITagElementEnum iTagElementEnum, String id,
-            HubNotificationMessage.Type tagNotifactionType, Boolean visible, String tagName, String title, String message) {
+            HubNotificationMessage.Type tagNotifactionType, Boolean visible, String tagName, String title, String message, String navigateTo) {
 
         /* Create Mongo Tag */
         MongoTag tag = new MongoTag();
@@ -71,6 +71,8 @@ public TagNotification createTagNotification(ITagElementEnum iTagElementEnum, St
 
         tagNotification.setTitle(title);
         tagNotification.setMessage(message);
+
+        tagNotification.setNavigateTo(navigateTo);
 
         try {
             tagNotificationRepository.save(tagNotification);
@@ -99,18 +101,19 @@ private void setITagElementById(MongoTag tag, ITagElementEnum iTagElementEnum, S
     }
 
     public TagNotification createWarningUserTagNotification(User user, String tagName, Boolean visible, String title,
-            String message) {
+            String message, String navigateTo) {
         MongoTag tag = new MongoTag();
         tag.setTagElementId(user.getId().isEmpty() ? null : user.getId());
         tag.setITagElement(user);
         tag.setName(tagName);
-        tag.setVisible(visible);
+        tag.setVisible(visible);        
 
         tag = mongoTagRepository.save(tag);
         TagNotification tagNotification = new TagNotification();
 
         tagNotification.setTag(tag);
         tagNotification.setType(Type.WARNING);
+        tagNotification.setNavigateTo(navigateTo);
 
         try {
             tagNotificationRepository.save(tagNotification);

klab.hub/src/main/java/org/integratedmodelling/klab/hub/users/services/UserProfileService.java

@@ -31,13 +31,7 @@ public interface UserProfileService {
      * @throws MessagingException 
      */
     abstract ProfileResource createNewEmailRequest(String id, String requestNewEmail) throws MessagingException;
-    /**
-     * Update the email	 of user in mongo and ldap 
-     * @param id
-     * @param email
-     * @return
-     */
-    abstract ProfileResource updateUserEmail(String id, String email);
+
     abstract User getUser(String username);
 
 }

klab.hub/src/main/java/org/integratedmodelling/klab/hub/users/services/UserProfileServiceImpl.java

@@ -168,45 +168,6 @@ public ProfileResource createNewEmailRequest(String username, String email) thro
 
     }
 
-    @Override
-    public ProfileResource updateUserEmail(String username, String email) {
-        User user = getUser(username);
-        user.setEmail(email);
-
-        /* update mongo repository */
-        User updatedUser;
-
-        try {
-            updatedUser = new UpdateUser(user, userRepository).execute();
-        } catch (DuplicateKeyException e) {
-            logger.error(e.getMessage());
-            throw new KlabException("Duplicated key, email is already in use.");
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-            throw new KlabException("Error updating mongo user: " + e.getMessage(), e);
-        }
-
-        /* update ldap */
-//        try {
-//            ldapServiceImpl.updateUserEmailAddress(username, email);
-//        } catch (Exception e) {
-//            logger.error(e.getMessage(), e);
-//            throw new KlabException("Error updating ldap user: " + e.getMessage(), e);
-//        }
-
-        try {
-            tagNotificationService.createWarningUserTagNotification(updatedUser,
-                    TagNameEnum.downloadCertificateChangeEmail.toString(), false, "", "");
-
-        } catch (Exception e) {
-            logger.error(e.getMessage());
-            throw new KlabException(e.getMessage(), e);
-        }
-
-        ProfileResource updatedProfile = objectMapper.convertValue(updatedUser, ProfileResource.class);
-        return updatedProfile.getSafeProfile();
-    }
-
     private User updateUserFromProfileResource(ProfileResource profile) {
         User user;
         try {