Merge branch 'B42-Training-master'

Author: lorensr

src/__tests__/cache.test.js

@@ -3,9 +3,13 @@ import wait from 'waait'
 import { ObjectId } from 'mongodb'
 import { EJSON } from 'bson'
 
-import { createCachingMethods, idToString } from '../cache'
+import {
+  createCachingMethods,
+  idToString,
+  isValidObjectIdString
+} from '../cache'
 
-const hexId = 'aaaa0000bbbb0000cccc0000'
+const hexId = '5cf82e14a220a607eb64a7d4'
 
 const docs = {
   one: {
@@ -265,3 +269,12 @@ describe('createCachingMethods', () => {
     }
   })
 })
+
+describe('isValidObjectIdString', () => {
+  it('works', () => {
+    const trickyId = 'toptoptoptop'
+    expect(ObjectId.isValid(trickyId)).toBe(true)
+    expect(isValidObjectIdString(trickyId)).toBe(false)
+    expect(isValidObjectIdString(hexId)).toBe(true)
+  })
+})

src/cache.js

@@ -5,17 +5,23 @@ import { EJSON } from 'bson'
 import { getCollection } from './helpers'
 
 export const idToString = id => (id instanceof ObjectId ? id.toHexString() : id)
-const stringToId = str => {
-  if (str instanceof ObjectId) {
-    return str
+
+// https://www.geeksforgeeks.org/how-to-check-if-a-string-is-valid-mongodb-objectid-in-nodejs/
+export const isValidObjectIdString = string =>
+  ObjectId.isValid(string) && String(new ObjectId(string)) === string
+
+export const stringToId = string => {
+  if (string instanceof ObjectId) {
+    return string
   }
 
-  if (ObjectId.isValid(str)) {
-    return new ObjectId(str)
+  if (isValidObjectIdString(string)) {
+    return new ObjectId(string)
   }
 
-  return str
+  return string
 }
+
 const fieldToDocField = key => (key === 'id' ? '_id' : key)
 
 // https://github.com/graphql/dataloader#batch-function
@@ -110,13 +116,15 @@ export const createCachingMethods = ({ collection, model, cache }) => {
     findByFields: async (fields, { ttl } = {}) => {
       const cleanedFields = {}
 
-      Object.keys(fields).sort().forEach(key => {
-        if (typeof key !== 'undefined') {
-          cleanedFields[key] = Array.isArray(fields[key])
-            ? fields[key]
-            : [fields[key]]
-        }
-      })
+      Object.keys(fields)
+        .sort()
+        .forEach(key => {
+          if (typeof key !== 'undefined') {
+            cleanedFields[key] = Array.isArray(fields[key])
+              ? fields[key]
+              : [fields[key]]
+          }
+        })
 
       const loaderJSON = JSON.stringify(cleanedFields)