use hash of gql query as part of the cache key

Author: patinthehat

src/resolvers/Story/author.ts

@@ -3,8 +3,8 @@ import axios from 'axios';
 export function getResolver(cache: any): any {
     const authorResolver = async parent => {
         const userCacheKey = `user:${parent.by}`;
-        const hasKey = await cache.has(userCacheKey);
 
+        const hasKey = await cache.has(userCacheKey);
         if (hasKey) {
             return cache.get(userCacheKey);
         }
@@ -14,7 +14,7 @@ export function getResolver(cache: any): any {
 
         cache.put(userCacheKey, resp.data, 3600);
 
-        return new Promise(resolve => resolve(resp.data));
+        return new Promise(resolve => resolve(cache.get(userCacheKey)));
     };
 
     return authorResolver;

src/resolvers/jobs.ts

@@ -1,17 +1,24 @@
 import { Cache } from '@/lib/cache/Cache';
 import axios from 'axios';
+const hash = require('object-hash');
 
 export function getResolver(storyIds, stories, cache: Cache): any {
-    const result = async (_, { first, skipText }) => {
+    const result = async (_, { first, skipText }, { req }) => {
         const kind = 'job';
 
         storyIds.splice(0, storyIds.length);
         stories.splice(0, stories.length);
 
+        const queryHash = hash(req.body);
+
         const ids: number[] = [];
-        const cacheKey = `jobstoryids:${first}-${skipText ? 'skipText' : 'dontSkipText'}`;
+        //const cacheKey = `jobstoryids:${first}-${skipText ? 'skipText' : 'dontSkipText'}`;
+        const cacheKey = `jobstoryids:${first}:${queryHash}`;
+
+        console.log('cacheKey = ', cacheKey);
 
         const hasKey = await cache.has(cacheKey);
+
         if (!hasKey) {
             console.log(`getting ${kind}storyids from URL...`);
 

src/resolvers/stories.ts

@@ -1,17 +1,22 @@
 import axios from 'axios';
+const hash = require('object-hash');
 
 export function getResolver(topStoryIds, topStories, cache: any): any {
-    const stories = async (_, { first, kind }) => {
+    const stories = async (_, { first, kind }, { req }) => {
         topStoryIds.splice(0, topStoryIds.length);
         topStories.splice(0, topStories.length);
 
         kind = `${kind}`.toLowerCase();
+        const queryHash = hash(req.body);
 
         const ids: number[] = [];
-        const topstoryCacheKey = `${kind}storyids:${first}`;
+        const storyIdsCacheKey = `${kind}storyids:${first}:${queryHash}`;
 
-        const hasTopStoryKey = await cache.has(topstoryCacheKey);
-        if (!hasTopStoryKey) {
+        console.log('storyIdsCacheKey = ', storyIdsCacheKey);
+
+        const hasStoryIdsKey = await cache.has(storyIdsCacheKey);
+
+        if (!hasStoryIdsKey) {
             console.log(`getting ${kind}storyids from URL...`);
 
             const resp = await axios.get(`${process.env.HACKERNEWS_API_URL}/${kind}stories.json?limitToFirst=${first}&orderBy="$key"`);
@@ -25,11 +30,11 @@ export function getResolver(topStoryIds, topStories, cache: any): any {
 
             const cacheTtl = cacheTtlMap[kind] || 60;
 
-            cache.put(topstoryCacheKey, data, cacheTtl);
+            cache.put(storyIdsCacheKey, data, cacheTtl);
             ids.push(...data);
         }
 
-        const cacheData = await cache.get(topstoryCacheKey);
+        const cacheData = await cache.get(storyIdsCacheKey);
 
         ids.push(...cacheData);
         ids.splice(first);

tests/resolvers/Story/author.test.ts

@@ -23,5 +23,5 @@ it('it retrieves the user data and returns it', async () => {
 it('it retrieves the user data and caches it', async () => {
     await resolver({ by: 'test' });
 
-    expect(cache.has('user:test')).toBeTruthy();
+    expect(await cache.has('user:test')).toBeTruthy();
 });

tests/resolvers/__snapshots__/stories.test.ts.snap

@@ -55,7 +55,7 @@ Object {
       "url": "https://twitter.com/ID_AA_Carmack/status/1400930510671601666",
     },
   },
-  "newstoryids:2": Object {
+  "newstoryids:2:2958f564f361b193b44e212175b8874c8537b9e9": Object {
     "expires": 0,
     "ts": 0,
     "value": Array [

tests/resolvers/comments.test.ts

@@ -22,5 +22,5 @@ it('it retrieves the comment data and returns it', async () => {
 it('it retrieves the comment data and caches it', async () => {
     await resolver({ kids: [27397733] }, { first: 1 });
 
-    expect(cache.has('comment:27397733')).toBeTruthy();
+    expect(await cache.has('comment:27397733')).toBeTruthy();
 });

tests/resolvers/stories.test.ts

@@ -2,6 +2,7 @@
 
 import { MemoryCache } from '@/lib/cache/MemoryCache';
 import { getResolver } from '@/resolvers/stories';
+const hash = require('object-hash');
 
 let cache: MemoryCache;
 let resolver: any;
@@ -16,7 +17,8 @@ beforeEach(() => {
 });
 
 it('it retrieves the story data and returns it', async () => {
-    const data = await resolver({}, { first: 2, kind: 'NEW' });
+    const req = { body: { first: 2, kind: 'NEW', a: 1, b: 2 } };
+    const data = await resolver({}, { first: 2, kind: 'NEW' }, { req });
 
     for (const item of data) {
         //item.ts = 0;
@@ -27,13 +29,17 @@ it('it retrieves the story data and returns it', async () => {
 });
 
 it('it retrieves the user data and caches it', async () => {
-    await resolver({}, { first: 2, kind: 'NEW' });
+    const req = { body: { query: 'abc', vars: 'bbb' } };
+    const reqHash = hash(req.body);
 
-    expect(cache.has('newstoryids:2')).toBeTruthy();
+    await resolver({}, { first: 2, kind: 'NEW' }, { req });
+
+    expect(await cache.has(`newstoryids:2:${reqHash}`)).toBeTruthy();
 });
 
 it('it retrieves each story and caches it', async () => {
-    const data = await resolver({}, { first: 2, kind: 'NEW' });
+    const req = { body: { first: 2, kind: 'NEW', a: 1, b: 2 } };
+    const data = await resolver({}, { first: 2, kind: 'NEW' }, { req });
 
     data.forEach(item => {
         expect(cache.has(`newstory:${item.id}`)).toBeTruthy();