Search function changes

Created by: Radheshhathwar

src/routes/contentRoutes.js

@@ -18,11 +18,6 @@ module.exports = function (app) {
       requestMiddleware.createAndValidateRequestBody, filterMiddleware.addMetaFilters,
       contentService.searchContentAPI)
 
-  app.route(BASE_URL + '/searchWrapper')
-    .post(healthService.checkDependantServiceHealth(dependentServiceHealth),
-      requestMiddleware.createAndValidateRequestBody, filterMiddleware.addMetaFilters,
-      contentService.searchWrapperAPI)
-
   app.route(BASE_URL + '/create')
     .post(healthService.checkDependantServiceHealth(dependentServiceHealth),
       requestMiddleware.gzipCompression(),

src/service/contentService.js

@@ -23,6 +23,7 @@ var orgHelper = require('../helpers/orgHelper')
 var licenseHelper = require('../helpers/licenseHelper')
 
 var CacheManager = require('sb_cache_manager')
+require('console')
 var cacheManager = new CacheManager({})
 
 var contentMessage = messageUtils.CONTENT
@@ -54,249 +55,160 @@ function getContentTypeForContent () {
   return contentMessage.CONTENT_TYPE
 }
 
-function searchWrapperAPI(req, response) {
-  var data = req.body
-  var rspObj = req.rspObj || {}
-  console.log('Testing')
-  if (!data.request || !data.request.filters) {
-    handleMissingFilters(req, response, rspObj)
-  } else {
-    handleFrameworkAndCategories(req, response, data, rspObj);
-  }
+function searchAPI (req, response) {
+  return search(compositeMessage.CONTENT_TYPE, req, response)
 }
 
-function handleMissingFilters(req, response, rspObj) {
-  rspObj.errCode = contentMessage.SEARCH.MISSING_CODE
-  rspObj.errMsg = contentMessage.SEARCH.MISSING_MESSAGE
-  rspObj.responseCode = responseCode.CLIENT_ERROR
-
-  logger.error({
-    msg: 'Error due to required request || request.filters are missing',
-    err: {
-      errCode: rspObj.errCode,
-      errMsg: rspObj.errMsg,
-      responseCode: rspObj.responseCode
-    },
-    additionalInfo: { data }
-  }, req)
-
-  return response.status(400).send(respUtil.errorResponse(rspObj))
+function searchContentAPI (req, response) {
+  return search(getContentTypeForContent(), req, response, ['Content', 'QuestionSet'])
 }
 
-function searchContent(req, response, data, rspObj) {
-  search(getContentTypeForContent(), req, response, ['Content', 'QuestionSet']);
+function processFilters (filters) {
+  const seMediums = filters.se_mediums || []
+  const seBoards = filters.se_boards || []
+  if (filters && (seMediums || seBoards)) {
+    return true // Indicates that se_mediums or se_boards are present
+  }
+  return false // Indicates that se_mediums and se_boards are not present
 }
 
-function handleFrameworkError(req, response, rspObj, errorMessage) {
-  rspObj.errCode = contentMessage.FRAMEWORK_READ.FAILED_CODE
-  rspObj.errMsg = errorMessage
-  rspObj.responseCode = responseCode.SERVER_ERROR
-
-  logger.error({
-    msg: 'Framework read response does not contain expected categories',
-    err: {
-      errCode: rspObj.errCode,
-      errMsg: rspObj.errMsg,
-      responseCode: rspObj.responseCode
-    }
-  }, req)
+function processFrameworkResponse (frameworkResponse, board, medium, CBW) {
+  const { result } = frameworkResponse
 
-  return response.status(500).send(respUtil.errorResponse(rspObj))
-}
-
-function processFrameworkData(req, response, data, frameworkData, rspObj) {
-  if (frameworkData.framework.categories) {
-    const seBoards = (data.request.filters.se_boards && data.request.filters.se_boards.length > 0)
-      ? data.request.filters.se_boards[0] : '';
+  if (!result || !result.framework || !result.framework.categories) {
+    // Invalid or incomplete framework response
+    return null
+  }
 
-    const associations = extractAssociationsFromFramework(frameworkData);
+  const { categories } = result.framework
 
-    const filteredAssociations = filterAssociations(associations, data.request.filters);
+  if (board && medium) {
+    // Both board and medium are given
+    const boardCategory = categories.find(category => category.identifier === `${result.framework.identifier}_${board}`)
+    if (!boardCategory || !boardCategory.terms) {
+      // Board not found or incomplete data for board
+      return null
+    }
 
-    const mappedSubjects = extractMappedCategories(filteredAssociations, 'subject');
-    const mappedDifficultyLevels = extractMappedCategories(filteredAssociations, 'difficultyLevel');
+    const mediumTerm = boardCategory.terms.find(term => term.identifier === `${boardCategory.identifier}_${medium}`)
+    if (!mediumTerm || !mediumTerm.associations) {
+      // Medium not found or incomplete data for medium
+      return null
+    }
 
-    updateRequestData(data, mappedSubjects, mappedDifficultyLevels);
+    const subjects = mediumTerm.associations.map(association => association.name)
+    return { subjects }
+  } else if (board) {
+    // Only board is given
+    const boardCategory = categories.find(category => category.identifier === `${result.framework.identifier}_${board}`)
+    if (!boardCategory || !boardCategory.terms) {
+      // Board not found or incomplete data for board
+      return null
+    }
 
-    searchContent(req, response, data, rspObj);
+    const subjects = boardCategory.terms.map(term => term.name)
+    return { subjects }
   } else {
-    handleFrameworkError(req, response, rspObj, contentMessage.FRAMEWORK_READ.NO_CATEGORIES);
-  }
-}
-
-function extractMappedCategories(associations, categoryType) {
-  // Implement logic to extract mapped categories based on categoryType
-  return associations
-    .filter(association => association.category === categoryType)
-    .map(category => category.code);
-}
-
-function updateRequestData(data, mappedSubjects, mappedDifficultyLevels) {
-  // Implement logic to update request data with mapped categories
-  if (!data.request.filters) {
-    data.request.filters = {};
-  }
-
-  if (mappedSubjects.length > 0) {
-    data.request.filters.se_subject = mappedSubjects;
-  }
+    // No board or medium given, return all subjects
+    const subjects = categories.reduce((allSubjects, category) => {
+      if (category.terms) {
+        const categorySubjects = category.terms.map(term => term.name)
+        allSubjects.push(...categorySubjects)
+      }
+      return allSubjects
+    }, [])
 
-  if (mappedDifficultyLevels.length > 0) {
-    data.request.filters.se_difficultyLevel = mappedDifficultyLevels;
+    return { subjects }
   }
 }
 
-function searchAPI (req, response) {
-  return search(compositeMessage.CONTENT_TYPE, req, response)
-}
-
-function searchContentAPI (req, response) {
-  return search(getContentTypeForContent(), req, response, ['Content', 'QuestionSet'])
-}
+function search (defaultContentTypes, req, response, objectType) {
+  var data = req.body
+  var rspObj = req.rspObj
+  const filters = data.request.filters
+  const seMediums = filters.se_mediums || []
+  const seBoards = filters.se_boards || []
 
-function search(defaultContentTypes, req, response, objectType) {
-  var data = req.body;
-  var rspObj = req.rspObj;
-  console.log('data: ' + JSON.stringify(data));
   logger.debug({
     msg: 'contentService.search() called',
-    additionalInfo: { rspObj },
-  }, req);
+    additionalInfo: { rspObj }
+  }, req)
 
   if (!data.request || !data.request.filters) {
-    rspObj.errCode = contentMessage.SEARCH.MISSING_CODE;
-    rspObj.errMsg = contentMessage.SEARCH.MISSING_MESSAGE;
-    rspObj.responseCode = responseCode.CLIENT_ERROR;
+    rspObj.errCode = contentMessage.SEARCH.MISSING_CODE
+    rspObj.errMsg = contentMessage.SEARCH.MISSING_MESSAGE
+    rspObj.responseCode = responseCode.CLIENT_ERROR
 
     logger.error({
       msg: 'Error due to required request || request.filters are missing',
       err: {
         errCode: rspObj.errCode,
         errMsg: rspObj.errMsg,
-        responseCode: rspObj.responseCode,
+        responseCode: rspObj.responseCode
       },
-      additionalInfo: { data },
-    }, req);
+      additionalInfo: { data }
+    }, req)
 
-    return response.status(400).send(respUtil.errorResponse(rspObj));
+    return response.status(400).send(respUtil.errorResponse(rspObj))
   }
 
   if (!data.request.filters) {
-    data.request.filters.contentType = defaultContentTypes;
+    data.request.filters.contentType = defaultContentTypes
   }
 
   // if fields exist, they have to be sent as an array to lp
   if (req.query.fields) {
-    data.request.fields = req.query.fields.split(',');
+    data.request.fields = req.query.fields.split(',')
   }
-
-  async.waterfall([
-    function (CBW) {
-      if (shouldDoFrameworkRead(data.request.filters)) {
-        performFrameworkRead(req, response, rspObj, data, defaultContentTypes, objectType, CBW);
-      } else {
-        performCompositeSearch(req, response, rspObj, data, defaultContentTypes, objectType, CBW);
-      }
-    },
-    function (res, CBW) {
-      licenseHelper.includeLicenseDetails(req, res, CBW);
-    },
-    function (res) {
-      rspObj.result = res.result;
-      logger.debug({
-        msg: `Content searched successfully with ${lodash.get(rspObj.result, 'count')}`,
-        additionalInfo: {
-          contentCount: lodash.get(rspObj.result, 'count'),
-        }
-      }, req);
-
-      return response.status(200).send(respUtil.successResponse(rspObj));
-    }
-  ]);
-}
-
-function shouldDoFrameworkRead(filters) {
-    return (
-      filters.se_boards || filters.se_mediums || filters.se_gradeLevels
-    );
+  if (objectType) {
+    data.request.filters.objectType = objectType
   }
-// Helper function to perform framework read and prepare request data
-function performFrameworkRead(req, response, rspObj, data, defaultContentTypes, objectType) {
-  getFrameworkDetails(req, function (err, frameworkData) {
-    if (err || frameworkData.responseCode !== responseCode.SUCCESS) {
-      logger.error({
-        msg: `Framework API failed with framework - ${req.query.framework}`,
-        err,
-      }, req);
-      rspObj.result = frameworkData.result;
-      return response.status(200).send(respUtil.successResponse(rspObj));
-    } else {
-      prepareRequestDataAndSearch(
-        req,
-        response,
-        rspObj,
-        data,
-        defaultContentTypes,
-        objectType,
-        frameworkData
-      );
-    }
-  });
-}
 
-// Helper function to prepare request data and perform composite search
-function prepareRequestDataAndSearch(req, response, rspObj, data, defaultContentTypes, objectType, frameworkData) {
-  // Your existing logic to prepare request data using frameworkData
-  if (frameworkData.result.framework.categories) {
-    // Set a default value if se_boards is null
-    const seBoards = (data.request.filters.se_boards && data.request.filters.se_boards.length > 0) ? data.request.filters.se_boards[0] : '';
-
-    // Find the category in the framework data that matches se_boards
-    const boardCategory = frameworkData.result.framework.categories.find(category => category.name || category.name.toLowerCase() === seBoards.toLowerCase());
-
-    if (boardCategory) {
-      // Your existing logic to process boardCategory, collect associations, and filter associations
-
-      // Update your request data with these mappings before calling searchContent
-      data.request.filters.se_subject = mappedSubjects;
-      data.request.filters.se_difficultyLevel = mappedDifficultyLevels;
-
-      // Call searchContent with the updated data
-      return searchContent(
-        getContentTypeForContent(),
-        req,
-        response,
-        ['Content', 'QuestionSet']
-      );
-    } else {
-      // Handle the case where boardCategory is not found
-      handleFrameworkError(req, response, rspObj, contentMessage.FRAMEWORK_READ.CATEGORY_NOT_FOUND);
-    }
-  } else {
-    // Handle the case where frameworkData doesn't contain the expected categories
-    handleFrameworkError(req, response, rspObj, contentMessage.FRAMEWORK_READ.NO_CATEGORIES);
+  var ekStepReqData = {
+    request: data.request
   }
-}
-
-// Helper function to perform composite search
-function performCompositeSearch(req, response, rspObj, data, defaultContentTypes, objectType) {
-  // Your existing logic to perform composite search without framework processing
 
   async.waterfall([
     function (CBW) {
-      logger.debug({
-        msg: 'Request to content provider to search the content',
-        additionalInfo: {
-          body: ekStepReqData
+      const shouldProcessFilters = processFilters(filters)
+
+      if (shouldProcessFilters) {
+        if (req.query.framework && req.query.framework !== 'null') {
+          getFrameworkDetails(req, function (err, res) {
+            logger.info('req: ' + req)
+            if (err || !res || res.responseCode !== responseCode.SUCCESS) {
+              logger.error({ msg: `Framework API failed with framework - ${req.query.framework}`, err }, req)
+              rspObj.result = res ? res.result : null // Handle the case when res is null
+              return response.status(200).send(respUtil.successResponse(rspObj))
+            } else {
+              var language = req.query.lang ? req.query.lang : 'en'
+              if (lodash.get(res, 'result.facets') &&
+                lodash.get(data, 'result.framework.categories')) {
+                modifyFacetsData(res.result.facets, data.result.framework.categories, language)
+              }
+              orgHelper.includeOrgDetails(req, res, function (CBW) {
+                processFrameworkResponse(data.result.framework, seBoards, seMediums, CBW)
+              })
+            }
+          })
+        } else {
+          orgHelper.includeOrgDetails(req, ekStepReqData, function (CBW) {
+            processFrameworkResponse(data.result.framework, seBoards, seMediums, CBW)
+          })
         }
-      }, req);
+      } else {
+        CBW(null, ekStepReqData)
+      }
+    },
 
-      contentProvider.compositeSearch(data, req.headers, function (err, res) {
+    function (ekStepReqData, CBW) {
+      // At this point, ekStepReqData has been modified by processFrameworkResponse
+      // Pass ekStepReqData to contentProvider.compositeSearch
+      contentProvider.compositeSearch(ekStepReqData, req.headers, function (err, res) {
         if (err || res.responseCode !== responseCode.SUCCESS) {
-          rspObj.errCode = res && res.params ? res.params.err : contentMessage.SEARCH.FAILED_CODE;
-          rspObj.errMsg = res && res.params ? res.params.errmsg : contentMessage.SEARCH.FAILED_MESSAGE;
-          rspObj.responseCode = res && res.responseCode ? res.responseCode : responseCode.SERVER_ERROR;
-
+          rspObj.errCode = res && res.params ? res.params.err : contentMessage.SEARCH.FAILED_CODE
+          rspObj.errMsg = res && res.params ? res.params.errmsg : contentMessage.SEARCH.FAILED_MESSAGE
+          rspObj.responseCode = res && res.responseCode ? res.responseCode : responseCode.SERVER_ERROR
           logger.error({
             msg: 'Getting error from content provider composite search',
             err: {
@@ -305,55 +217,49 @@ function performCompositeSearch(req, response, rspObj, data, defaultContentTypes
               errMsg: rspObj.errMsg,
               responseCode: rspObj.responseCode
             },
-            additionalInfo: { ekStepReqData: data }
-          }, req);
-
-          var httpStatus = res && res.statusCode >= 100 && res.statusCode < 600 ? res.statusCode : 500;
-          rspObj.result = res && res.result ? res.result : {};
-          rspObj = utilsService.getErrorResponse(rspObj, res);
-
-          return response.status(httpStatus).send(respUtil.errorResponse(rspObj));
+            additionalInfo: { ekStepReqData }
+          }, req)
+          var httpStatus = res && res.statusCode >= 100 && res.statusCode < 600 ? res.statusCode : 500
+          rspObj.result = res && res.result ? res.result : {}
+          rspObj = utilsService.getErrorResponse(rspObj, res)
+          return response.status(httpStatus).send(respUtil.errorResponse(rspObj))
         } else {
           if (req.query.framework && req.query.framework !== 'null') {
             getFrameworkDetails(req, function (err, data) {
               if (err || res.responseCode !== responseCode.SUCCESS) {
-                logger.error({ msg: `Framework API failed with framework - ${req.query.framework}`, err }, req);
-                rspObj.result = res.result;
-
-                return response.status(200).send(respUtil.successResponse(rspObj));
+                logger.error({ msg: `Framework API failed with framework - ${req.query.framework}`, err }, req)
+                rspObj.result = res.result
+                return response.status(200).send(respUtil.successResponse(rspObj))
               } else {
-                var language = req.query.lang ? req.query.lang : 'en';
-
+                var language = req.query.lang ? req.query.lang : 'en'
                 if (lodash.get(res, 'result.facets') &&
                   lodash.get(data, 'result.framework.categories')) {
-                  modifyFacetsData(res.result.facets, data.result.framework.categories, language);
+                  modifyFacetsData(res.result.facets, data.result.framework.categories, language)
                 }
-
-                orgHelper.includeOrgDetails(req, res, CBW);
+                orgHelper.includeOrgDetails(req, res, CBW)
               }
-            });
+            })
           } else {
-            orgHelper.includeOrgDetails(req, res, CBW);
+            orgHelper.includeOrgDetails(req, res, CBW)
           }
         }
-      });
+      })
     },
     function (res, CBW) {
-      licenseHelper.includeLicenseDetails(req, res, CBW);
+      licenseHelper.includeLicenseDetails(req, res, CBW)
     },
     function (res) {
-      rspObj.result = res.result;
-
+      rspObj.result = res.result
       logger.debug({
         msg: `Content searched successfully with ${lodash.get(rspObj.result, 'count')}`,
         additionalInfo: {
           contentCount: lodash.get(rspObj.result, 'count')
         }
-      }, req);
+      }, req)
 
-      return response.status(200).send(respUtil.successResponse(rspObj));
+      return response.status(200).send(respUtil.successResponse(rspObj))
     }
-  ]);
+  ])
 }
 
 function getFrameworkDetails (req, CBW) {
@@ -1931,8 +1837,8 @@ function copyContentAPI (req, response) {
   data.contentId = req.params.contentId
   var rspObj = req.rspObj
   var query = {}
-  if (req.query) {
-    query = req.query
+  if (req.query){
+    query = req.query;
   }
 
   logger.debug({
@@ -2079,10 +1985,8 @@ function searchPluginsAPI (req, response, objectType) {
       rspObj.result = res.result
       logger.debug({
         msg: 'Content searched successfully',
-        additionalInfo: {
-          count: lodash.get(rspObj.result, 'count')
-        }
-      }, req)
+        additionalInfo: { count: lodash.get(rspObj.result, 'count')
+        }}, req)
       return response.status(200).send(respUtil.successResponse(rspObj))
     }
   ])
@@ -2091,7 +1995,7 @@ function searchPluginsAPI (req, response, objectType) {
 function validateContentLock (req, response) {
   var rspObj = req.rspObj
   var userId = req.get('x-authenticated-userid')
-  var isRootOrgAdmin = lodash.has(req.body.request, 'isRootOrgAdmin') ? req.body.request.isRootOrgAdmin : false
+  var isRootOrgAdmin = lodash.has(req.body.request, "isRootOrgAdmin") ? req.body.request.isRootOrgAdmin : false
   logger.debug({ msg: 'contentService.validateContentLock() called', additionalInfo: { rspObj } }, req)
   var qs = {
     mode: 'edit'
@@ -2136,7 +2040,6 @@ function validateContentLock (req, response) {
 }
 
 module.exports.searchAPI = searchAPI
-module.exports.searchWrapperAPI = searchWrapperAPI
 module.exports.searchContentAPI = searchContentAPI
 module.exports.createContentAPI = createContentAPI
 module.exports.updateContentAPI = updateContentAPI