Merge pull request #27 from ansaryfantastic/develop

Extract skillProviderId from organization.skills

Author: callmekatootie

docs/UBahn_API.postman_collection.json

@@ -143,13 +143,13 @@
 							}
 						],
 						"url": {
-							"raw": "{{HOST}}/search/userAchievements?organizationId=36ed815b-3da1-49f1-a043-aaed0a4e81ad&keyword=Topcoder",
+							"raw": "{{HOST}}/search/skills?organizationId=36ed815b-3da1-49f1-a043-aaed0a4e81ad&keyword=net",
 							"host": [
 								"{{HOST}}"
 							],
 							"path": [
 								"search",
-								"userAchievements"
+								"skills"
 							],
 							"query": [
 								{
@@ -158,7 +158,7 @@
 								},
 								{
 									"key": "keyword",
-									"value": "Topcoder"
+									"value": "net"
 								}
 							]
 						}

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)