router fixed with async

Author: mdb1710

package-lock.json

@@ -26,7 +26,7 @@
     "express": "^4.16.4",
     "helmet": "^3.16.0",
     "jsonwebtoken": "^8.5.1",
-    "knex": "^0.16.3",
+    "knex": "^0.16.5",
     "mocha": "^6.1.4",
     "morgan": "^1.9.1",
     "node-fetch": "^2.3.0",

package.json

@@ -7,5 +7,6 @@ module.exports = {
   CLIENT_SECRET: process.env.CLIENT_SECRET,
 
   CLIENT_ORIGIN: process.env.CLIENT_ORIGIN || 'http://localhost:3000',
+  DB_URL: process.env.DB_URL || 'postgresql://tunechainer@localhost/saved_playlists'
 
 };

src/config.js

@@ -18,14 +18,14 @@ const serializeSavedPlaylists = search => ({
 });
 
 playlistRouter
-  .get('/', (req, res, next) => {
+  .get('/', async (req, res, next) => {
     try {
-      const list = PlaylistService.getSavedSearches(
+      const list = await PlaylistService.getSavedSearches(
         req.app.get('db')
       );
 
       res.json(list)
-        .next();
+        .end();
 
 
     } catch (error){

src/playlists/playlist-router.js

@@ -7,7 +7,10 @@ const PlaylistService = {
     return db 
       .select('*')
 
-      .from('saved_searches');
+      .from('saved_searches')
+      .then((results) => results);
+      
+      
 
   },
 

src/playlists/playlist-service.js

@@ -2,20 +2,29 @@
 
 const express = require('express');
 const app = require('./app');
+const knex = require('knex');
+const { PORT, DB_URL } = require('./config');
 
 
 
 const cors = require('cors');
 const {CLIENT_ORIGIN} = require('./config');
 
-const PORT = process.env.PORT || 8000;
+// const PORT = process.env.PORT || 8000;
+
+const db = knex ({
+  client: 'pg',
+  connection: DB_URL
+});
 
 app.use(
   cors({
     origin: CLIENT_ORIGIN
   })
 );
 
+app.set('db', db);
+