Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
m4lab_tv1
User Account
Commits
e00f0382
Commit
e00f0382
authored
3 years ago
by
Wolfgang Knopki
Browse files
Options
Download
Email Patches
Plain Diff
pick connection from pool before transaction
parent
0a1273fd
master
MLAB-677
devel
reset-jul13
reset-merge
testing
6 merge requests
!143
updating yml config
,
!129
Hide mobile menu in account pages
,
!128
Hide mobile menu in account pages
,
!126
prepare production deployment
,
!121
Mlab 566 fix
,
!118
pick connection from pool before transaction
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
functions/methods.ts
+42
-39
functions/methods.ts
with
42 additions
and
39 deletions
+42
-39
functions/methods.ts
+
42
-
39
View file @
e00f0382
...
@@ -3,12 +3,13 @@ import dbconn = require('../config/dbconn')
...
@@ -3,12 +3,13 @@ import dbconn = require('../config/dbconn')
var
methods
=
{
var
methods
=
{
// ===================== user db =====================
// ===================== user db =====================
registerNewUser
:
function
(
data
:
any
,
callback
:
any
)
{
registerNewUser
:
function
(
data
:
any
,
callback
:
any
)
{
dbconn
.
user
.
beginTransaction
(
function
(
err
:
any
)
{
// START TRANSACTION
dbconn
.
user
.
getConnection
(
function
(
err
:
any
,
thisconn
){
thisconn
.
beginTransaction
(
function
(
err
:
any
)
{
// START TRANSACTION
if
(
err
)
{
throw
err
}
if
(
err
)
{
throw
err
}
// insert profile
// insert profile
dbconn
.
user
.
query
(
'
INSERT INTO user SET ?
'
,
data
.
profile
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
thisconn
.
query
(
'
INSERT INTO user SET ?
'
,
data
.
profile
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
if
(
err
)
{
if
(
err
)
{
return
dbconn
.
user
.
rollback
(
function
()
{
return
thisconn
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
...
@@ -18,9 +19,9 @@ var methods = {
...
@@ -18,9 +19,9 @@ var methods = {
user_id
:
newUserId
,
user_id
:
newUserId
,
password
:
data
.
password
password
:
data
.
password
}
}
dbconn
.
user
.
query
(
'
INSERT INTO credential SET ?
'
,
credentialData
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
thisconn
.
query
(
'
INSERT INTO credential SET ?
'
,
credentialData
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
if
(
err
)
{
if
(
err
)
{
return
dbconn
.
user
.
rollback
(
function
()
{
return
thisconn
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
...
@@ -30,9 +31,9 @@ var methods = {
...
@@ -30,9 +31,9 @@ var methods = {
role_id
:
2
,
// USER
role_id
:
2
,
// USER
user_id
:
newUserId
user_id
:
newUserId
}
}
dbconn
.
user
.
query
(
'
INSERT INTO user_project_role SET ?
'
,
projectRoleData
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
thisconn
.
query
(
'
INSERT INTO user_project_role SET ?
'
,
projectRoleData
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
if
(
err
)
{
if
(
err
)
{
return
dbconn
.
user
.
rollback
(
function
()
{
return
thisconn
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
...
@@ -41,16 +42,16 @@ var methods = {
...
@@ -41,16 +42,16 @@ var methods = {
user_id
:
newUserId
,
user_id
:
newUserId
,
token
:
data
.
verificationToken
token
:
data
.
verificationToken
}
}
dbconn
.
user
.
query
(
'
INSERT INTO verification SET ?
'
,
verificationData
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
thisconn
.
query
(
'
INSERT INTO verification SET ?
'
,
verificationData
,
function
(
err
:
any
,
results
:
any
,
fields
:
any
)
{
if
(
err
)
{
if
(
err
)
{
return
dbconn
.
user
.
rollback
(
function
()
{
return
thisconn
.
rollback
(
function
()
{
throw
err
throw
err
});
});
}
}
// COMMIT
// COMMIT
dbconn
.
user
.
commit
(
function
(
err
:
any
)
{
thisconn
.
commit
(
function
(
err
:
any
)
{
if
(
err
)
{
if
(
err
)
{
return
dbconn
.
user
.
rollback
(
function
()
{
return
thisconn
.
rollback
(
function
()
{
throw
err
throw
err
})
})
}
}
...
@@ -60,6 +61,8 @@ var methods = {
...
@@ -60,6 +61,8 @@ var methods = {
});
});
});
});
callback
(
err
)
callback
(
err
)
});
callback
(
err
)
})
})
},
},
getUserByEmail
:
async
function
(
email
:
any
)
{
getUserByEmail
:
async
function
(
email
:
any
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets