RanchiMall/exchangemarket
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix

Browse Source 
Fixed: Unable to process null returned from SQL SUM()
This commit is contained in:
sairajzero 2022-03-22 14:11:55 +05:30
parent 6702541254
commit 01dcd9b2d1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/group.js
View File

@ -335,7 +335,7 @@ function verifySellOrder(sellOrder, asset, cur_price, mode_null) {
resolve(sellOrder); resolve(sellOrder);
}).catch(error => reject(error)); }).catch(error => reject(error));
else if (mode_null) else if (mode_null)
DB.query("SELECT SUM(quantity) as total FROM Vault WHERE floID=? AND asset=?", [sellOrder.floID, asset]).then(result => { DB.query("SELECT IFNULL(SUM(quantity), 0) as total FROM Vault WHERE floID=? AND asset=?", [sellOrder.floID, asset]).then(result => {
if (result[0].total < sellOrder.quantity) if (result[0].total < sellOrder.quantity)
console.warn(`Sell Order ${sellOrder.id} was made without enough Assets. This should not happen`); console.warn(`Sell Order ${sellOrder.id} was made without enough Assets. This should not happen`);
if (result[0].total > 0) if (result[0].total > 0)

22
src/market.js
View File

@ -53,8 +53,8 @@ function getBalance(floID, token) {
getBalance.floID_token = (floID, token) => new Promise((resolve, reject) => { getBalance.floID_token = (floID, token) => new Promise((resolve, reject) => {
(token === floGlobals.currency ? (token === floGlobals.currency ?
DB.query("SELECT SUM(balance) AS balance FROM Cash WHERE floID=?", [floID]) : DB.query("SELECT IFNULL(SUM(balance), 0) AS balance FROM Cash WHERE floID=?", [floID]) :
DB.query("SELECT SUM(quantity) AS balance FROM Vault WHERE floID=? AND asset=?", [floID, token]) DB.query("SELECT IFNULL(SUM(quantity), 0) AS balance FROM Vault WHERE floID=? AND asset=?", [floID, token])
).then(result => resolve({ ).then(result => resolve({
floID, floID,
token, token,
@ -64,8 +64,8 @@ getBalance.floID_token = (floID, token) => new Promise((resolve, reject) => {
getBalance.floID = (floID) => new Promise((resolve, reject) => { getBalance.floID = (floID) => new Promise((resolve, reject) => {
Promise.all([ Promise.all([
DB.query("SELECT SUM(balance) AS balance FROM Cash WHERE floID=?", [floID]), DB.query("SELECT IFNULL(SUM(balance), 0) AS balance FROM Cash WHERE floID=?", [floID]),
DB.query("SELECT asset, SUM(quantity) AS balance FROM Vault WHERE floID=? GROUP BY asset", [floID]) DB.query("SELECT asset, IFNULL(SUM(quantity), 0) AS balance FROM Vault WHERE floID=? GROUP BY asset", [floID])
]).then(result => { ]).then(result => {
let response = { let response = {
floID, floID,
@ -81,7 +81,7 @@ getBalance.floID = (floID) => new Promise((resolve, reject) => {
getBalance.token = (token) => new Promise((resolve, reject) => { getBalance.token = (token) => new Promise((resolve, reject) => {
(token === floGlobals.currency ? (token === floGlobals.currency ?
DB.query("SELECT floID, balance FROM Cash") : DB.query("SELECT floID, balance FROM Cash") :
DB.query("SELECT floID, SUM(quantity) AS balance FROM Vault WHERE asset = ? GROUP BY floID", [token]) DB.query("SELECT floID, IFNULL(SUM(quantity), 0) AS balance FROM Vault WHERE asset = ? GROUP BY floID", [token])
).then(result => { ).then(result => {
let response = { let response = {
token: token, token: token,
@ -95,11 +95,11 @@ getBalance.token = (token) => new Promise((resolve, reject) => {
const getAssetBalance = (floID, asset) => new Promise((resolve, reject) => { const getAssetBalance = (floID, asset) => new Promise((resolve, reject) => {
let promises = (asset === floGlobals.currency) ? [ let promises = (asset === floGlobals.currency) ? [
DB.query("SELECT SUM(balance) AS balance FROM Cash WHERE floID=?", [floID]), DB.query("SELECT IFNULL(SUM(balance), 0) AS balance FROM Cash WHERE floID=?", [floID]),
DB.query("SELECT SUM(quantity*maxPrice) AS locked FROM BuyOrder WHERE floID=?", [floID]) DB.query("SELECT IFNULL(SUM(quantity*maxPrice), 0) AS locked FROM BuyOrder WHERE floID=?", [floID])
] : [ ] : [
DB.query("SELECT SUM(quantity) AS balance FROM Vault WHERE floID=? AND asset=?", [floID, asset]), DB.query("SELECT IFNULL(SUM(quantity), 0) AS balance FROM Vault WHERE floID=? AND asset=?", [floID, asset]),
DB.query("SELECT SUM(quantity) AS locked FROM SellOrder WHERE floID=? AND asset=?", [floID, asset]) DB.query("SELECT IFNULL(SUM(quantity), 0) AS locked FROM SellOrder WHERE floID=? AND asset=?", [floID, asset])
]; ];
Promise.all(promises).then(result => resolve({ Promise.all(promises).then(result => resolve({
total: result[0][0].balance, total: result[0][0].balance,
@ -168,7 +168,7 @@ const checkSellRequirement = (floID, asset) => new Promise((resolve, reject) =>
if (result.length) if (result.length)
return resolve(true); return resolve(true);
//TODO: Should seller need to buy same type of asset before selling? //TODO: Should seller need to buy same type of asset before selling?
DB.query("SELECT SUM(quantity) AS brought FROM TradeTransactions WHERE buyer=? AND asset=?", [floID, asset]).then(result => { DB.query("SELECT IFNULL(SUM(quantity), 0) AS brought FROM TradeTransactions WHERE buyer=? AND asset=?", [floID, asset]).then(result => {
if (result[0].brought >= MINIMUM_BUY_REQUIREMENT) if (result[0].brought >= MINIMUM_BUY_REQUIREMENT)
resolve(true); resolve(true);
else else
@ -223,7 +223,7 @@ function getAccountDetails(floID) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let select = []; let select = [];
select.push(["balance", "Cash"]); select.push(["balance", "Cash"]);
select.push(["asset, AVG(base) AS avg_base, SUM(quantity) AS quantity", "Vault", "GROUP BY asset"]); select.push(["asset, AVG(base) AS avg_base, IFNULL(SUM(quantity), 0) AS quantity", "Vault", "GROUP BY asset"]);
select.push(["id, asset, quantity, minPrice, time_placed", "SellOrder"]); select.push(["id, asset, quantity, minPrice, time_placed", "SellOrder"]);
select.push(["id, asset, quantity, maxPrice, time_placed", "BuyOrder"]); select.push(["id, asset, quantity, maxPrice, time_placed", "BuyOrder"]);
let promises = select.map(a => DB.query(`SELECT ${a[0]} FROM ${a[1]} WHERE floID=? ${a[2] || ""}`, [floID])); let promises = select.map(a => DB.query(`SELECT ${a[0]} FROM ${a[1]} WHERE floID=? ${a[2] || ""}`, [floID]));