Merge branch 'release-1.2.6'

Author: mbelmadani

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>ubc.pavlab</groupId>
     <artifactId>rdp</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/ubc/pavlab/rdp/services/UserServiceImpl.java

@@ -124,7 +124,28 @@ public User update( User user ) {
         // Pre-Post authorized annotations.
         String currentUsername = getCurrentEmail();
         if ( user.getEmail().equals( currentUsername ) ) {
+	    if (applicationSettings.getPrivacy() == null){
+		log.warn( currentUsername + " attempted to updated, but applicationSettings is null. ");
+	    } else {
+		Integer defaultPrivacyLevel = applicationSettings.getPrivacy().getDefaultLevel();
+		boolean defaultSharing = applicationSettings.getPrivacy().isDefaultSharing();
+		boolean defaultGenelist = applicationSettings.getPrivacy().isAllowHideGenelist();
+		
+		if (user.getProfile().getPrivacyLevel() == null){		
+		    log.warn("Received a null 'privacyLevel' value in profile.");
+		    user.getProfile().setPrivacyLevel(defaultPrivacyLevel);
+		}
+		if (user.getProfile().getShared() == null){	
+		    log.warn("Received a null 'shared' value in profile.");
+		    user.getProfile().setShared(defaultSharing);
+		}
+		if (user.getProfile().getHideGenelist() == null){
+		    log.warn("Received a null 'hideGeneList' value in profile.");
+		    user.getProfile().setHideGenelist(defaultGenelist);
+		}	
+	    }
             return userRepository.save( user );
+	    
         } else {
             log.warn( currentUsername + " attempted to update a user that is not their own: " + user.getEmail() );
         }