Another big refactoring

2 files changed, 8 insertions, 8 deletions

diff --git a/database/config.js b/database/config.js
index 6db856e..4a86cb6 100644
--- a/database/config.js
+++ b/database/config.js
@@ -1,20 +1,20 @@
 import db from './db.js';
 
-const getTokenStatement = db.prepare(`SELECT value from config where key = 'token';`);
-const registerAgentStatement = db.prepare(`INSERT INTO config(key, value) VALUES ('symbol', ?), ('faction', ?), ('token', ?);`);
+const getTokenStatement = db.prepare(`SELECT json_extract(value, '$.token') as token from config where key = 'register_data';`);
+const registerAgentStatement = db.prepare(`INSERT INTO config(key, value) VALUES ('register_data', json(?));`);
 
 export function getToken() {
 	try {
-		return getTokenStatement.get().value;
+		return getTokenStatement.get().token;
 	} catch (err) {
 		console.log(err);
 		return null;
 	}
 }
 
-export function registerAgent(symbol, faction, token) {
+export function registerAgent(data) {
 	try {
-		registerAgentStatement.run(symbol, faction, token);
+		registerAgentStatement.run(JSON.stringify(data));
 		return true;
 	} catch (err) {
 		console.log(err);
diff --git a/database/systems.js b/database/systems.js
index e3822d3..337126c 100644
--- a/database/systems.js
+++ b/database/systems.js
@@ -1,7 +1,7 @@
 import db from './db.js';
 
-const getSystemStatement = db.prepare(`SELECT data from systems where json_extract(data, '$.symbol') = ?;`);
-const getSystemUpdatedStatement = db.prepare(`SELECT updated from systems where json_extract(data, '$.symbol') = ?;`);
+const getSystemStatement = db.prepare(`SELECT data FROM systems WHERE json_extract(data, '$.symbol') = ?;`);
+const getSystemUpdatedStatement = db.prepare(`SELECT updated FROM systems WHERE json_extract(data, '$.symbol') = ?;`);
 const setSystemStatement = db.prepare(`INSERT INTO systems(data) VALUES (json(?));`);
 const setSystemWaypointsStatement = db.prepare(`UPDATE systems SET data = (SELECT json_set(data, '$.waypoints', json(:waypoints)) FROM systems WHERE json_extract(data, '$.symbol') = :symbol), updated = :date WHERE json_extract(data, '$.symbol') = :symbol;`);
 
@@ -61,7 +61,7 @@ export function setSystemWaypoints(symbol, waypoints) {
 			date: new Date().toISOString(),
 			symbol: symbol,
 			waypoints: JSON.stringify(waypoints),
-		});
+		}).changes;
 	} catch (err) {
 		console.log(err);
 		return null;