Cleanup of code

src/datasources/BaseSQLDataSource.ts

@@ -2,6 +2,38 @@ import { SQLDataSource } from 'datasource-sql';
 const { InMemoryLRUCache } = require('apollo-server-caching');
 import crypto from 'crypto';
 
+const MINUTE = 60;
+
+export class RawBuilder {
+  _cache: any;
+  query: any;
+  constructor(knex, cache, query) {
+    this._cache = cache;
+    this.query = knex.raw(query);
+  }
+
+  async cache(ttl: number) {
+    const cacheKey = crypto
+      .createHash('sha1')
+      .update(this.query.toString())
+      .digest('base64');
+
+    return this._cache.get(cacheKey).then((entry) => {
+      if (entry) {
+        return Promise.resolve(JSON.parse(entry));
+      }
+
+      return this.query.then((rows) => {
+        if (rows) {
+          this._cache.set(cacheKey, JSON.stringify(rows), { ttl });
+        }
+
+        return Promise.resolve(rows);
+      });
+    });
+  }
+}
+
 export class BaseSQLDataSource extends SQLDataSource {
   cache: any;
   constructor(config) {
@@ -13,24 +45,7 @@ export class BaseSQLDataSource extends SQLDataSource {
     return date.toISOString().split('T')[0];
   }
 
-  async cacheQuery(ttl = 5, query) {
-    const cacheKey = crypto
-      .createHash('sha1')
-      .update(query.toString())
-      .digest('base64');
-
-    return this.cache.get(cacheKey).then((entry) => {
-      if (entry) {
-        return Promise.resolve(JSON.parse(entry));
-      }
-
-      return query.then((rows) => {
-        if (rows) {
-          this.cache.set(cacheKey, JSON.stringify(rows), { ttl });
-        }
-
-        return Promise.resolve(rows);
-      });
-    });
+  cachedRaw(query: string): RawBuilder {
+    return new RawBuilder(this.knex, this.cache, query);
   }
 }