From 98cb0aaad9ce521ebbf9300cd176a01ef371596d Mon Sep 17 00:00:00 2001 From: Redume Date: Sun, 11 Aug 2024 17:22:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B4=D0=B5=D0=B1=D0=B0=D0=B3=20=D0=BB=D0=BE=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chart/main.js | 9 +++++++-- database/main.js | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/chart/main.js b/chart/main.js index dc6610c..3b75389 100644 --- a/chart/main.js +++ b/chart/main.js @@ -2,6 +2,7 @@ const ChartJSImage = require('chart.js-image'); const pool = require('../database/postgresql.js'); const fs = require('fs'); const request = require('request'); +const logger = require('../logger/main.js') /** * Graph generation @@ -54,8 +55,8 @@ async function gen_chart(from_currency, conv_currency, start_date, end_date) { datasets: [ { label: 'rate', - borderColor: rate[rate.length-2] < rate[rate.length-1] ? 'rgb(24, 218, 39)' : 'rgb(243, 85, 50)', - backgroundColor: rate[rate.length-2] < rate[rate.length-1] ? 'rgb(36, 175, 47)' : 'rgb(218, 56, 24)', + borderColor: rate[0] < rate[rate.length-1] ? 'rgb(24, 218, 39)' : 'rgb(243, 85, 50)', + backgroundColor: rate[0] < rate[rate.length-1] ? 'rgb(36, 175, 47)' : 'rgb(218, 56, 24)', data: rate, borderWidth: 2, }, @@ -82,6 +83,8 @@ async function gen_chart(from_currency, conv_currency, start_date, end_date) { }, }).width(1000).height(1000); + logger.debug(chart.toURL()); + return chart.toURL(); } @@ -95,6 +98,8 @@ function save_chart(url, filename) { if (!fs.existsSync('../charts')) fs.mkdirSync('../charts'); if (!url.startsWith('https://')) throw new Error('The passed parameter is not a URL'); + logger.info(`The schedule has been saved. The path of the graph 'chart/${filename}'`); + request(url).pipe(fs.createWriteStream(`../charts/${filename}`)); } diff --git a/database/main.js b/database/main.js index 650fcb5..373138b 100644 --- a/database/main.js +++ b/database/main.js @@ -1,5 +1,5 @@ const pool = require('./postgresql.js'); - +const logger = require('../logger/main.js'); /** * Getting the currency exchange rate for a specific day @@ -25,6 +25,8 @@ async function getDay(from_currency, conv_currency, date) { let set_date = data['rows'][0]['date'] set_date = new Date(set_date.setDate(set_date.getDate() + 1)); + logger.debug(data['rows'][0]) + return data['rows'][0]; } @@ -56,6 +58,8 @@ async function getPeriod(from_currency, conv_currency, start_date, end_date) { date = new Date(date.setDate(date.getDate() + 1)); } + logger.debug(data['rows']) + return data['rows']; }