From fa5f7503d290011ac4a429ac611709477d8d45d2 Mon Sep 17 00:00:00 2001
From: maulikindia <60645304+maulikindia@users.noreply.github.com>
Date: Mon, 13 Jul 2020 17:16:22 +0530
Subject: [PATCH] separate routes and db config files

---
 config/db.js                    | 18 ++++++++++++++++++
 index.js                        |  2 +-
 queries.js => routes/queries.js | 22 +++++++---------------
 3 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 config/db.js
 rename queries.js => routes/queries.js (81%)

diff --git a/config/db.js b/config/db.js
new file mode 100644
index 0000000..8982ab4
--- /dev/null
+++ b/config/db.js
@@ -0,0 +1,18 @@
+
+
+let pg = require('pg');
+
+let pool = new pg.Pool({
+    user: 'me',
+    host: 'localhost',
+    database: 'api',
+    password: 'password',
+    port: 5432,
+}, async (err) => {
+    if (!err) {
+        console.log('db ok');
+    }
+});
+
+
+module.exports = pool;
\ No newline at end of file
diff --git a/index.js b/index.js
index ac9b842..57d0dfa 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,7 @@
 const express = require('express')
 const bodyParser = require('body-parser')
 const app = express()
-const db = require('./queries')
+const db = require('./routes/queries')
 const port = 3000
 
 app.use(bodyParser.json())
diff --git a/queries.js b/routes/queries.js
similarity index 81%
rename from queries.js
rename to routes/queries.js
index 4660211..bc41f06 100644
--- a/queries.js
+++ b/routes/queries.js
@@ -1,12 +1,4 @@
-const Pool = require('pg').Pool
-const pool = new Pool({
-  user: 'me',
-  host: 'localhost',
-  database: 'api',
-  password: 'password',
-  port: 5432,
-})
-
+let pool = require('../config/db');
 const getUsers = (request, response) => {
   pool.query('SELECT * FROM users ORDER BY id ASC', (error, results) => {
     if (error) {
@@ -34,7 +26,7 @@ const createUser = (request, response) => {
     if (error) {
       throw error
     } else if (!Array.isArray(results.rows) || results.rows.length < 1) {
-    	throw error
+      throw error
     }
     response.status(201).send(`User added with ID: ${results.rows[0].id}`)
   })
@@ -50,15 +42,15 @@ const updateUser = (request, response) => {
     (error, results) => {
       if (error) {
         throw error
-      } 
+      }
       if (typeof results.rows == 'undefined') {
-      	response.status(404).send(`Resource not found`);
+        response.status(404).send(`Resource not found`);
       } else if (Array.isArray(results.rows) && results.rows.length < 1) {
-      	response.status(404).send(`User not found`);
+        response.status(404).send(`User not found`);
       } else {
-  	 	  response.status(200).send(`User modified with ID: ${results.rows[0].id}`)         	
+        response.status(200).send(`User modified with ID: ${results.rows[0].id}`)
       }
-      
+
     }
   )
 }