Merge branch 'master' of https://github.com/project-sunbird/sunbird-l…

…ms-mw

Issue #1 feat:merge

actors/src/main/java/org/sunbird/learner/actors/UserManagementActor.java

@@ -3,13 +3,13 @@
 import static org.sunbird.learner.util.Util.isNotNull;
 import static org.sunbird.learner.util.Util.isNull;
 
-import akka.actor.UntypedAbstractActor;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.velocity.VelocityContext;
 import org.sunbird.cassandra.CassandraOperation;
 import org.sunbird.common.Constants;
@@ -41,6 +41,8 @@
 import org.sunbird.services.sso.SSOManager;
 import org.sunbird.services.sso.SSOServiceFactory;
 
+import akka.actor.UntypedAbstractActor;
+
 /**
  * This actor will handle course enrollment operation .
  *
@@ -188,7 +190,6 @@ private void profileVisibility(Request actorMessage) {
         if (esPrivateResult.containsKey(field)) {
           esResult.put(field,esPrivateResult.get(field) ); 
           esPrivateResult.remove(field);
-          privateList.remove(field);
         } else {
           ProjectLogger.log("field value not found inside private index =="+field);
         }
@@ -200,6 +201,14 @@ private void profileVisibility(Request actorMessage) {
         privateFieldMap.put(key, JsonKey.PRIVATE);
       }
     }
+    if (publicList != null && privateFieldMap.isEmpty()) {
+      privateFieldMap = (Map<String, String>) esResult.get(JsonKey.PROFILE_VISIBILITY);
+      for (String key : publicList) {
+        privateFieldMap.remove(key);
+      }
+      updateCassandraWithPrivateFiled(userId, privateFieldMap);
+      esResult.put(JsonKey.PROFILE_VISIBILITY, privateFieldMap);
+    }
     if (privateFieldMap.size()>0) {
       updateCassandraWithPrivateFiled(userId, privateFieldMap);
       esResult.put(JsonKey.PROFILE_VISIBILITY, privateFieldMap);