createdByName Issue fixed (#102)

* Issue with update and publish solved

* KB-11314 | BE Issues - Access Settings - Training Plan

* KB-11314 | BE Issues - Access Settings - Training Plan

* KB-10947| KB-10947 | Learner unable to view Training Plan contents' created for Central Deputation conditions under My iGOT and also in Contents' TOC Page

* KB-10947| KB-10947 | Learner unable to view Training Plan contents' created for Central Deputation conditions under My iGOT and also in Contents' TOC Page

* updated according to review

* Added logs to print the counts of plan

* createdByIssue fixed

* Updated according to review

Author: ruksana2808

src/main/java/com/igot/cb/service/CbPlanServiceImpl.java

@@ -15,9 +15,11 @@
 import java.util.Map;
 import java.util.Set;
 
+import com.igot.cb.user.UserUtilityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
@@ -68,6 +70,7 @@ public class CbPlanServiceImpl {
 
     private final RequestValidator requestValidator;
 
+
     public CbPlanServiceImpl(AccessTokenValidator accessTokenValidator, CassandraOperation cassandraOperation,
             CbExtServerProperties serverProperties, UserAndOrgServiceImpl userAndOrgService,
             ContentInfoServiceImpl contentService, EsUtilService esUtilService, RequestValidator requestValidator) {
@@ -631,12 +634,24 @@ public ApiResponse searchCbPlan(SearchCriteria searchCriteria, String userOrgId,
                         // Create a copy of item so we don’t mutate original
                         Map<String, Object> enrichedItem = new HashMap<>(item);
                         String createdBy = (String) enrichedItem.get(Constants.CREATED_BY);
-                        if (StringUtils.isNotBlank(createdBy)) {
-                            String createdByUserName = "";
 
-                            enrichedItem.put(Constants.CREATED_BY_NAME, createdByUserName);
+                        if (item.containsKey(Constants.CREATED_BY) && item.get(Constants.CREATED_BY) != null) {
+                            Object createdByObj = item.get(Constants.CREATED_BY);
+                            Map<String, Object> userInfoMap = new HashMap<>();
+                            if (createdByObj instanceof String && !((String) createdByObj).trim().isEmpty()) {
+                                // fetch user details from DB
+                                userInfoMap = userAndOrgService.readUserProfile(
+                                        (String) item.get(Constants.CREATED_BY),
+                                        Arrays.asList(Constants.FIRSTNAME, Constants.USER_ID)
+                                );
+                                if (userInfoMap != null) {
+
+                                    enrichedItem.put(Constants.CREATED_BY_NAME,
+                                            userInfoMap.get(Constants.FIRSTNAME));
+                                    enrichedItem.put(Constants.CREATED_BY, item.get(Constants.CREATED_BY));
+                                }
+                            }
                         }
-                        enrichedItem.put(Constants.CREATED_BY, createdBy);
 
                         if (item.containsKey(Constants.CONTENT_LIST) && item.get(Constants.CONTENT_LIST) != null) {
                             Object contentListObj = item.get(Constants.CONTENT_LIST);
@@ -667,6 +682,7 @@ public ApiResponse searchCbPlan(SearchCriteria searchCriteria, String userOrgId,
         return response;
     }
 
+
     private void createSuccessResponse(ApiResponse response) {
         response.setParams(new ApiRespParam());
         response.getParams().setStatus(Constants.SUCCESS);