refactor(grahql): working example with gql

HospitalRun · Aug 31, 2020 · 201cf56 · 201cf56
1 parent 53c48d6
commit 201cf56
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 119 deletions.
diff --git a/package.json b/package.json
@@ -30,18 +30,15 @@
   "author": "Maksim Sinik <maksim@sinik.it>",
   "license": "MIT",
   "dependencies": {
-    "fastify": "~2.15.0",
-    "fastify-autoload": "~1.2.2",
+    "fastify": "~3.3.0",
+    "fastify-autoload": "~3.0.8",
     "fastify-blipp": "~3.0.0",
-    "fastify-cors": "~3.0.2",
-    "fastify-helmet": "~3.0.2",
-    "fastify-http-proxy": "~3.1.0",
-    "fastify-no-icon": "~3.0.0",
-    "fastify-plugin": "~1.6.1",
-    "make-promises-safe": "~5.1.0",
-    "nano": "~8.2.1",
-    "qs": "~6.9.1",
-    "require-from-string": "~2.0.2"
+    "fastify-cors": "~4.1.0",
+    "fastify-gql": "~5.6.0",
+    "fastify-helmet": "~5.0.1",
+    "fastify-no-icon": "~4.0.0",
+    "fastify-plugin": "~2.3.3",
+    "graphql-tools": "~6.1.0"
   },
   "devDependencies": {
     "@commitlint/cli": "~8.3.5",
@@ -51,10 +48,12 @@
     "@types/mkdirp": "~1.0.0",
     "@types/node": "~14.6.0",
     "@types/qs": "6.9.1",
-    "@typescript-eslint/eslint-plugin": "~2.34.0",
-    "@typescript-eslint/parser": "~2.34.0",
     "@types/require-from-string": "~1.2.0",
     "@types/sade": "~1.7.0",
+    "@types/tap": "~14.10.0",
+    "@types/ws": "~7.2.6",
+    "@typescript-eslint/eslint-plugin": "~2.34.0",
+    "@typescript-eslint/parser": "~2.34.0",
     "chalk": "~4.1.0",
     "commitizen": "~4.2.1",
     "commitlint-config-cz": "~0.13.0",
@@ -76,7 +75,7 @@
     "rimraf": "~3.0.0",
     "sade": "~1.7.3",
     "source-map-support": "~0.5.16",
-    "tap": "~14.10.5",
+    "tap": "~14.10.8",
     "tap-mocha-reporter": "~5.0.0",
     "typescript": "~3.9.2"
   },

diff --git a/src/app.ts b/src/app.ts
@@ -1,40 +1,26 @@
+import { Server, IncomingMessage, ServerResponse } from 'http'
+import { FastifyInstance, FastifyPluginOptions } from 'fastify'
+import fastifyCors from 'fastify-cors'
+import fastifyHelmet from 'fastify-helmet'
+import fastifyAutoload from 'fastify-autoload'
 import { join } from 'path'
-import AutoLoad from 'fastify-autoload'
-import { FastifyInstance } from 'fastify'
-import { nextCallback } from 'fastify-plugin'
-import noIcon from 'fastify-no-icon'
-import helmet from 'fastify-helmet'
-import qs from 'qs'
-import cors from 'fastify-cors'
+import GQL from 'fastify-gql'
+import schema from './graphql/schema'
+import resolvers from './graphql/resolvers'
 
