diff --git a/src/lib/connectors/status.js b/src/lib/connectors/status.js deleted file mode 100644 index e3c8b13..0000000 --- a/src/lib/connectors/status.js +++ /dev/null @@ -1,18 +0,0 @@ -require('dotenv').config() -const { pool } = require('./db') -const pkg = require('../../../package.json') - -const getStatus = async () => { - try { - const { rows: data } = await pool.query('select hello from returns.status;') - return { - data, - error: null, - version: pkg.version - } - } catch (error) { - return { error } - } -} - -exports.getStatus = getStatus diff --git a/src/modules/core/controller.js b/src/modules/core/controller.js index 1df22ea..5efc57d 100644 --- a/src/modules/core/controller.js +++ b/src/modules/core/controller.js @@ -1,13 +1,9 @@ -const Boom = require('@hapi/boom') -const statusConnector = require('../../lib/connectors/status') +'use strict' -const getStatus = async () => { - try { - const status = await statusConnector.getStatus() - return status - } catch (e) { - throw Boom.badImplementation(e) - } +function getStatus () { + return { status: 'alive' } } -exports.getStatus = getStatus +module.exports = { + getStatus +} diff --git a/test/lib/connectors/status.test.js b/test/lib/connectors/status.test.js deleted file mode 100644 index 0453374..0000000 --- a/test/lib/connectors/status.test.js +++ /dev/null @@ -1,43 +0,0 @@ -'use strict' - -const { - experiment, - test, - beforeEach, - afterEach -} = exports.lab = require('@hapi/lab').script() - -const sinon = require('sinon') -const sandbox = sinon.createSandbox() - -const { expect } = require('@hapi/code') - -const statusConnector = require('../../../src/lib/connectors/status') -const { pool } = require('../../../src/lib/connectors/db') - -experiment('lib/connectors/status', () => { - experiment('.getStatus', () => { - let response - - beforeEach(async () => { - sandbox.stub(pool, 'query').resolves({ - rows: [{ - hello: 'world' - }] - }) - response = await statusConnector.getStatus() - }) - - afterEach(async () => { - sandbox.restore() - }) - - test('includes the response from the database', async () => { - expect(response.data).to.equal([{ hello: 'world' }]) - }) - - test('includes the version from the package.json', async () => { - expect(response.version).to.match(/\d*\.\d*\.\d*/) - }) - }) -}) diff --git a/test/modules/core/controller.test.js b/test/modules/core/controller.test.js index 4cfcda6..0081a2e 100644 --- a/test/modules/core/controller.test.js +++ b/test/modules/core/controller.test.js @@ -1,30 +1,14 @@ -const { experiment, test, afterEach, beforeEach } = exports.lab = require('@hapi/lab').script() -const { expect } = require('@hapi/code') - -const sinon = require('sinon') -const sandbox = sinon.createSandbox() +'use strict' -const statusConnector = require('../../../src/lib/connectors/status') +const { experiment, test } = exports.lab = require('@hapi/lab').script() +const { expect } = require('@hapi/code') const controller = require('../../../src/modules/core/controller') experiment('modules/core/controller', () => { - experiment('.getStatus', () => { - beforeEach(async () => { - sandbox.stub(statusConnector, 'getStatus').resolves({ test: true }) - }) - - afterEach(async () => { - sandbox.restore() - }) - - test('returns the status', async () => { - const response = await controller.getStatus() - expect(response.test).to.be.true() - }) - - test('throw if the status connector errors', async () => { - statusConnector.getStatus.rejects() - await expect(controller.getStatus()).to.reject() + experiment('getStatus', () => { + test('returns an object with the application status', () => { + const response = controller.getStatus() + expect(response.status).to.equal('alive') }) }) })