Extract skillProviderId instead of skill.id

Author: rakibansary

src/common/es-helper.js

@@ -1436,15 +1436,14 @@ async function searchUsers (authUser, filter, params) {
  * Search for skills matching the given keyword and are part of the given organization
  * @param {Object} param0 the organizationId and keyword
  */
-
 async function searchSkillsInOrganization ({ organizationId, keyword }) {
   const esQueryToGetSkillProviders = buildEsQueryToGetSkillProviderIds(organizationId)
   logger.debug(`ES query to get skill provider ids: ${JSON.stringify(esQueryToGetSkillProviders, null, 2)}`)
 
   const esResultOfQueryToGetSkillProviders = await esClient.search(esQueryToGetSkillProviders)
   logger.debug(`ES result: ${JSON.stringify(esResultOfQueryToGetSkillProviders, null, 2)}`)
 
-  const skillProviderIds = _.flatten(esResultOfQueryToGetSkillProviders.hits.hits.map(hit => hit._source.skillProviders == null ? [] : hit._source.skillProviders.map(sp => sp.id)))
+  const skillProviderIds = _.flatten(esResultOfQueryToGetSkillProviders.hits.hits.map(hit => hit._source.skillProviders == null ? [] : hit._source.skillProviders.map(sp => sp.skillProviderId)))
   logger.debug(`Organization ${organizationId} yielded skillProviderIds: ${JSON.stringify(skillProviderIds, null, 2)}`)
 
   const skills = await searchSkills(keyword, skillProviderIds)

src/modules/search/route.js

@@ -16,7 +16,7 @@ module.exports = {
   },
   '/search/skills': {
     get: {
-      method: Controller.searchSkills
+      method: Controller.searchSkills,
       auth: 'jwt',
       access: consts.AdminUser,
       scopes: ['create:userAttribute', 'all:userAttribute']