adyxax/spacetraders
1
0
Fork 0
Code Issues Activity

[javascript] refactored ships and systems database interface

Browse source
This commit is contained in:
Julien Dessaux 2023-09-03 23:01:18 +02:00
parent e03bb90611
commit f89af1145d
Signed by: adyxax
GPG key ID: F92E51B86E07177E
3 changed files with 40 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nodejs/database/002_ships.sql
View file

@ -1,6 +1,5 @@
CREATE TABLE ships ( CREATE TABLE ships (
id INTEGER PRIMARY KEY, id INTEGER PRIMARY KEY,
data JSON NOT NULL, data JSON NOT NULL
updated DATE DEFAULT NULL
); );
CREATE UNIQUE INDEX ships_data_symbol ON ships (json_extract(data, '$.symbol')); CREATE UNIQUE INDEX ships_data_symbol ON ships (json_extract(data, '$.symbol'));

84
nodejs/database/ships.js
View file

@ -1,82 +1,48 @@
import db from './db.js'; import db from './db.js';
const addShipStatement = db.prepare(`INSERT INTO ships(data) VALUES (json(?));`);
const getShipStatement = db.prepare(`SELECT data FROM ships WHERE data->>'symbol' = ?;`); const getShipStatement = db.prepare(`SELECT data FROM ships WHERE data->>'symbol' = ?;`);
const setShipStatement = db.prepare(`INSERT INTO ships(data, updated) VALUES (json(?), ?);`); const setShipCargoStatement = db.prepare(`UPDATE ships SET data = (SELECT json_set(data, '$.cargo', json(:cargo)) FROM ships WHERE data->>'symbol' = :symbol) WHERE data->>'symbol' = :symbol;`);
const setShipCargoStatement = db.prepare(`UPDATE ships SET data = (SELECT json_set(data, '$.cargo', json(:cargo)) FROM ships WHERE data->>'symbol' = :symbol), updated = :date WHERE data->>'symbol' = :symbol;`); const setShipFuelStatement = db.prepare(`UPDATE ships SET data = (SELECT json_set(data, '$.fuel', json(:fuel)) FROM ships WHERE data->>'symbol' = :symbol) WHERE data->>'symbol' = :symbol;`);
const setShipFuelStatement = db.prepare(`UPDATE ships SET data = (SELECT json_set(data, '$.fuel', json(:fuel)) FROM ships WHERE data->>'symbol' = :symbol), updated = :date WHERE data->>'symbol' = :symbol;`); const setShipNavStatement = db.prepare(`UPDATE ships SET data = (SELECT json_set(data, '$.nav', json(:nav)) FROM ships WHERE data->>'symbol' = :symbol) WHERE data->>'symbol' = :symbol;`);
const setShipNavStatement = db.prepare(`UPDATE ships SET data = (SELECT json_set(data, '$.nav', json(:nav)) FROM ships WHERE data->>'symbol' = :symbol), updated = :date WHERE data->>'symbol' = :symbol;`); const updateShipStatement = db.prepare(`UPDATE ships SET data = json(:data) WHERE data->>'symbol' = :symbol;`);
const updateShipStatement = db.prepare(`UPDATE ships SET data = json(:data), updated = :date WHERE data->>'symbol' = :symbol;`);
export function getShip(symbol) { export function getShip(symbol) {
try { const data = getShipStatement.get(symbol);
const data = getShipStatement.get(symbol); if (data === undefined) {
if (data === undefined) {
return null;
}
return JSON.parse(data.data);
} catch (err) {
console.log(err);
return null; return null;
} }
return JSON.parse(data.data);
} }
export function setShip(data) { export function setShip(data) {
if (getShip(data.symbol) === null) { if (getShip(data.symbol) === null) {
try { return addShipStatement.run(JSON.stringify(data)).lastInsertRowid;
return setShipStatement.run(JSON.stringify(data), new Date().toISOString()).lastInsertRowid;
} catch (err) {
console.log(err);
return null;
}
} else { } else {
try { return updateShipStatement.run({
return updateShipStatement.run({ data: JSON.stringify(data),
data: JSON.stringify(data), symbol: data.symbol,
date: new Date().toISOString(), }).changes;
symbol: data.symbol,
}).changes;
} catch (err) {
console.log(err);
return null;
}
} }
} }
export function setShipCargo(symbol, cargo) { export function setShipCargo(symbol, cargo) {
try { return setShipCargoStatement.run({
setShipCargoStatement.run({ cargo: JSON.stringify(cargo),
cargo: JSON.stringify(cargo), symbol: symbol,
date: new Date().toISOString(), }).changes;
symbol: symbol,
}).changes;
} catch (err) {
console.log(err);
return null;
}
} }
export function setShipFuel(symbol, fuel) { export function setShipFuel(symbol, fuel) {
try { return setShipFuelStatement.run({
setShipFuelStatement.run({ fuel: JSON.stringify(fuel),
date: new Date().toISOString(), symbol: symbol,
fuel: JSON.stringify(fuel), }).changes;
symbol: symbol,
}).changes;
} catch (err) {
console.log(err);
return null;
}
} }
export function setShipNav(symbol, nav) { export function setShipNav(symbol, nav) {
try { return setShipNavStatement.run({
setShipNavStatement.run({ nav: JSON.stringify(nav),
date: new Date().toISOString(), symbol: symbol,
nav: JSON.stringify(nav), }).changes;
symbol: symbol,
}).changes;
} catch (err) {
console.log(err);
return null;
}
} }

