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 d96ca99e73ff3a46294d23c85b8b6a93e73c1ede..3066ae6db2c83d98ab24a567f244d171b8dcff90 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 0c2b3393e68b4108a127688d69a95a1e70d8a4e1..9560eca4bbbf38f7d2551991811c61e334198c97 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 529895024bdb92c49d754133dd21ee30d3de44ce..0d5a089f6c3068a6e121a96e2454f24d8b2f7fb5 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));