LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

updated local sql queries

Browse source
This commit is contained in:
bill bittner 2017-08-16 00:03:26 -07:00
parent bd7c6ed16a
commit 5b87c53aa3
3 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/serveController.js
View file

@ -53,7 +53,7 @@ function getAssetByClaimId (fullClaimId, name) {
// get the claim
lbryApi.getClaim(`${name}#${fullClaimId}`)
.then(getResult => {
// logger.debug('getResult >>', getResult);
logger.debug('getResult >>', getResult);
let fileInfo = formatGetResultsToFileInfo(getResult);
fileInfo['address'] = resolveResult.claim.address;
fileInfo['height'] = resolveResult.claim.height;

35
helpers/serveHelpers.js
View file

@ -94,13 +94,13 @@ module.exports = {
return new Promise((resolve, reject) => {
logger.debug('getting claim_id from short url');
// use the daemon to check for claims list
db.sequelize.query(`SELECT claimId FROM Claim WHERE name = '${name}' AND claimId LIKE '${shortId}%' ORDER BY height ASC LIMIT 1;`)
db.sequelize.query(`SELECT claimId FROM Claim WHERE name = '${name}' AND claimId LIKE '${shortId}%' ORDER BY height ASC LIMIT 1;`, { type: db.sequelize.QueryTypes.SELECT })
.then(result => {
switch (result.length) {
case 0:
return reject(new Error('That is an invalid Short Id'));
default: // note results must be sorted
return resolve(result[0].datavalues.claimId);
return resolve(result[0].claimId);
}
})
.catch(error => {
@ -111,16 +111,13 @@ module.exports = {
getShortIdFromClaimId (claimId, height, name) {
return new Promise((resolve, reject) => {
logger.debug('finding short claim id from full claim id');
db.sequelize.query(`SELECT claimId, height FROM Claim WHERE name = '${name}' ORDER BY claimId;`)
db.sequelize.query(`SELECT claimId, height FROM Claim WHERE name = '${name}' ORDER BY claimId;`, { type: db.sequelize.QueryTypes.SELECT })
.then(result => {
switch (result.length) {
case 0:
return reject(new Error('That is an invalid Claim Id'));
default: // note results must be sorted
const resultsArray = result.map(claim => {
return claim.dataValues;
});
const shortId = determineShortClaimId(claimId, height, resultsArray);
const shortId = determineShortClaimId(claimId, height, result);
logger.debug('short claim id ===', shortId);
return resolve(shortId);
}
@ -132,16 +129,14 @@ module.exports = {
},
getAllFreeClaims (claimName) {
return new Promise((resolve, reject) => {
db.sequelize.query(`SELECT * FROM Claim WHERE name = '${claimName}' ORDER BY amount DESC, height ASC`)
db.sequelize.query(`SELECT * FROM Claim WHERE name = '${claimName}' ORDER BY amount DESC, height ASC`, { type: db.sequelize.QueryTypes.SELECT })
.then(result => {
if (result.length === 0) {
logger.debug('exiting due to lack of claims');
return resolve(null);
switch (result.length) {
case 0:
return resolve(null);
default:
return resolve(result);
}
const claims = result.map(claim => {
return claim.dataValues;
});
return resolve(claims);
})
.catch(error => {
reject(error);
@ -150,12 +145,14 @@ module.exports = {
},
getTopFreeClaim (claimName) {
return new Promise((resolve, reject) => {
db.sequelize.query(`SELECT * FROM Claim WHERE name = '${claimName}' ORDER BY amount DESC, height ASC LIMIT 1`)
db.sequelize.query(`SELECT * FROM Claim WHERE name = '${claimName}' ORDER BY amount DESC, height ASC LIMIT 1`, { type: db.sequelize.QueryTypes.SELECT })
.then(result => {
if (result.length === 0) {
return resolve(null);
switch (result.length) {
case 0:
return resolve(null);
default:
return resolve(result);
}
return resolve(result[0].dataValues);
})
.catch(error => {
reject(error);

2
updateClaimAmount.js
View file

@ -29,7 +29,7 @@ db.sequelize
setTimeout(() => {
lbryApi.resolveUri(uri)
.then(result => {
// console.log(resolveResult);
console.log('resolve worked! :)');
if (result['claim']) {
const amount = result['claim'].amount;
return record.update({ amount });