Skip to content

Rem/mysql #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kamynale wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Rem/mysql #13

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d09729e
Merge pull request #1 from pskucherov/master
Kamynale Jul 11, 2020
034465d
Merge pull request #4 from pskucherov/master
Kamynale Jul 15, 2020
04f73fc
Merge pull request #5 from pskucherov/master
Kamynale Jul 17, 2020
321ecba
Merge pull request #8 from pskucherov/master
Kamynale Jul 26, 2020
b575ec0
Merge pull request #10 from pskucherov/master
Kamynale Sep 2, 2020
1c1a18a
mysql with pool
Kamynale Sep 2, 2020
8cfa428
mysql with pool
Kamynale Sep 3, 2020
b713048
bd with logs
Kamynale Sep 4, 2020
cf51365
bd with correction
Kamynale Sep 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 129 additions & 9 deletions server/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,25 @@ passport.use(new FacebookStrategy({
const photo = profile.photos && profile.photos[0] && profile.photos[0].value || '';
const email = profile.emails && profile.emails[0] && profile.emails[0].value || '';

pool.query(`INSERT INTO Users SET
id = '${profile.id}', login = '${profile.displayName}', email = '${email}', photo='${photo}', createdAt = NOW(), balance = 10000
ON DUPLICATE KEY UPDATE login = '${profile.displayName}', email = '${email}', photo='${photo}'
`);
pool.query(`SELECT * from Users where id=${profile.id}`, (err, rows) => {
if (err) throw err;
if (rows && rows.length === 0) {
console.log('There is no such user, adding now');
pool.query(`INSERT INTO Users SET id = '${profile.id}', login = '${profile.displayName}', email = '${email}', photo='${photo}'`);
} else {
console.log('User already exists in database');
}
});

pool.query(`SELECT * from Transactions where id='${profile.id}'`, (err, rows) => {
if (err) throw err;
if (rows && rows.length === 0) {
console.log('There is no balance User in Transaction, adding now');
pool.query(`INSERT INTO Transactions SET id = '${profile.id}'`);
} else {
console.log('Balance for User already exists in database');
}
});

profile.accessToken = accessToken;
}
Expand All @@ -62,6 +77,8 @@ passport.use(new FacebookStrategy({
}))
);



// app.set('views', __dirname + '/views');
// app.set('view engine', 'ejs');

Expand Down Expand Up @@ -108,7 +125,10 @@ app.get('/api/account', (req, res) => {
return res.end('{}');
}

pool.query(`SELECT * from Users where id=${req.user.id}`, (err, rows) => {
/* pool.query(`SELECT user from Users where id=${req.user.id}` , (err, rows) => {
res.end(JSON.stringify({ user: req.user, finance: { balance: rows && rows[0] && rows[0].balance }}));
})*/
pool.query(`SELECT * from Users,Transactions WHERE Users.id=Transactions.id`, (err, rows) => {
res.end(JSON.stringify({ user: req.user, finance: { balance: rows && rows[0] && rows[0].balance }}));
})
});
Expand Down Expand Up @@ -172,6 +192,7 @@ app.get('/api/stocks/ticks/:tick', ensureAuthenticated, (req, res) => {

app.param('price', /^\d+\.?\d*$/i)


// ========= Работа с тиками ==========
app.get('/api/stocks/trades/buy/:price', ensureAuthenticated, (req, res) => {
// TODO: сделать общее решение для локальной разработки.
Expand All @@ -185,10 +206,59 @@ app.get('/api/stocks/trades/buy/:price', ensureAuthenticated, (req, res) => {
return res.end('{}');
}

pool.query(`UPDATE Users SET balance = balance - '${req.params.price}' WHERE id = '${req.user.id}'`);
return res.end(JSON.stringify({}));
const sql = `SELECT balance FROM Transactions WHERE id='${req.user.id}' AND balance>=${req.params.price}`;
const transaction = `UPDATE Transactions SET stock='SBER', commission=0, price=${req.params.price}+commission, balance = balance - price WHERE id='${req.user.id}'`
const logs = `INSERT INTO Transactions_logs(id,balance,price,commission,stock) SELECT id,balance,price,commission,stock FROM Transactions WHERE id='${req.user.id}')`

pool.getConnection(function (err, connection) {
Copy link
Collaborator

@pskucherov pskucherov Sep 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

для чего здесь getConnection ? почему здесь есть, а выше нет?

Copy link
Contributor Author

@Kamynale Kamynale Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Если правильно понимаю, данная функция обертка помогает уйти от проблем с асинхронностью приложения и без нее не работает полный пул соединения, все падает


connection.query(sql, (err, results) => {
if (err) throw err;
if (results && results.length === 0) {
connection.release();
console.log('Not enough money');
} else {
connection.beginTransaction(function (err) {
if (err) { //Transaction Error (Rollback and release connection)
connection.rollback(function () {
connection.release();
Copy link
Collaborator

@pskucherov pskucherov Sep 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

зачем обрывать соединение?

Copy link
Contributor Author

@Kamynale Kamynale Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Для безопасности транзакции

Copy link
Contributor Author

@Kamynale Kamynale Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Это был 1 из примеров, где парень описывал, что данная транзакция будет более безопасной. Смысл был защиты от хакерских атак, в данную функцию не успевают подставить левые данные и постоянно метяется хеш т.к. новое соединение. На скорость подключения это не особо влияет, но могу убрать

console.log('connection is lost')
//Failure
});
} else {
connection.query(transaction, function (err, results) {
if (err) { //Query Error (Rollback and release connection)
connection.rollback(function () {
connection.release();
console.log('no money');
});
} else {
connection.commit(function (err) {
if (err) {
connection.rollback(function () {
connection.release();
console.log('lost!');
});
} else {
connection.release();
console.log(`'balance update - '${req.params.price}`);
console.log('success!');
connection.query(logs, (err, results) => {
console.log('Transactions logs added');
});
}
});
}
});
}
});
}
});
});
});



app.get('/api/stocks/trades/sell/:price', ensureAuthenticated, (req, res) => {
// TODO: сделать общее решение для локальной разработки.
res.setHeader('Content-Type', 'application/json');
Expand All @@ -201,8 +271,55 @@ app.get('/api/stocks/trades/sell/:price', ensureAuthenticated, (req, res) => {
return res.end('{}');
}

pool.query(`UPDATE Users SET balance = balance + '${req.params.price}' WHERE id = '${req.user.id}'`);
return res.end(JSON.stringify({}));
const sql = `SELECT balance FROM Transactions WHERE id='${req.user.id}' AND balance>=${req.params.price}`;
const transaction = `UPDATE Transactions SET stock='SBER', commission=0, price=${req.params.price}+commission, balance = balance + price WHERE id='${req.user.id}'`
const logs = `INSERT INTO Transactions_logs(id,balance,price,commission,stock) SELECT id,balance,price,commission,stock FROM Transactions WHERE id='${req.user.id}')`

pool.getConnection(function (err, connection) {

connection.query(sql, (err, results) => {
if (err) throw err;
if (results && results.length === 0) {
connection.release();
console.log('Not enough money');
} else {
connection.beginTransaction(function (err) {
if (err) { //Transaction Error (Rollback and release connection)
connection.rollback(function () {
connection.release();
console.log('connection is lost')
//Failure
});
} else {
connection.query(transaction, function (err, results) {
if (err) { //Query Error (Rollback and release connection)
connection.rollback(function () {
connection.release();
console.log('no money');
Copy link
Collaborator

@pskucherov pskucherov Sep 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

очень много повторений, почему это не вынести в отдельный метод?

Copy link
Contributor Author

@Kamynale Kamynale Sep 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Подразумевается импорт функции и вызов через new?

});
} else {
connection.commit(function (err) {
if (err) {
connection.rollback(function () {
connection.release();
console.log('lost!');
});
} else {
connection.release();
console.log(`'balance update + '${req.params.price}`);
console.log('success!');
connection.query(logs, (err, results) => {
console.log('Transactions logs added');
});
}
});
}
});
}
});
}
});
});
});

function ensureAuthenticated(req, res, next) {
Expand All @@ -211,4 +328,7 @@ function ensureAuthenticated(req, res, next) {
return next();
}

// Transaction


app.listen(3001);