Merge pull request #341 from PradyumnaNagendra/release-3.8.0

Issue #SB-23777 fix: Update course batch issue fix

course-mw/course-actors-common/src/main/java/org/sunbird/learner/actors/search/SearchHandlerActor.java

@@ -118,14 +118,16 @@ public class SearchHandlerActor extends BaseActor {
       List<String> creatorIds = content.stream().filter(map -> map.containsKey(CREATED_BY)).map(map -> (String) map.get(CREATED_BY)).collect(Collectors.toList());
       List<Map<String, Object>> userDetails = userOrgService.getUsersByIds(creatorIds, (String) context.getOrDefault(JsonKey.X_AUTH_TOKEN, ""));
       logger.info(requestContext, "SearchHandlerActor::populateCreatorDetails::userDetails : " + userDetails);
-      List<Map<String, Object>> creatorDetails = userDetails.stream().map(user -> new HashMap<String, Object>() {{
-        put(JsonKey.ID, user.get(JsonKey.ID));
-        put(JsonKey.FIRST_NAME, user.get(JsonKey.FIRST_NAME));
-        put(JsonKey.LAST_NAME, user.get(JsonKey.LAST_NAME));
-      }}).collect(Collectors.toList());
-      Map<String, Object> tempResult = CollectionUtils.isNotEmpty(creatorDetails) ? creatorDetails.stream().collect(Collectors.toMap(s -> (String) s.remove("id"), s -> s)) : new HashMap<>();
-      if (MapUtils.isNotEmpty(tempResult)) {
-        content.stream().filter(map -> tempResult.containsKey(map.get(CREATED_BY))).map(map -> map.put("creatorDetails", tempResult.get((String) map.get(CREATED_BY)))).collect(Collectors.toList());
+      if(CollectionUtils.isNotEmpty(userDetails)) {
+        List<Map<String, Object>> creatorDetails = userDetails.stream().map(user -> new HashMap<String, Object>() {{
+          put(JsonKey.ID, user.get(JsonKey.ID));
+          put(JsonKey.FIRST_NAME, user.get(JsonKey.FIRST_NAME));
+          put(JsonKey.LAST_NAME, user.get(JsonKey.LAST_NAME));
+        }}).collect(Collectors.toList());
+        Map<String, Object> tempResult = CollectionUtils.isNotEmpty(creatorDetails) ? creatorDetails.stream().collect(Collectors.toMap(s -> (String) s.remove("id"), s -> s)) : new HashMap<>();
+        if (MapUtils.isNotEmpty(tempResult)) {
+          content.stream().filter(map -> tempResult.containsKey(map.get(CREATED_BY))).map(map -> map.put("creatorDetails", tempResult.get((String) map.get(CREATED_BY)))).collect(Collectors.toList());
+        }
       }
     }
   }

course-mw/course-actors-common/src/main/java/org/sunbird/userorg/UserOrgServiceImpl.java

@@ -5,6 +5,7 @@ import com.mashape.unirest.http.HttpMethod;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.Unirest;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.sunbird.common.exception.ProjectCommonException;
 import org.sunbird.common.models.response.Response;
@@ -176,16 +177,16 @@ public class UserOrgServiceImpl implements UserOrgService {
     }
     String relativeUrl = getConfigValue(SUNBIRD_GET_SINGLE_USER_API) + FORWARD_SLASH + id;
     Response response = getUserOrgResponse(relativeUrl, HttpMethod.GET, requestMap, headers);
-    if (response != null) {
+    if (response != null && ResponseCode.OK == response.getResponseCode()) {
       return (Map<String, Object>) response.get(RESPONSE);
-    }
-    return null;
+    } else
+    return new HashMap<>();
   }
 
   @Override
   public List<Map<String, Object>> getUsersByIds(List<String> ids, String authToken) {
     List<CompletableFuture<Map<String, Object>>> futures = ids.stream().map(id -> getUserDetail(id, authToken)).collect(Collectors.toList());
-    return futures.stream().map(CompletableFuture::join).collect(Collectors.toList());
+    return futures.stream().map(CompletableFuture::join).filter(map -> MapUtils.isNotEmpty(map)).collect(Collectors.toList());
   }
 
   @Override

