Merge remote-tracking branch 'origin/develop' into develop

Author: James Cori

src/common/helper.js

@@ -87,24 +87,24 @@ function getPageLink (req, page) {
  */
 function setResHeaders (req, res, result) {
   const totalPages = Math.ceil(result.total / result.perPage)
-  if (result.page > 1) {
-    res.set('X-Prev-Page', result.page - 1)
+  if (parseInt(result.page, 10) > 1) {
+    res.set('X-Prev-Page', parseInt(result.page, 10) - 1)
   }
-  if (result.page < totalPages) {
-    res.set('X-Next-Page', result.page + 1)
+  if (parseInt(result.page, 10) < totalPages) {
+    res.set('X-Next-Page', parseInt(result.page, 10) + 1)
   }
-  res.set('X-Page', result.page)
+  res.set('X-Page', parseInt(result.page, 10))
   res.set('X-Per-Page', result.perPage)
   res.set('X-Total', result.total)
   res.set('X-Total-Pages', totalPages)
   // set Link header
   if (totalPages > 0) {
     let link = `<${getPageLink(req, 1)}>; rel="first", <${getPageLink(req, totalPages)}>; rel="last"`
-    if (result.page > 1) {
-      link += `, <${getPageLink(req, result.page - 1)}>; rel="prev"`
+    if (parseInt(result.page, 10) > 1) {
+      link += `, <${getPageLink(req, parseInt(result.page, 10) - 1)}>; rel="prev"`
     }
-    if (result.page < totalPages) {
-      link += `, <${getPageLink(req, result.page + 1)}>; rel="next"`
+    if (parseInt(result.page, 10) < totalPages) {
+      link += `, <${getPageLink(req, parseInt(result.page, 10) + 1)}>; rel="next"`
     }
     res.set('Link', link)
   }

src/services/ChallengeService.js

@@ -174,7 +174,14 @@ async function searchChallenges (currentUser, criteria) {
       // Parse and use metadata key
       if (!_.isUndefined(criteria[key])) {
         const metaKey = key.split('meta.')[1]
-        boolQuery.push({ match_phrase: { [`metadata.${metaKey}`]: criteria[key] } })
+        boolQuery.push({
+          bool: {
+            must: [
+              { match_phrase: { 'metadata.name': metaKey } },
+              { match_phrase: { 'metadata.value': _.toString(criteria[key]) } }
+            ]
+          }
+        })
       }
     }
   })