Merge pull request #85 from suhz/master

fixes for incorrect offset for pagination
This commit is contained in:
Snipa22
2017-07-02 13:25:22 -07:00
committed by GitHub
+4 -4
View File
@@ -423,9 +423,9 @@ app.get('/pool/payments/:pool_type', function (req, res) {
return res.json({'error': 'Invalid pool type'});
}
let paymentIds = [];
let query = "SELECT distinct(transaction_id) as txnID FROM payments WHERE pool_type = ? ORDER BY transaction_id LIMIT ? OFFSET ?";
let query = "SELECT distinct(transaction_id) as txnID FROM payments WHERE pool_type = ? ORDER BY transaction_id DESC LIMIT ? OFFSET ?";
let response = [];
global.mysql.query(query, [pool_type, limit, page]).then(function (rows) {
global.mysql.query(query, [pool_type, limit, page * limit]).then(function (rows) {
if (rows.length === 0) {
return res.json([]);
}
@@ -461,7 +461,7 @@ app.get('/pool/payments', function (req, res) {
let limit = typeof(req.query.limit) !== 'undefined' ? Number(req.query.limit) : 10;
let page = typeof(req.query.page) !== 'undefined' ? Number(req.query.page) : 0;
let query = "SELECT * FROM transactions ORDER BY id DESC LIMIT ? OFFSET ?";
global.mysql.query(query, [limit, page]).then(function (rows) {
global.mysql.query(query, [limit, page * limit]).then(function (rows) {
if (rows.length === 0) {
return res.json([]);
}
@@ -514,7 +514,7 @@ app.get('/miner/:address/payments', function (req, res) {
"payments WHERE payment_address = ? AND payment_id IS ? ORDER BY paid_time DESC LIMIT ? OFFSET ?";
}
let response = [];
global.mysql.query(query, [address, payment_id, limit, page]).then(function (rows) {
global.mysql.query(query, [address, payment_id, limit, page * limit]).then(function (rows) {
if (rows.length === 0) {
return res.json(response);
}