-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue #SC-1193 read data from registry if es fails #45
base: release-2.2.0-prime
Are you sure you want to change the base?
Issue #SC-1193 read data from registry if es fails #45
Conversation
user-org-actor/src/main/java/org/sunbird/user/service/UserServiceImpl.java
Outdated
Show resolved
Hide resolved
@@ -5,6 +5,7 @@ | |||
*/ | |||
public interface UserJsonKey { | |||
|
|||
String OSID = "osid"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
move this constant under Jsonkey file as it will be used across the application not only user related file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This must not be hardcoded. Remember we have an env var uuidPropertyName.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it is configurable property. Now got this value from DbConnectionInfoMngr bean.
Response response = null; | ||
try { | ||
response = userESDao.getUserById((String) request.getRequest().get(JsonKey.USER_ID)); | ||
} catch (Exception e) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add logger in catch block to print sacktrace, to know what went wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
try { | ||
response = userESDao.getUserById((String) request.getRequest().get(JsonKey.USER_ID)); | ||
} catch (Exception e) { | ||
ProjectLogger.log("Exception occurred while reading user ES.", e); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Logger parretn need to be same for all places, we are following "className:methodName message,LoggerEum.Value.name"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
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(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use service factory , no need to create instance every places,
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Created factory for service object creation.
* @return response | ||
* @throws BaseException | ||
*/ | ||
public Response readUser(JsonNode userId) throws BaseException; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why requested userId is JsonNode , it should be String
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This method attribute name incorrect, here we constructed json node with valid input to read method, now attribute name changed
public Response readUser(JsonNode inputNode) throws BaseException { | ||
Response response = new Response(); | ||
try { | ||
JsonNode responseNode = registryHelper.readEntity(inputNode,""); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use overide method for readEntity with one and two argument .
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change should be at user-registry, i hope here it is not necessary.
response.putAll(objectMapper.convertValue(responseNode,Map.class)); | ||
return response; | ||
} catch (Exception e) { | ||
ProjectLogger.log("Exception occurred while reading user from open saber.", e); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use same logging format
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done.
+ "Exception in getting the record from ES : " | ||
+ e.getMessage(), | ||
LoggerEnum.ERROR.name()); | ||
ProjectLogger.log("Exception occurred while reading user ES.", e); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove ProjectLogger.log("Exception occurred while reading user ES.", e); because we already have logger above.
try { | ||
response = userESDao.getUserById((String) request.getRequest().get(JsonKey.USER_ID)); | ||
} catch (Exception e) { | ||
ProjectLogger.log("Exception occurred while reading user ES.", e); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
|
||
public static Object getService(String serviceName) { | ||
Object serviceObj = null; | ||
if(serviceName.equals(ServiceImplType.USER.getServiceType())) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DO reverse check to avoid NPE.
serviceName.equals(ServiceImplType.USER.getServiceType()) to ServiceImplType.USER.getServiceType().equals(serviceName)
When read-api fails to fetch data from elastic-search, request is routed to user-registry for the data.