Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
m4lab_tv1
User Account
Commits
60011553
Commit
60011553
authored
Aug 17, 2021
by
Rosanny Sihombing
Browse files
mysql2 instead of mysql
parent
87fc7581
Changes
3
Hide whitespace changes
Inline
Side-by-side
config/dbconn.ts
View file @
60011553
import
mysql
from
'
mysql
'
import
mysql
from
'
mysql
2
'
var
env
=
process
.
env
.
NODE_ENV
||
'
testing
'
var
env
=
process
.
env
.
NODE_ENV
||
'
testing
'
const
config
=
require
(
'
./config
'
)[
env
]
const
config
=
require
(
'
./config
'
)[
env
]
...
...
config/dbconn2.ts
deleted
100644 → 0
View file @
87fc7581
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
functions/methods.ts
View file @
60011553
import
dbconn_OBSOLETE
=
require
(
'
../config/dbconn
'
)
// DO NOT USE THIS FOR NEW FUNCTIONS
import
dbconn
=
require
(
'
../config/dbconn
'
)
import
dbconn
=
require
(
'
../config/dbconn2
'
)
var
methods
=
{
var
methods
=
{
// ===================== user db =====================
// ===================== user db =====================
registerNewUser
:
function
(
data
:
any
,
callback
:
any
)
{
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
}
if
(
err
)
{
throw
err
}
// insert profile
// 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
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
...
@@ -19,9 +18,9 @@ var methods = {
...
@@ -19,9 +18,9 @@ var methods = {
user_id
:
newUserId
,
user_id
:
newUserId
,
password
:
data
.
password
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
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
...
@@ -31,9 +30,9 @@ var methods = {
...
@@ -31,9 +30,9 @@ var methods = {
role_id
:
2
,
// USER
role_id
:
2
,
// USER
user_id
:
newUserId
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
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
...
@@ -42,16 +41,16 @@ var methods = {
...
@@ -42,16 +41,16 @@ var methods = {
user_id
:
newUserId
,
user_id
:
newUserId
,
token
:
data
.
verificationToken
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
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
// COMMIT
// COMMIT
dbconn
_OBSOLETE
.
user
.
commit
(
function
(
err
:
any
)
{
dbconn
.
user
.
commit
(
function
(
err
:
any
)
{
if
(
err
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
throw
err
})
})
}
}
...
@@ -131,11 +130,6 @@ var methods = {
...
@@ -131,11 +130,6 @@ var methods = {
return
null
return
null
},
},
addUserProjectRole_OBSOLETE
:
function
(
data
:
any
,
callback
:
any
)
{
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
){
dbconn
.
user
.
query
(
'
INSERT INTO user_project_role SET ?
'
,
data
,
function
(
err
:
any
){
if
(
err
)
throw
err
if
(
err
)
throw
err
callback
(
err
)
callback
(
err
)
...
@@ -168,22 +162,22 @@ var methods = {
...
@@ -168,22 +162,22 @@ var methods = {
return
null
return
null
},
},
verifyUserAccount
:
function
(
userData
:
any
,
callback
:
any
)
{
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
}
if
(
err
)
{
throw
err
}
// update user status
// 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
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
throw
err
})
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
})
}
}
// delete verification token
// 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
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
throw
err
})
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
})
}
}
// COMMIT
// COMMIT
dbconn
_OBSOLETE
.
user
.
commit
(
function
(
err
:
any
)
{
dbconn
.
user
.
commit
(
function
(
err
:
any
)
{
if
(
err
)
{
if
(
err
)
{
return
dbconn
_OBSOLETE
.
user
.
rollback
(
function
()
{
throw
err
})
return
dbconn
.
user
.
rollback
(
function
()
{
throw
err
})
}
}
})
})
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment