Skip to content
GitLab
Unverified Commit 77539b61 authored by AMIT KUMAR's avatar AMIT KUMAR Committed by GitHub
Browse files

Issue #SB-28183 feat:SSU user org association fix (#1024)

parent 816ff8f4
release-4.5.0 release-4.5.0_RC14 release-4.5.0_RC13 release-4.5.0_RC12 release-4.5.0_RC11
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 4 deletions
+2 -4
service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java
+ 1
− 2
View file @ 77539b61
...@@ -167,9 +167,8 @@ public class ManagedUserActor extends UserBaseActor { ...@@ -167,9 +167,8 @@ public class ManagedUserActor extends UserBaseActor {
private void saveUserOrgInfo(Map<String, Object> userMap, RequestContext context) { private void saveUserOrgInfo(Map<String, Object> userMap, RequestContext context) {
Map<String, Object> userOrgMap = new HashMap<>(); Map<String, Object> userOrgMap = new HashMap<>();
userOrgMap.put(JsonKey.ID, ProjectUtil.getUniqueIdFromTimestamp(1));
userOrgMap.put(JsonKey.HASHTAGID, userMap.get(JsonKey.ROOT_ORG_ID)); userOrgMap.put(JsonKey.HASHTAGID, userMap.get(JsonKey.ROOT_ORG_ID));
userOrgMap.put(JsonKey.USER_ID, userMap.get(JsonKey.USER_ID)); userOrgMap.put(JsonKey.ID, userMap.get(JsonKey.USER_ID));
userOrgMap.put(JsonKey.ORGANISATION_ID, userMap.get(JsonKey.ROOT_ORG_ID)); userOrgMap.put(JsonKey.ORGANISATION_ID, userMap.get(JsonKey.ROOT_ORG_ID));
userOrgMap.put(JsonKey.ORG_JOIN_DATE, ProjectUtil.getFormattedDate()); userOrgMap.put(JsonKey.ORG_JOIN_DATE, ProjectUtil.getFormattedDate());
userOrgMap.put(JsonKey.IS_DELETED, false); userOrgMap.put(JsonKey.IS_DELETED, false);
......
service/src/main/java/org/sunbird/actor/user/SSUUserCreateActor.java
+ 1
− 2
View file @ 77539b61
...@@ -154,9 +154,8 @@ public class SSUUserCreateActor extends UserBaseActor { ...@@ -154,9 +154,8 @@ public class SSUUserCreateActor extends UserBaseActor {
private void saveUserOrgInfo(Map<String, Object> userMap, RequestContext context) { private void saveUserOrgInfo(Map<String, Object> userMap, RequestContext context) {
Map<String, Object> userOrgMap = new HashMap<>(); Map<String, Object> userOrgMap = new HashMap<>();
userOrgMap.put(JsonKey.ID, ProjectUtil.getUniqueIdFromTimestamp(1));
userOrgMap.put(JsonKey.HASHTAGID, userMap.get(JsonKey.ROOT_ORG_ID)); userOrgMap.put(JsonKey.HASHTAGID, userMap.get(JsonKey.ROOT_ORG_ID));
userOrgMap.put(JsonKey.USER_ID, userMap.get(JsonKey.USER_ID)); userOrgMap.put(JsonKey.ID, userMap.get(JsonKey.USER_ID));
userOrgMap.put(JsonKey.ORGANISATION_ID, userMap.get(JsonKey.ROOT_ORG_ID)); userOrgMap.put(JsonKey.ORGANISATION_ID, userMap.get(JsonKey.ROOT_ORG_ID));
userOrgMap.put(JsonKey.ORG_JOIN_DATE, ProjectUtil.getFormattedDate()); userOrgMap.put(JsonKey.ORG_JOIN_DATE, ProjectUtil.getFormattedDate());
userOrgMap.put(JsonKey.IS_DELETED, false); userOrgMap.put(JsonKey.IS_DELETED, false);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment