From a9a12d0dc38d1a85a9abafa58317e689fd7efc05 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Mon, 18 Sep 2023 08:50:24 +0200 Subject: [PATCH] move db to a more accessible folder --- src/server/backend/db/db.js | 14 ++++++------- src/server/backend/db/jsonDataHelper.js | 20 ------------------- src/server/backend/db/jsondb.js | 8 ++++---- src/server/{backend/db => }/data/booked.json | 0 src/server/{backend/db => }/data/db.json | 0 .../{backend/db => }/data/eventDrafts.json | 0 src/server/{backend/db => }/data/events.json | 0 .../{backend/db => }/data/locations.json | 0 .../{backend/db => }/data/rootAccount.json | 0 .../{backend/db => }/data/seatplan.json | 0 src/server/{backend/db => }/data/tickets.json | 0 11 files changed, 11 insertions(+), 31 deletions(-) delete mode 100644 src/server/backend/db/jsonDataHelper.js rename src/server/{backend/db => }/data/booked.json (100%) rename src/server/{backend/db => }/data/db.json (100%) rename src/server/{backend/db => }/data/eventDrafts.json (100%) rename src/server/{backend/db => }/data/events.json (100%) rename src/server/{backend/db => }/data/locations.json (100%) rename src/server/{backend/db => }/data/rootAccount.json (100%) rename src/server/{backend/db => }/data/seatplan.json (100%) rename src/server/{backend/db => }/data/tickets.json (100%) diff --git a/src/server/backend/db/db.js b/src/server/backend/db/db.js index b833723..1867413 100644 --- a/src/server/backend/db/db.js +++ b/src/server/backend/db/db.js @@ -105,7 +105,7 @@ module.exports.checkDataAvailability = ( db, column, searchQuery ) => { module.exports.getJSONData = ( file ) => { return new Promise( ( resolve, reject ) => { - fs.readFile( path.join( __dirname + '/data/' + file + '.json' ), ( error, data ) => { + fs.readFile( path.join( __dirname + '/../../data/' + file + '.json' ), ( error, data ) => { if ( error ) { reject( 'Error occurred: Error trace: ' + error ); } else { @@ -121,7 +121,7 @@ module.exports.getJSONData = ( file ) => { module.exports.getJSONDataSimple = ( file, identifier ) => { return new Promise( ( resolve, reject ) => { - fs.readFile( path.join( __dirname + '/data/' + file + '.json' ), ( error, data ) => { + fs.readFile( path.join( __dirname + '/../../data/' + file + '.json' ), ( error, data ) => { if ( error ) { reject( 'Error occurred: Error trace: ' + error ); } else { @@ -141,7 +141,7 @@ module.exports.getJSONDataSync = ( file ) => { module.exports.writeJSONDataSimple = ( db, identifier, values ) => { return new Promise( ( resolve, reject ) => { - fs.readFile( path.join( __dirname + '/data/' + db + '.json' ), ( error, data ) => { + fs.readFile( path.join( __dirname + '/../../data/' + db + '.json' ), ( error, data ) => { if ( error ) { reject( 'Error occurred: Error trace: ' + error ); } else { @@ -150,7 +150,7 @@ module.exports.writeJSONDataSimple = ( db, identifier, values ) => { dat = JSON.parse( data ) ?? {}; } dat[ identifier ] = values; - fs.writeFile( path.join( __dirname + '/data/' + db + '.json' ), JSON.stringify( dat ), ( error ) => { + fs.writeFile( path.join( __dirname + '/../../data/' + db + '.json' ), JSON.stringify( dat ), ( error ) => { if ( error ) { reject( 'Error occurred: Error trace: ' + error ); } @@ -163,7 +163,7 @@ module.exports.writeJSONDataSimple = ( db, identifier, values ) => { module.exports.writeJSONData = ( db, data ) => { return new Promise( ( resolve, reject ) => { - fs.writeFile( path.join( __dirname + '/data/' + db + '.json' ), JSON.stringify( data ), ( error ) => { + fs.writeFile( path.join( __dirname + '/../../data/' + db + '.json' ), JSON.stringify( data ), ( error ) => { if ( error ) { reject( 'Error occurred: Error trace: ' + error ); } else { @@ -175,7 +175,7 @@ module.exports.writeJSONData = ( db, data ) => { module.exports.deleteJSONDataSimple = ( db, identifier ) => { return new Promise( ( resolve, reject ) => { - fs.readFile( path.join( __dirname + '/data/' + db + '.json' ), ( error, data ) => { + fs.readFile( path.join( __dirname + '/../../data/' + db + '.json' ), ( error, data ) => { if ( error ) { reject( 'Error occurred: Error trace: ' + error ); } else { @@ -184,7 +184,7 @@ module.exports.deleteJSONDataSimple = ( db, identifier ) => { dat = JSON.parse( data ) ?? {}; } delete dat[ identifier ]; - fs.writeFile( path.join( __dirname + '/data/' + db + '.json' ), JSON.stringify( dat ), ( error ) => { + fs.writeFile( path.join( __dirname + '/../../data/' + db + '.json' ), JSON.stringify( dat ), ( error ) => { if ( error ) { reject( 'Error occurred: Error trace: ' + error ); } diff --git a/src/server/backend/db/jsonDataHelper.js b/src/server/backend/db/jsonDataHelper.js deleted file mode 100644 index ea7e50c..0000000 --- a/src/server/backend/db/jsonDataHelper.js +++ /dev/null @@ -1,20 +0,0 @@ -/* -* libreevent - jsonDataHelper.js -* -* Created by Janis Hutz 07/16/2023, Licensed under the GPL V3 License -* https://janishutz.com, development@janishutz.com -* -* -*/ - -// IMPORTANT: Do not use this helper in any other context than in the jsondb.js file! -// It is specifically designed for that thing and therefore doesn't use any unnecessary resources! - - -class DataHelper { - constructor () { - - } -} - -module.exports = DataHelper; \ No newline at end of file diff --git a/src/server/backend/db/jsondb.js b/src/server/backend/db/jsondb.js index 6f0ba5f..91bb23b 100644 --- a/src/server/backend/db/jsondb.js +++ b/src/server/backend/db/jsondb.js @@ -21,7 +21,7 @@ class JSONDB { connect () { let data = {}; try { - JSON.parse( fs.readFileSync( path.join( __dirname + '/data/db.json' ) ) ); + JSON.parse( fs.readFileSync( path.join( __dirname + '/../../data/db.json' ) ) ); } catch ( err ) { console.error( '[ JSON-DB ] CRITICAL INITIALIZATION FAILURE!' + err ); throw ( 'JSONDB failed to start!' ); @@ -44,7 +44,7 @@ class JSONDB { } save () { - fs.writeFile( path.join( __dirname + '/data/db.json' ), JSON.stringify( { 'db': this.db, 'index': this.dbIndex } ), ( err ) => { + fs.writeFile( path.join( __dirname + '/../../data/db.json' ), JSON.stringify( { 'db': this.db, 'index': this.dbIndex } ), ( err ) => { if ( err ) console.error( '[ JSON-DB ] An error occurred during saving: ' + err ); this.isSaving = false; if ( this.awaitingSaving ) { @@ -56,13 +56,13 @@ class JSONDB { async resetDB () { this.db = { 'libreevent_temp': {}, 'libreevent_admin': {}, 'libreevent_orders': {}, 'libreevent_users': {} }; this.dbIndex = { 'libreevent_temp': 0, 'libreevent_admin': 0, 'libreevent_orders': 0, 'libreevent_users': 0 }; - fs.writeFile( path.join( __dirname + '/data/db.json' ), JSON.stringify( { 'db': this.db, 'index': this.dbIndex } ) ); + fs.writeFile( path.join( __dirname + '/../../data/db.json' ), JSON.stringify( { 'db': this.db, 'index': this.dbIndex } ) ); } async setupDB () { this.db = { 'libreevent_temp': {}, 'libreevent_admin': {}, 'libreevent_orders': {}, 'libreevent_users': {} }; this.dbIndex = { 'libreevent_temp': 0, 'libreevent_admin': 0, 'libreevent_orders': 0, 'libreevent_users': 0 }; - fs.writeFile( path.join( __dirname + '/data/db.json' ), JSON.stringify( { 'db': this.db, 'index': this.dbIndex } ) ); + fs.writeFile( path.join( __dirname + '/../../data/db.json' ), JSON.stringify( { 'db': this.db, 'index': this.dbIndex } ) ); } query ( operation, table ) { diff --git a/src/server/backend/db/data/booked.json b/src/server/data/booked.json similarity index 100% rename from src/server/backend/db/data/booked.json rename to src/server/data/booked.json diff --git a/src/server/backend/db/data/db.json b/src/server/data/db.json similarity index 100% rename from src/server/backend/db/data/db.json rename to src/server/data/db.json diff --git a/src/server/backend/db/data/eventDrafts.json b/src/server/data/eventDrafts.json similarity index 100% rename from src/server/backend/db/data/eventDrafts.json rename to src/server/data/eventDrafts.json diff --git a/src/server/backend/db/data/events.json b/src/server/data/events.json similarity index 100% rename from src/server/backend/db/data/events.json rename to src/server/data/events.json diff --git a/src/server/backend/db/data/locations.json b/src/server/data/locations.json similarity index 100% rename from src/server/backend/db/data/locations.json rename to src/server/data/locations.json diff --git a/src/server/backend/db/data/rootAccount.json b/src/server/data/rootAccount.json similarity index 100% rename from src/server/backend/db/data/rootAccount.json rename to src/server/data/rootAccount.json diff --git a/src/server/backend/db/data/seatplan.json b/src/server/data/seatplan.json similarity index 100% rename from src/server/backend/db/data/seatplan.json rename to src/server/data/seatplan.json diff --git a/src/server/backend/db/data/tickets.json b/src/server/data/tickets.json similarity index 100% rename from src/server/backend/db/data/tickets.json rename to src/server/data/tickets.json