Moderated course check for the verified Karamyogi (#416)

* Moderated course check for the verified Karamyogi * Moderated course check for the verified Karamyogi application.properties change * Moderated course check for the verified Karamyogi application code review changes
sunbird-cb · Jan 9, 2024 · a9f2659 · a9f2659
1 parent c8702b1
commit a9f2659
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/org/sunbird/cbp/service/CbPlanServiceImpl.java b/src/main/java/org/sunbird/cbp/service/CbPlanServiceImpl.java
@@ -447,12 +447,14 @@ public SBApiResponse getCBPlanListForUser(String userOrgId, String authTokenOrUs
             String userDesignation = "";
             Map<String, Object> profileDetailsMap = null;
             List<Map<String, Object>> professionalDetails = null;
+            Boolean isVerifiedKaramyogi = false;
             if (StringUtils.isNotEmpty(profileDetails)) {
                 profileDetailsMap = mapper.readValue(profileDetails, new TypeReference<HashMap<String, Object>>() {
                 });
             }
             if (MapUtils.isNotEmpty(profileDetailsMap)) {
                 professionalDetails = (List<Map<String, Object>>) profileDetailsMap.get(Constants.PROFESSIONAL_DETAILS);
+                isVerifiedKaramyogi = (Boolean) profileDetailsMap.get(Constants.VERIFIED_KARMAYOGI);
             }
             if (CollectionUtils.isNotEmpty(professionalDetails)) {
                 userDesignation = (String) professionalDetails.get(0).get(Constants.DESIGNATION);
@@ -490,7 +492,22 @@ public SBApiResponse getCBPlanListForUser(String userOrgId, String authTokenOrUs
                         contentDetails = contentService.readContentFromCache(courseId, null);
                         if (MapUtils.isNotEmpty(contentDetails)) {
                             if (Constants.LIVE.equalsIgnoreCase((String) contentDetails.get(Constants.STATUS))) {
-                                courseDetailsMap.put(courseId, contentDetails);
+                                if (courseId.contains("_rc")) {
+                                    if (isVerifiedKaramyogi != null && isVerifiedKaramyogi) {
+                                        Map<String, Object> secureSettings = (Map<String, Object>) contentDetails.get(Constants.SECURE_SETTINGS);
+                                        if (MapUtils.isNotEmpty(secureSettings)) {
+                                            List<String> secureOrganisationList = (List<String>) secureSettings.get(Constants.ORGANISATION);
+                                            if (CollectionUtils.isNotEmpty(secureOrganisationList) && secureOrganisationList.contains(userOrgId)) {
+                                                courseDetailsMap.put(courseId, contentDetails);
+                                            }
+                                        }
+                                    }
+                                    if (!courseDetailsMap.containsKey(courseId)) {
+                                        contentDetails.clear();
+                                    }
+                                } else {
+                                    courseDetailsMap.put(courseId, contentDetails);
+                                }
                             }
                         } else {
                             logger.error("Failed to read course details for Id: " + courseId);

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -351,7 +351,7 @@ batch.enrolment.return.size=250
 limit_for_search=250
 cbplan.manual.end.date=31/3/2024
 hierarchy.store.keyspace.name=dev_hierarchy_store
-default.content.properties=name,identifier,competencies_v5,avgRating,primaryCategory,contentType,channel,organisation,createdFor,duration,creatorLogo,appIcon,posterImage,additionalTags,description,status
+default.content.properties=name,identifier,competencies_v5,avgRating,primaryCategory,contentType,channel,organisation,createdFor,duration,creatorLogo,appIcon,posterImage,additionalTags,description,status,secureSettings
 cb-plan.update.publish.authorized.roles=MDO_LEADER
 
 karma.points.limit = 10