Merge pull request #13 from fratzinger/master

fix: working with numbers & strings as id

Author: marshallswain

lib/shallow-populate.js

@@ -77,12 +77,12 @@ module.exports = function (options) {
         if (keyHere) {
           if (Array.isArray(keyHere)) {
             if (!requiredKeyMappings[key].asArray) {
-              mapData(byKeyHere, key, keyHere[0], current)
+              mapDataWithId(byKeyHere, key, keyHere[0], current)
             } else {
-              keyHere.forEach(hereKey => mapData(byKeyHere, key, hereKey, current))
+              keyHere.forEach(hereKey => mapDataWithId(byKeyHere, key, hereKey, current))
             }
           } else {
-            mapData(byKeyHere, key, keyHere, current)
+            mapDataWithId(byKeyHere, key, keyHere, current)
           }
         }
       })
@@ -104,7 +104,9 @@ module.exports = function (options) {
     // }
 
     const paramSets = includes.map(i => {
-      const keysHere = Object.keys(dataMap[i.keyHere]) || []
+      const keyVals = dataMap[i.keyHere]
+      let keysHere = Object.keys(keyVals) || []
+      keysHere = keysHere.map(k => keyVals[k].key)
 
       return { query: { [i.keyThere]: { $in: keysHere } } }
     })
@@ -143,7 +145,7 @@ function getRelatedItems (ids, relatedItems, include) {
   ids = [].concat(ids || [])
   return relatedItems.reduce((items, currentItem) => {
     ids.forEach(id => {
-      id = typeof id === 'number' ? id : id.toString()
+      // id = typeof id === 'number' ? id.toString() : id
       let currentId
       // Allow populating on nested array of objects like key[0].name, key[1].name
       // If keyThere includes a dot, we're looking for a nested prop. This checks if that nested prop is an array.
@@ -157,17 +159,18 @@ function getRelatedItems (ids, relatedItems, include) {
         // Map over the array to grab each nestedProp's value.
         currentId = currentItem[arrayName].map(nestedItem => {
           const keyThereVal = getByDot(nestedItem, nestedProp)
-          return typeof keyThereVal === 'number' ? keyThereVal : keyThereVal.toString()
+          return keyThereVal
         })
       } else {
         const keyThereVal = getByDot(currentItem, keyThere)
-        currentId = typeof keyThereVal === 'number' ? [keyThereVal] : [keyThereVal.toString()]
-      } if (asArray) {
-        if (currentId.includes(id)) {
+        currentId = keyThereVal
+      }
+      if (asArray) {
+        if ((Array.isArray(currentId) && currentId.includes(id)) || currentId === id) {
           items.push(currentItem)
         }
       } else {
-        if (currentId.includes(id)) {
+        if (currentId === id) {
           items = currentItem
         }
       }
@@ -176,8 +179,11 @@ function getRelatedItems (ids, relatedItems, include) {
   }, asArray ? [] : {})
 }
 
-function mapData (byKeyHere, key, keyHere, current) {
-  byKeyHere[key][keyHere] = byKeyHere[key][keyHere] || []
-  byKeyHere[key][keyHere].push(current)
+function mapDataWithId (byKeyHere, key, keyHere, current) {
+  byKeyHere[key][keyHere] = byKeyHere[key][keyHere] || {
+    key: keyHere,
+    vals: []
+  }
+  byKeyHere[key][keyHere].vals.push(current)
   return byKeyHere
 }