From 77539b614944543e44a1108973121cce5d6193fb Mon Sep 17 00:00:00 2001
From: AMIT KUMAR <amit.kumar@tarento.com>
Date: Thu, 30 Dec 2021 12:09:41 +0530
Subject: [PATCH] Issue #SB-28183 feat:SSU user org association fix (#1024)
---
.../src/main/java/org/sunbird/actor/user/ManagedUserActor.java | 3 +--
.../main/java/org/sunbird/actor/user/SSUUserCreateActor.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java b/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java
index aec5afab8..153589949 100644
--- a/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java
+++ b/service/src/main/java/org/sunbird/actor/user/ManagedUserActor.java
@@ -167,9 +167,8 @@ public class ManagedUserActor extends UserBaseActor {
private void saveUserOrgInfo(Map<String, Object> userMap, RequestContext context) {
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.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.ORG_JOIN_DATE, ProjectUtil.getFormattedDate());
userOrgMap.put(JsonKey.IS_DELETED, false);
diff --git a/service/src/main/java/org/sunbird/actor/user/SSUUserCreateActor.java b/service/src/main/java/org/sunbird/actor/user/SSUUserCreateActor.java
index 05724e88f..50ff3968d 100644
--- a/service/src/main/java/org/sunbird/actor/user/SSUUserCreateActor.java
+++ b/service/src/main/java/org/sunbird/actor/user/SSUUserCreateActor.java
@@ -154,9 +154,8 @@ public class SSUUserCreateActor extends UserBaseActor {
private void saveUserOrgInfo(Map<String, Object> userMap, RequestContext context) {
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.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.ORG_JOIN_DATE, ProjectUtil.getFormattedDate());
userOrgMap.put(JsonKey.IS_DELETED, false);
--
GitLab