course-mw/course-actors/src/main/java/org/sunbird/learner/actors/coursebatch/CourseBatchManagementActor.java

@@ -356,34 +356,39 @@ public class CourseBatchManagementActor extends BaseActor {
   private void validateMentors(CourseBatch courseBatch, String authToken, RequestContext requestContext) {
     List<String> mentors = courseBatch.getMentors();
     if (CollectionUtils.isNotEmpty(mentors)) {
+      mentors = mentors.stream().distinct().collect(Collectors.toList());
+      courseBatch.setMentors(mentors);
       String batchCreatorRootOrgId = getRootOrg(courseBatch.getCreatedBy(), authToken);
       List<Map<String, Object>> mentorDetailList = userOrgService.getUsersByIds(mentors, authToken);
       logger.info(requestContext, "CourseBatchManagementActor::validateMentors::mentorDetailList : " + mentorDetailList);
-      Map<String, Map<String, Object>> mentorDetails =
-          mentorDetailList
-              .stream()
-              .collect(Collectors.toMap(map -> (String) map.get(JsonKey.ID), map -> map));
-      for (String userId : mentors) {
-        Map<String, Object> result = mentorDetails.get(userId);
-        String mentorRootOrgId = getRootOrgFromUserMap(result);
-        if (!batchCreatorRootOrgId.equals(mentorRootOrgId)) {
-          throw new ProjectCommonException(
-              ResponseCode.userNotAssociatedToRootOrg.getErrorCode(),
-              ResponseCode.userNotAssociatedToRootOrg.getErrorMessage(),
-              ResponseCode.CLIENT_ERROR.getResponseCode(),
-              userId);
-        }
-        if ((ProjectUtil.isNull(result))
-            || (ProjectUtil.isNotNull(result) && result.isEmpty())
-            || (ProjectUtil.isNotNull(result)
-                && result.containsKey(JsonKey.IS_DELETED)
-                && ProjectUtil.isNotNull(result.get(JsonKey.IS_DELETED))
-                && (Boolean) result.get(JsonKey.IS_DELETED))) {
-          throw new ProjectCommonException(
-              ResponseCode.invalidUserId.getErrorCode(),
-              ResponseCode.invalidUserId.getErrorMessage(),
-              ResponseCode.CLIENT_ERROR.getResponseCode());
+      if(CollectionUtils.isNotEmpty(mentorDetailList)){
+        Map<String, Map<String, Object>> mentorDetails =
+                mentorDetailList.stream().collect(Collectors.toMap(map -> (String) map.get(JsonKey.ID), map -> map));
+        
+        for(String mentorId: mentors) {
+          Map<String, Object> result = mentorDetails.getOrDefault(mentorId, new HashMap<>());
+          if(MapUtils.isEmpty(result) || (result.containsKey(JsonKey.IS_DELETED) && (Boolean) result.get(JsonKey.IS_DELETED))) {
+            throw new ProjectCommonException(
+                    ResponseCode.invalidUserId.getErrorCode(),
+                    ResponseCode.invalidUserId.getErrorMessage(),
+                    ResponseCode.CLIENT_ERROR.getResponseCode());
+          } else {
+            String mentorRootOrgId = getRootOrgFromUserMap(result);
+            if (!batchCreatorRootOrgId.equals(mentorRootOrgId)) {
+              throw new ProjectCommonException(
+                      ResponseCode.userNotAssociatedToRootOrg.getErrorCode(),
+                      ResponseCode.userNotAssociatedToRootOrg.getErrorMessage(),
+                      ResponseCode.CLIENT_ERROR.getResponseCode(),
+                      mentorId);
+            }
+          }
         }
+      } else {
+        logger.info( requestContext,"Invalid mentors for batchId: " + courseBatch.getBatchId() +", mentors: " + mentors);
+        throw new ProjectCommonException(
+                ResponseCode.invalidUserId.getErrorCode(),
+                ResponseCode.invalidUserId.getErrorMessage(),
+                ResponseCode.CLIENT_ERROR.getResponseCode());
       }
     }
   }