65
nodejs/database/systems.js
View file

@ -1,71 +1,34 @@
import db from './db.js'; import db from './db.js';
const addSystemStatement = db.prepare(`INSERT INTO systems(data) VALUES (json(?));`);
const getSystemStatement = db.prepare(`SELECT data FROM systems WHERE data->>'symbol' = ?;`); const getSystemStatement = db.prepare(`SELECT data FROM systems WHERE data->>'symbol' = ?;`);
const getSystemUpdatedStatement = db.prepare(`SELECT updated FROM systems WHERE data->>'symbol' = ?;`); const getSystemUpdatedStatement = db.prepare(`SELECT updated FROM systems WHERE data->>'symbol' = ?;`);
const initStatement = db.prepare(`INSERT INTO config(key, value) VALUES ('systems_initialized', TRUE);`);
const isInitStatement = db.prepare(`SELECT value FROM config WHERE key = 'systems_initialized'`);
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 data->>'symbol' = :symbol), updated = :date WHERE data->>'symbol' = :symbol;`); const setSystemWaypointsStatement = db.prepare(`UPDATE systems SET data = (SELECT json_set(data, '$.waypoints', json(:waypoints)) FROM systems WHERE data->>'symbol' = :symbol), updated = :date WHERE data->>'symbol' = :symbol;`);
export function init() { export function addSystem(data) {
try { return addSystemStatement.run(JSON.stringify(data)).lastInsertRowid;
return initStatement.run().lastInsertRowid;
} catch (err) {
return null;
}
}
export function isInit() {
try {
return isInitStatement.get().value === '1';
} catch (err) {
return false;
}
} }
export function getSystem(symbol) { export function getSystem(symbol) {
try { const data = getSystemStatement.get(symbol);
const data = getSystemStatement.get(symbol); if (data === undefined) {
if (data === undefined) {
return null;
}
return JSON.parse(data.data);
} catch (err) {
console.log(err);
return null; return null;
} }
return JSON.parse(data.data);
} }
export function getSystemUpdated(symbol) { export function getSystemUpdated(symbol) {
try { const updated = getSystemUpdatedStatement.get(symbol);
const updated = getSystemUpdatedStatement.get(symbol); if (updated === undefined) {
if (updated === undefined) {
return null;
}
return updated.updated;
} catch (err) {
console.log(err);
return null;
}
}
export function setSystem(data) {
try {
return setSystemStatement.run(JSON.stringify(data)).lastInsertRowid;
} catch (err) {
return null; return null;
} }
return updated.updated;
} }
export function setSystemWaypoints(symbol, waypoints) { export function setSystemWaypoints(symbol, waypoints) {
try { return setSystemWaypointsStatement.run({
return setSystemWaypointsStatement.run({ date: new Date().toISOString(),
date: new Date().toISOString(), symbol: symbol,
symbol: symbol, waypoints: JSON.stringify(waypoints),
waypoints: JSON.stringify(waypoints), }).changes;
}).changes;
} catch (err) {
console.log(err);
return null;
}
} }