diff --git a/config/dbconn.ts b/config/dbconn.ts
index d918ce7c2e911d3a997c92df8d313f334f8024ca..c13c40f11c2c3994791d75c866c5cfc6d210e1d7 100644
--- a/config/dbconn.ts
+++ b/config/dbconn.ts
@@ -1,4 +1,4 @@
-import mysql from 'mysql'
+import mysql from 'mysql2'
var env = process.env.NODE_ENV || 'testing'
const config = require('./config')[env]
diff --git a/config/dbconn2.ts b/config/dbconn2.ts
deleted file mode 100644
index c13c40f11c2c3994791d75c866c5cfc6d210e1d7..0000000000000000000000000000000000000000
--- a/config/dbconn2.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import mysql from 'mysql2'
-
-var env = process.env.NODE_ENV || 'testing'
-const config = require('./config')[env]
-
-// ==== USER ACOOUNT DB CONNECTION ====
-var userConnection = mysql.createConnection({
- host: config.database.host,
- user: config.database.user,
- password: config.database.password,
- port: config.database.port,
- database: config.database.dbUser,
- multipleStatements: true
-})
-
-userConnection.connect(function(err) {
- if (err) throw err
-})
-userConnection.query('USE '+config.database.dbUser)
-
-// ALTERNATIVE approach: close db connection manually after every query
-/*
-var dbconn = function dbconn(query, values, next) {
- var connection = mysql.createConnection({
- host: config.database.host,
- user: config.database.user,
- password: config.database.password,
- port: config.database.port,
- database: config.database.db
- })
- connection.connect(function(err) {
- if (err) throw err;
- })
- connection.query(query, values, function(err) {
- connection.end(); // close the connection
- if (err) {
- throw err;
- }
- // Execute the callback
- next.apply(this, arguments);
- });
-}
-*/
-
-// ==== PROJECT DB CONNECTION ====
-var projectConnection = mysql.createConnection({
- host: config.database.host_project,
- user: config.database.user,
- password: config.database.password,
- port: config.database.port,
- database: config.database.dbProject
-})
-
-projectConnection.connect(function(err) {
- if (err) throw err
-})
-projectConnection.query('USE '+config.database.dbProject)
-
-var connection = {
- user: userConnection,
- project: projectConnection
-}
-
-export = connection
\ No newline at end of file
diff --git a/functions/methods.ts b/functions/methods.ts
index 16143b851a743a4f5e023c4b50913dd695cbcc2b..cebfcb2179d5dcd9dc70e591708c6bd69300523c 100644
--- a/functions/methods.ts
+++ b/functions/methods.ts
@@ -1,15 +1,14 @@
-import dbconn_OBSOLETE = require('../config/dbconn') // DO NOT USE THIS FOR NEW FUNCTIONS
-import dbconn = require('../config/dbconn2')
+import dbconn = require('../config/dbconn')
var methods = {
// ===================== user db =====================
registerNewUser: function(data:any, callback:any) {
- dbconn_OBSOLETE.user.beginTransaction(function(err:any) { // START TRANSACTION
+ dbconn.user.beginTransaction(function(err:any) { // START TRANSACTION
if (err) { throw err }
// insert profile
- dbconn_OBSOLETE.user.query('INSERT INTO user SET ?', data.profile, function (err:any, results:any, fields:any) {
+ dbconn.user.query('INSERT INTO user SET ?', data.profile, function (err:any, results:any, fields:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() {
+ return dbconn.user.rollback(function() {
throw err
});
}
@@ -19,9 +18,9 @@ var methods = {
user_id: newUserId,
password: data.password
}
- dbconn_OBSOLETE.user.query('INSERT INTO credential SET ?', credentialData, function (err:any, results:any, fields:any) {
+ dbconn.user.query('INSERT INTO credential SET ?', credentialData, function (err:any, results:any, fields:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() {
+ return dbconn.user.rollback(function() {
throw err
});
}
@@ -31,9 +30,9 @@ var methods = {
role_id: 2, // USER
user_id: newUserId
}
- dbconn_OBSOLETE.user.query('INSERT INTO user_project_role SET ?', projectRoleData, function (err:any, results:any, fields:any) {
+ dbconn.user.query('INSERT INTO user_project_role SET ?', projectRoleData, function (err:any, results:any, fields:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() {
+ return dbconn.user.rollback(function() {
throw err
});
}
@@ -42,16 +41,16 @@ var methods = {
user_id: newUserId,
token: data.verificationToken
}
- dbconn_OBSOLETE.user.query('INSERT INTO verification SET ?', verificationData, function (err:any, results:any, fields:any) {
+ dbconn.user.query('INSERT INTO verification SET ?', verificationData, function (err:any, results:any, fields:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() {
+ return dbconn.user.rollback(function() {
throw err
});
}
// COMMIT
- dbconn_OBSOLETE.user.commit(function(err:any) {
+ dbconn.user.commit(function(err:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() {
+ return dbconn.user.rollback(function() {
throw err
})
}
@@ -131,11 +130,6 @@ var methods = {
return null
},
addUserProjectRole_OBSOLETE: function(data:any, callback:any) {
- /*
- dbconn_OBSOLETE.user.query('INSERT INTO user_project_role SET ?', data, function (err:any, results:any, fields:any){
- if (err) throw err
- callback(err)
- }) */
dbconn.user.query('INSERT INTO user_project_role SET ?', data, function (err:any){
if (err) throw err
callback(err)
@@ -168,22 +162,22 @@ var methods = {
return null
},
verifyUserAccount: function(userData:any, callback:any) {
- dbconn_OBSOLETE.user.beginTransaction(function(err:any) { // START TRANSACTION
+ dbconn.user.beginTransaction(function(err:any) { // START TRANSACTION
if (err) { throw err }
// update user status
- dbconn_OBSOLETE.user.query('UPDATE user SET ? WHERE id =' +userData.id, userData, function (err:any, rows:any, fields:any) {
+ dbconn.user.query('UPDATE user SET ? WHERE id =' +userData.id, userData, function (err:any, rows:any, fields:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() { throw err })
+ return dbconn.user.rollback(function() { throw err })
}
// delete verification token
- dbconn_OBSOLETE.user.query('DELETE FROM verification WHERE user_id = '+userData.id, function (err:any, rows:any, fields:any) {
+ dbconn.user.query('DELETE FROM verification WHERE user_id = '+userData.id, function (err:any, rows:any, fields:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() { throw err })
+ return dbconn.user.rollback(function() { throw err })
}
// COMMIT
- dbconn_OBSOLETE.user.commit(function(err:any) {
+ dbconn.user.commit(function(err:any) {
if (err) {
- return dbconn_OBSOLETE.user.rollback(function() { throw err })
+ return dbconn.user.rollback(function() { throw err })
}
})
})