Issue #SC-1193 read data from registry if es fails

user-org-actor/src/main/java/org/sunbird/user/UserReadActor.java

@@ -9,7 +9,8 @@
 import org.sunbird.response.Response;
 import org.sunbird.user.dao.IUserESDao;
 import org.sunbird.user.dao.UserDaoFactory;
-import org.sunbird.util.LoggerEnum;
+import org.sunbird.user.service.IUserService;
+import org.sunbird.user.service.UserServiceImpl;
 import org.sunbird.util.ProjectLogger;
 import org.sunbird.util.jsonkey.JsonKey;
 
@@ -28,6 +29,7 @@
 )
 public class UserReadActor extends BaseActor {
 
+    private IUserService userService = null;
     IUserESDao userESDao = (IUserESDao) UserDaoFactory.getDaoImpl(DaoImplType.ES.getType());
 
 
@@ -48,7 +50,14 @@ public void onReceive(Request request) throws Throwable {
      */
     public void readUserById(Request request) throws BaseException {
         startTrace("readUserById");
-        Response response = userESDao.getUserById((String) request.getRequest().get(JsonKey.USER_ID));
+        Response response = null;
+        try {
+            response = userESDao.getUserById((String) request.getRequest().get(JsonKey.USER_ID));
+        } catch (Exception e) {
+            ProjectLogger.log("Exception occurred while reading user ES.", e);
+            userService = new UserServiceImpl();
+            response = userService.readUser(request);
+        }
         endTrace("readUserById");
         sender().tell(response, self());
     }

user-org-actor/src/main/java/org/sunbird/user/dao/IUserOSDao.java

@@ -1,5 +1,6 @@
 package org.sunbird.user.dao;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.sunbird.exception.BaseException;
 import org.sunbird.exception.ProjectCommonException;
 import org.sunbird.exception.message.Localizer;
@@ -23,5 +24,13 @@ public interface IUserOSDao {
      */
     Response createUser(Map<String, Object> user) throws BaseException;
 
+    /**
+     * this method will read a user from open saber
+     * @param userId
+     * @return response
+     * @throws BaseException
+     */
+    public Response readUser(JsonNode userId) throws BaseException;
+
 
 }

user-org-actor/src/main/java/org/sunbird/user/dao/UserOSDaoImpl.java

@@ -1,7 +1,10 @@
 package org.sunbird.user.dao;
 
+import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.opensaber.registry.helper.RegistryHelper;
 import org.sunbird.Application;
 import org.sunbird.exception.BaseException;
@@ -61,4 +64,23 @@ public Response createUser(Map<String, Object> user) throws BaseException {
             throw new ProjectCommonException.ServerError(IResponseMessage.INTERNAL_ERROR, localizer.getMessage(IResponseMessage.INTERNAL_ERROR, null), ResponseCode.SERVER_ERROR.getCode());
         }
     }
+
+    /**
+     * this method is used to read user record from OS.
+     * @param inputNode
+     * @return response
+     * @throws BaseException
+     */
+    @Override
+    public Response readUser(JsonNode inputNode) throws BaseException {
+        Response response = new Response();
+        try {
+            JsonNode responseNode = registryHelper.readEntity(inputNode,"");
+            response.putAll(objectMapper.convertValue(responseNode,Map.class));
+            return response;
+        } catch (Exception e) {
+            ProjectLogger.log("Exception occurred while reading user from open saber.", e);
+            throw new ProjectCommonException.ServerError(IResponseMessage.INTERNAL_ERROR, localizer.getMessage(IResponseMessage.INTERNAL_ERROR, null), ResponseCode.SERVER_ERROR.getCode());
+        }
+    }
 }

user-org-actor/src/main/java/org/sunbird/user/service/IUserService.java

@@ -12,4 +12,11 @@ public interface IUserService {
      * @return Response
      */
     Response createUser(Request request) throws BaseException;
+
+    /**
+     * This method will read user.
+     * @param request
+     * @return Response
+     */
+    Response readUser(Request request) throws BaseException;
 }

user-org-actor/src/main/java/org/sunbird/user/service/UserServiceImpl.java

@@ -3,6 +3,9 @@
 import akka.actor.ActorRef;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.opensaber.registry.model.DBConnectionInfoMgr;
 import org.apache.commons.lang3.StringUtils;
 import org.sunbird.Application;
 import org.sunbird.DaoImplType;
@@ -48,4 +51,16 @@ private Response saveUserAttributes(Request request) {
         }
         return response;
     }
+
+    @Override
+    public Response readUser(Request request) throws BaseException {
+        ObjectNode idNode = JsonNodeFactory.instance.objectNode();
+        ObjectNode userNode =  JsonNodeFactory.instance.objectNode();
+        String recordId = (String) request.getRequest().get(JsonKey.USER_ID);
+        DBConnectionInfoMgr dBConnectionInfoMgr = Application.applicationContext.getBean(DBConnectionInfoMgr.class);
+        idNode.put(dBConnectionInfoMgr.getUuidPropertyName(), recordId);
+        userNode.set("User", idNode);
+        IUserOSDao userDao = (IUserOSDao) UserDaoFactory.getDaoImpl(DaoImplType.OS.getType());
+        return userDao.readUser(userNode);
+    }
 }