From b453c78c001d95364786397926149280605a73d0 Mon Sep 17 00:00:00 2001 From: Arjun Patel Date: Tue, 15 Jan 2019 11:44:23 -0800 Subject: [PATCH] fixing json responses --- app/controllers/donors.controller.js | 12 ++++++++---- server.js | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/donors.controller.js b/app/controllers/donors.controller.js index aa13f78..b7f8c3c 100644 --- a/app/controllers/donors.controller.js +++ b/app/controllers/donors.controller.js @@ -1,10 +1,11 @@ const db = require('../config/db.config.js'), - bcrypt = require('bcrypt-nodejs'); + bcrypt = require('bcrypt-nodejs'), + errorMaker = require('../helpers/error.maker'); const Donors = db.donors; // Create/post a Donor -exports.create = (req, res) => { +exports.create = (req, res, next) => { // see if user already in db Donors.findAll({ where: { @@ -50,10 +51,13 @@ exports.create = (req, res) => { }; // FETCH all Donors -exports.findAll = (req, res) => { +exports.findAll = (req, res, next) => { Donors.findAll().then(donors => { // Send all donors to Client - res.status(200).send(donors); + res.status(200).json({ + donors, + number_donors: donors.length + }); }); }; diff --git a/server.js b/server.js index 5746c0d..2c7b96d 100644 --- a/server.js +++ b/server.js @@ -5,6 +5,8 @@ const express = require('express'), port = process.env.PORT, db = require('./app/config/db.config.js'); +console.log(process.env.JAWSDB_MARIA_URL); + app.use(bodyParser.json()); //handle CORS errors