-function HospitalRun(fastify: FastifyInstance, opts: any, next: nextCallback) {
-  fastify.register(cors, {
+export default (
+  fastify: FastifyInstance<Server, IncomingMessage, ServerResponse>,
+  _: FastifyPluginOptions,
+  next: (error?: Error) => void,
+) => {
+  fastify.register(fastifyCors, {
     allowedHeaders: ['Content-Type', 'Authorization'],
   })
-  fastify.register(helmet)
-  fastify.register(noIcon)
-
-  // This loads all application wide plugins defined in plugins folder
-  fastify.register(AutoLoad, {
-    dir: join(__dirname, 'plugins'),
-    includeTypeScript: true,
-    options: { ...opts },
-  })
-
-  // This loads all routes and services defined in services folder
-  fastify.register(AutoLoad, {
+  fastify.register(fastifyHelmet)
+  fastify.register(fastifyAutoload, {
     dir: join(__dirname, 'services'),
-    includeTypeScript: true,
-    options: { ...opts },
   })
 
+  fastify.register(GQL, { schema, resolvers })
   next()
 }
-
-HospitalRun.options = {
-  querystringParser: (str: string) => qs.parse(str),
-  logger: true,
-  ignoreTrailingSlash: true,
-}
-
-export = HospitalRun
diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts
@@ -0,0 +1,7 @@
+const resolvers = {
+  Query: {
+    add: async (_: any, { x, y }: any) => x + y,
+  },
+}
+
+export default resolvers
diff --git a/src/graphql/schema.ts b/src/graphql/schema.ts
@@ -0,0 +1,7 @@
+const schema = `
+  type Query {
+    add(x: Int, y: Int): Int
+  }
+`
+
+export default schema
diff --git a/src/index.ts b/src/index.ts
@@ -1,26 +1,19 @@
-// we need this file because of this issue: https://github.com/fastify/fastify-cli/issues/131
-import 'make-promises-safe'
 import Fastify from 'fastify'
-import hospitalRun from './app'
+import app from './app'
 
 const port = Number(process.env.PORT) || 3000
-const ip = process.env.IP || '0.0.0.0'
+const ip = process.env.IP || 'localhost'
 
-const fastify = Fastify(hospitalRun.options)
-fastify.register(hospitalRun)
+const fastify = Fastify({
+  ignoreTrailingSlash: true,
+  logger: true,
+})
 
-if (process.env.NODE_ENV !== 'production') {
-  // eslint-disable-next-line
-  const blipp = require('fastify-blipp')
-  fastify.register(blipp)
-}
+fastify.register(app)
 
 fastify.listen(port, ip, err => {
   if (err) {
-    fastify.log.error(err)
+    console.log(err)
     process.exit(1)
   }
-  if (process.env.NODE_ENV !== 'production') {
-    fastify.blipp()
-  }
 })
diff --git a/src/plugins/support.ts b/src/plugins/support.ts
diff --git a/src/services/health.ts b/src/services/health.ts
@@ -0,0 +1,13 @@
+import { Server, IncomingMessage, ServerResponse } from 'http'
+import { FastifyInstance, FastifyPluginOptions } from 'fastify'
+
+export default (
+  fastify: FastifyInstance<Server, IncomingMessage, ServerResponse>,
+  _: FastifyPluginOptions,
+  next: (error?: Error) => void,
+) => {
+  fastify.get('/health', (_, reply) => {
+    reply.send({ status: 'UP' })
+  })
+  next()
+}
diff --git a/src/services/root.ts b/src/services/root.ts
@@ -1,14 +1,15 @@
 import { Server, IncomingMessage, ServerResponse } from 'http'
-import { FastifyInstance } from 'fastify'
-import { nextCallback } from 'fastify-plugin'
+import { FastifyInstance, FastifyPluginOptions } from 'fastify'
 
 export default (
   fastify: FastifyInstance<Server, IncomingMessage, ServerResponse>,
-  _: {},
-  next: nextCallback,
+  _: FastifyPluginOptions,
+  next: (error?: Error) => void,
 ) => {
   fastify.get('/', (_, reply) => {
-    reply.send({ root: true })
+    const query = '{ add(x: 2, y: 2) }'
+    return reply.graphql(query)
   })
+
   next()
 }
diff --git a/test/helper.ts b/test/helper.ts
@@ -1,6 +1,6 @@
 import Fastify from 'fastify'
 import fp from 'fastify-plugin'
-import App from '../src/app'
+import App from './../src/app'
 
 // Fill in this config with all the configurations
 // needed for testing the application

diff --git a/test/plugins/support.test.ts b/test/plugins/support.test.ts
diff --git a/test/services/root.test.ts → test/services/health.test.ts b/test/services/root.test.ts → test/services/health.test.ts
@@ -1,11 +1,11 @@
 import { test } from 'tap'
 import { build } from '../helper'
 
-test('default root route', async (t: any) => {
+test('default root route', async t => {
   const app = build(t)
 
   const res = await app.inject({
-    url: '/',
+    url: '/health',
   })
-  t.deepEqual(JSON.parse(res.payload), { root: true })
+  t.deepEqual(JSON.parse(res.payload), { status: 'UP' })
 })
diff --git a/typings/fastify-blipp/index.d.ts b/typings/fastify-blipp/index.d.ts
diff --git a/typings/fastify-no-icon/index.d.ts b/typings/fastify-no-icon/index.d.ts
diff --git a/typings/fastify/index.d.ts b/typings/fastify/index.d.ts
diff --git a/typings/tap/index.d.ts b/typings/tap/index.d.ts