From 0f0f8eb590b465f2f05511094f8eb091661dcf8c Mon Sep 17 00:00:00 2001 From: Timo John Date: Tue, 16 Jun 2020 00:05:33 +0200 Subject: [PATCH] Moved files to /util --- backend/app.js | 7 +- backend/index.js | 4 +- backend/models/handleClimateUpdate.js | 3 +- backend/models/mysql.js | 92 ------------------------ backend/{models => util}/base64.js | 0 backend/{models => util}/dbConnection.js | 0 backend/{models => util}/score.js | 0 backend/{models => util}/transformer.js | 0 8 files changed, 6 insertions(+), 100 deletions(-) delete mode 100644 backend/models/mysql.js rename backend/{models => util}/base64.js (100%) rename backend/{models => util}/dbConnection.js (100%) rename backend/{models => util}/score.js (100%) rename backend/{models => util}/transformer.js (100%) diff --git a/backend/app.js b/backend/app.js index bf64f60..fce8faa 100644 --- a/backend/app.js +++ b/backend/app.js @@ -1,10 +1,9 @@ const express = require('express') const moment = require('moment') const _ = require('lodash') -const db = require('./models/mysql') -const score = require('./models/score') -const transformer = require('./models/transformer') -const base = require('./models/base64') +const score = require('./util/score') +const transformer = require('./util/transformer') +const base = require('./util/base64') const app = express() diff --git a/backend/index.js b/backend/index.js index 79a8e00..3deea01 100644 --- a/backend/index.js +++ b/backend/index.js @@ -2,10 +2,10 @@ const express = require("express"); const bodyParser = require("body-parser"); const path = require("path"); const morgan = require("morgan"); -const dbConnection = require("./models/dbConnection"); +const dbConnection = require("./util/dbConnection"); const fs = require("fs"); const httpolyglot = require("httpolyglot"); -const env = require('dotenv').config() +require('dotenv').config() // credentials const port = process.env.PORT diff --git a/backend/models/handleClimateUpdate.js b/backend/models/handleClimateUpdate.js index af7a5cb..599646b 100644 --- a/backend/models/handleClimateUpdate.js +++ b/backend/models/handleClimateUpdate.js @@ -3,7 +3,6 @@ const axios = require('axios') const rangeStartDate = '2010-01' // If no date is given, this date will be used as startDate const rangeEndDate = '2018-12'// If no date is given, this date will be used as endDate -// module.exports = async (dbConn, startDate = rangeStartDate, endDate = rangeEndDate) => { console.log('update climate with:', startDate, endDate); @@ -14,7 +13,7 @@ module.exports = async (dbConn, startDate = rangeStartDate, endDate = rangeEndDa await writeToDatabase(dbConn, final2) - const res = 'database update complete. see backend logs for info.' + const res = 'region_climate update complete. see backend logs for info.' console.log(res) return res diff --git a/backend/models/mysql.js b/backend/models/mysql.js deleted file mode 100644 index 7d954a0..0000000 --- a/backend/models/mysql.js +++ /dev/null @@ -1,92 +0,0 @@ -var mysql = require('mysql2/promise'); -require('dotenv').config() - -// var connection = mysql.createConnection({ -// host: process.env.DB_HOST, -// user: process.env.DB_USER, -// password: process.env.DB_PASSWORD, -// port: process.env.DB_PORT, -// database: 'travopti' -// }); - -const pool = mysql.createPool({ - connectionLimit: 10, - host: process.env.DB_HOST, - user: process.env.DB_USER, - password: process.env.DB_PASSWORD, - port: process.env.DB_PORT, - database: 'travopti', - // typeCast: function (field, next) { - // if (field.type == "INT") { - // var value = field.string(); - // return (value === null) ? null : Number(value); - // } - // return next(); - // } - decimalNumbers: true -}); - -pool.getConnection() - .then(function (connection) { - console.log(`Connected to database: ${process.env.DB_HOST}`); - //pool.releaseConnection(connection) - }) - .catch(function (error) { - console.error(error.message); - }); - -module.exports = pool; - -// let travoptidb = {} -// travoptidb.all = () => { -// return new Promise((resolve, reject) => { -// pool.query(`SELECT * FROM regions`, (err, results) => { -// if (err) { -// return reject(err) -// } -// return resolve(results) -// }) -// }) -// } - -// connection.connect((err) => { -// if (err) throw err; -// console.log('Database connected!') -// }); - - -// exports.getRegions = () => { -// let sql = `SELECT * FROM regions`; -// console.log(connection.state) -// if (connection.state === 'disconnected') { -// setTimeout(() => console.log('waiting...'), 1000); -// } -// console.log('executed') -// let res = {} -// connection.query(sql, (error, results, fields) => { -// if (error) { -// return console.error(error.message); -// } -// console.log('innercallback(1)') -// res = results[0] -// }); -// console.log('outsidecallback(2)') -// return res; -// } - -// exports.getBYTdata = () => { -// connection.query(`SELECT * FROM regions_byt`, (error, results, fields) => { -// if (error) { -// return console.error(error.message); -// } -// console.log(results[0]) -// nres = results.map((obj) => { -// return obj.region -// }) -// //console.log(nres); -// }); -// } - -// exports.end = () => connection.end(); - -// module.exports = connection; diff --git a/backend/models/base64.js b/backend/util/base64.js similarity index 100% rename from backend/models/base64.js rename to backend/util/base64.js diff --git a/backend/models/dbConnection.js b/backend/util/dbConnection.js similarity index 100% rename from backend/models/dbConnection.js rename to backend/util/dbConnection.js diff --git a/backend/models/score.js b/backend/util/score.js similarity index 100% rename from backend/models/score.js rename to backend/util/score.js diff --git a/backend/models/transformer.js b/backend/util/transformer.js similarity index 100% rename from backend/models/transformer.js rename to backend/util/transformer.js