From a2221478838566dff8cacc864666d8f804da2290 Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Sun, 6 Jun 2021 12:01:33 +0200 Subject: [PATCH] fix: db path --- server/src/app.js | 3 +-- server/src/controllers/ontimeController.js | 12 ++++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/server/src/app.js b/server/src/app.js index d415bef0a..944903f2d 100644 --- a/server/src/app.js +++ b/server/src/app.js @@ -4,7 +4,6 @@ import { config } from './config/config.js'; // init database import { Low, JSONFile } from 'lowdb'; -import { join } from 'path'; import path from 'path'; import { fileURLToPath } from 'url'; const __filename = fileURLToPath(import.meta.url); @@ -12,7 +11,7 @@ const __dirname = path.dirname(__filename); const env = process.env.NODE_ENV || 'prod'; -const file = join(__dirname, 'data/', config.database.filename); +const file = path.join(__dirname, 'data/', config.database.filename); const adapter = new JSONFile(file); export const db = new Low(adapter); diff --git a/server/src/controllers/ontimeController.js b/server/src/controllers/ontimeController.js index 2d74bb73f..981d6265e 100644 --- a/server/src/controllers/ontimeController.js +++ b/server/src/controllers/ontimeController.js @@ -1,6 +1,9 @@ +import fs from 'fs'; +import path from 'path'; +import { fileURLToPath } from 'url'; + // get database import { db, data } from '../app.js'; -import fs from 'fs'; import { event as eventDef, delay as delayDef, @@ -8,6 +11,9 @@ import { } from '../data/eventsDefinition.js'; import { dbModel } from '../data/dataModel.js'; +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); + function getEventTitle() { return data.event.title; } @@ -82,7 +88,9 @@ async function parsev1(jsonData) { // Returns - export const dbDownload = async (req, res) => { const fileTitle = getEventTitle() || 'ontime events'; - res.download('db.json', `${fileTitle}.json`, (err) => { + const dbFile = path.resolve(__dirname, '../', 'data/db.json'); + + res.download(dbFile, `${fileTitle}.json`, (err) => { if (err) { res.status(500).send({ message: 'Could not download the file. ' + err,