mirror of
https://github.com/Redume/Kekkai.git
synced 2025-02-23 20:51:25 +03:00
добавлен новый query параметр, теперь четко выводится данные по отдельной паре, а не по всем возможным
This commit is contained in:
parent
0f71d120b8
commit
aea5cd13a0
1 changed files with 10 additions and 7 deletions
17
main.js
17
main.js
|
@ -8,16 +8,17 @@ const config = yaml.parse(fs.readFileSync("./config.yaml", "utf-8"));
|
||||||
const saveRate = require('./utils/saveRate.js');
|
const saveRate = require('./utils/saveRate.js');
|
||||||
const response = require('./utils/errorResponse');
|
const response = require('./utils/errorResponse');
|
||||||
|
|
||||||
|
saveRate()
|
||||||
schedule.scheduleJob('30 8 * * *', async function () {
|
schedule.scheduleJob('30 8 * * *', async function () {
|
||||||
console.log('I save the currency data');
|
console.log('I save the currency data');
|
||||||
await saveRate();
|
await saveRate();
|
||||||
});
|
});
|
||||||
|
|
||||||
fastify.get('/api/getRate/', async function (req, reply) {
|
fastify.get('/api/getRate/', async function (req, reply) {
|
||||||
if (!req['query']?.['codeCurrency']) return response(
|
if (!req['query']?.['fromCurrency'] || !req['query']?.['convCurrency']) return response(
|
||||||
400,
|
400,
|
||||||
'error',
|
'error',
|
||||||
'codeCurrency parameter is required'
|
'fromCurrency and convCurrency parameter is required'
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!req['query']?.['periodStart']) return response(
|
if (!req['query']?.['periodStart']) return response(
|
||||||
|
@ -26,8 +27,9 @@ fastify.get('/api/getRate/', async function (req, reply) {
|
||||||
'periodStart parameter is required'
|
'periodStart parameter is required'
|
||||||
);
|
);
|
||||||
|
|
||||||
let data = await pool.query('SELECT * FROM currency WHERE from_currency = $1 AND date = $2', [
|
let data = await pool.query('SELECT * FROM currency WHERE from_currency = $1 AND conv_currency = $2 AND date = $3', [
|
||||||
req['query']['codeCurrency'],
|
req['query']['fromCurrency'],
|
||||||
|
req['query']['convCurrency'],
|
||||||
req['query']['periodStart'],
|
req['query']['periodStart'],
|
||||||
]).then(response('error', 500, 'Internal Server Error'));
|
]).then(response('error', 500, 'Internal Server Error'));
|
||||||
|
|
||||||
|
@ -38,8 +40,9 @@ fastify.get('/api/getRate/', async function (req, reply) {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (req['query']?.['periodEnd']) {
|
if (req['query']?.['periodEnd']) {
|
||||||
let data = await pool.query('SELECT * FROM currency WHERE (date BETWEEN $2 AND $3) AND from_currency = $1', [
|
let data = await pool.query('SELECT * FROM currency WHERE (date BETWEEN $3 AND $4) AND from_currency = $1 AND conv_currency = $2', [
|
||||||
req['query']['codeCurrency'],
|
req['query']['fromCurrency'],
|
||||||
|
req['query']['convCurrency'],
|
||||||
req['query']['periodStart'],
|
req['query']['periodStart'],
|
||||||
req['query']['periodEnd'],
|
req['query']['periodEnd'],
|
||||||
]);
|
]);
|
||||||
|
@ -47,7 +50,7 @@ fastify.get('/api/getRate/', async function (req, reply) {
|
||||||
return data['rows'];
|
return data['rows'];
|
||||||
}
|
}
|
||||||
|
|
||||||
return data['rows'];
|
return data['rows'][0];
|
||||||
});
|
});
|
||||||
|
|
||||||
fastify.listen({
|
fastify.listen({
|
||||||
|
|
Loading…
Add table
Reference in a new issue