From 681edaed35cdd6e905a07e63c1cf5c086b554dc3 Mon Sep 17 00:00:00 2001
From: sknirmalkar89 <59080585+sknirmalkar89@users.noreply.github.com>
Date: Thu, 10 Feb 2022 20:12:03 +0530
Subject: [PATCH] SB-28404: User consent api soft delete when user migrated and
return both active and revoke consents (#1050)
* SB-28404:[SSO > Global consent]issue:update consumer_id,object_id with root org id
* SB-28404:[SSO > Global consent]issue:Throw consent not found exception list is empty
* SB-28404:[SSO > Global consent] add new status as deleted when migration done
* SB-28404:[SSO > Global consent]issue:fix code refactor
---
.../src/main/java/org/sunbird/keys/JsonKey.java | 2 ++
.../java/org/sunbird/actor/user/TenantMigrationActor.java | 2 +-
.../java/org/sunbird/actor/userconsent/UserConsentActor.java | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java b/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
index d96ca99e7..3066ae6db 100644
--- a/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
+++ b/core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java
@@ -541,6 +541,8 @@ public final class JsonKey {
public static final String CONSENT_OBJECTTYPE = "objectType";
public static final String CONSENT_OBJECTTYPE_ORG = "Organisation";
public static final String CONSENT_STATUS_REVOKED = "REVOKED";
+ public static final String CONSENT_STATUS_DELETED = "DELETED";
+
// user consent req-response attributes listing - ended
// user consent table columns listing - started
public static final String CONSENT_CONSUMER_ID = "consumer_id";
diff --git a/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java b/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java
index 0c2b3393e..9560eca4b 100644
--- a/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java
+++ b/service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java
@@ -185,7 +185,7 @@ public class TenantMigrationActor extends BaseActor {
consentReqMap.put(JsonKey.CONSENT_CONSUMERID, request.getRequest().get(JsonKey.ROOT_ORG_ID));
consentReqMap.put(JsonKey.CONSENT_OBJECTID, request.getRequest().get(JsonKey.ROOT_ORG_ID));
consentReqMap.put(JsonKey.CONSENT_OBJECTTYPE, JsonKey.CONSENT_OBJECTTYPE_ORG);
- consentReqMap.put(JsonKey.STATUS, JsonKey.CONSENT_STATUS_REVOKED);
+ consentReqMap.put(JsonKey.STATUS, JsonKey.CONSENT_STATUS_DELETED);
Response consentRes =
userConsentService.updateConsent(consentReqMap, request.getRequestContext());
diff --git a/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java b/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
index 529895024..0d5a089f6 100644
--- a/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
+++ b/service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java
@@ -126,8 +126,8 @@ public class UserConsentActor extends BaseActor {
.stream()
.filter(
consents ->
- ((String) consents.get(JsonKey.STATUS)).equalsIgnoreCase(JsonKey.ACTIVE))
- .map(
+ !((String) consents.get(JsonKey.STATUS)).equalsIgnoreCase(JsonKey.CONSENT_STATUS_DELETED)
+ ).map(
consent -> {
Map<String, Object> consentRes = new HashMap<String, Object>();
consentRes.put(JsonKey.ID, consent.get(JsonKey.ID));
--
GitLab