Merge4.6fixes (#1051)

Merge release-4.6.0 fixes to master

core/platform-common/src/main/java/org/sunbird/keys/JsonKey.java

@@ -540,6 +540,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";

service/src/main/java/org/sunbird/actor/user/TenantMigrationActor.java

@@ -183,7 +183,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());
 

service/src/main/java/org/sunbird/actor/userconsent/UserConsentActor.java

@@ -128,8 +128,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));