From a9ee960e1f9edeb1a7867a8893b47977a5e4df1a Mon Sep 17 00:00:00 2001
From: "karl.hudgell" <karl.hudgell@bjss.com>
Date: Tue, 16 Feb 2021 17:09:02 +0000
Subject: [PATCH] rework postUser

---
 lib/getUser.js     | 21 +++++++++++++++++++++
 lib/mysql.js       | 19 -------------------
 routes/postUser.js | 28 ++++++----------------------
 3 files changed, 27 insertions(+), 41 deletions(-)
 create mode 100644 lib/getUser.js

diff --git a/lib/getUser.js b/lib/getUser.js
new file mode 100644
index 0000000..e533c3a
--- /dev/null
+++ b/lib/getUser.js
@@ -0,0 +1,21 @@
+const sql = require('./mysql')
+
+function getUserAccounts(user) {
+    let data = sql.query(`SELECT
+      userAccounts.username,
+      streams.streamName,
+      streams.streamURL
+    FROM users
+      INNER JOIN userAccounts
+        ON users.idusers = userAccounts.userID
+      INNER JOIN streams
+        ON userAccounts.stream = streams.streamName
+        WHERE users.username = '${user}'`)
+    // console.log(data)
+    return data
+}
+
+module.exports = {
+    getUserAccounts
+}
+
diff --git a/lib/mysql.js b/lib/mysql.js
index de8e69d..471f085 100644
--- a/lib/mysql.js
+++ b/lib/mysql.js
@@ -1,22 +1,3 @@
-// var mysql = require('mysql');
-
-
-// var connection = mysql.createConnection({
-//     host: 'localhost',
-//     port: 3306,
-//     user: 'root',
-//     password: 'example',
-//     database: 'BBLB_DNS',
-//     insecureAuth: true
-// })
-
-// connection.connect(function (err) {
-//     if (err) throw err;
-// });
-
-// module.exports = connection;
-
-
 var mysql = require('sync-mysql');
 
 var connection = new mysql({
diff --git a/routes/postUser.js b/routes/postUser.js
index a90c870..ed16ac0 100644
--- a/routes/postUser.js
+++ b/routes/postUser.js
@@ -2,30 +2,14 @@ var express = require('express');
 var router = express.Router();
 
 const sql = require('../lib/mysql')
+
+const { getUserAccounts } = require('../lib/getUser')
+
 /* POST postUser page. */
 router.post('/', async function (req, res, next) {
-  sql.query(`SELECT
-      userAccounts.username,
-      streams.streamName,
-      streams.streamURL
-    FROM users
-      INNER JOIN userAccounts
-        ON users.idusers = userAccounts.userID
-      INNER JOIN streams
-        ON userAccounts.stream = streams.streamName
-        WHERE users.username = '${req.body.username}'`, function (err, tt) {
-    if (err) {
-      console.log("User Not Found: ", err);
-    }
-    else {
-      if (tt.length === 0) {
-        res.send('User Not Found')
-      } else {
-        console.log(tt);
-        res.send(tt);
-      }
-    }
-  });
+let data = await getUserAccounts(req.body.username)
+res.send(data)
+
 });
 
 module.exports = router;