[javascript] refactoring

3 files changed, 6 insertions, 4 deletions

diff --git a/nodejs/automation/contracting.js b/nodejs/automation/contracting.js
index 220b21b..75bc96c 100644
--- a/nodejs/automation/contracting.js
+++ b/nodejs/automation/contracting.js
@@ -5,7 +5,7 @@ import * as api from '../lib/api.js';
 import * as contracts from '../lib/contracts.js';
 import * as libShips from '../lib/ships.js';
 import * as systems from '../lib/systems.js';
-import * as utils from './utils.js';
+import * as utils from '../lib/utils.js';
 
 export async function init() {
 	const cs = dbContracts.getContracts();
@@ -14,7 +14,7 @@ export async function init() {
 
 async function run(contract) {
 	await contracts.accept({id: contract.id});
-	const contractSystem = utils.waypointToSystem(contract.terms.deliver[0].destinationSymbol);
+	const contractSystem = utils.systemFromWaypoint(contract.terms.deliver[0].destinationSymbol);
 	let ships = dbShips.getShipsAt(contractSystem);
 	ships = ships.filter(ship => ship.registration.role !== 'SATELLITE'); // filter out probes
 
diff --git a/nodejs/lib/systems.js b/nodejs/lib/systems.js
index e03da6c..fefa5cd 100644
--- a/nodejs/lib/systems.js
+++ b/nodejs/lib/systems.js
@@ -1,9 +1,11 @@
 import * as api from './api.js';
 import * as db from '../database/systems.js';
+import * as utils from './utils.js';
+
 
 // Retrieves a shipyard's information for ctx.symbol
 export async function shipyard(ctx) {
-	const systemSymbol = ctx.symbol.match(/([^-]+-[^-]+)/)[1]; // TODO generalise this extraction
+	const systemSymbol = utils.systemFromWaypoint(ctx.symbol);
 	console.log(systemSymbol);
 	return await api.send({endpoint: `/systems/${systemSymbol}/waypoints/${ctx.symbol}/shipyard`});
 }
diff --git a/nodejs/automation/utils.js b/nodejs/lib/utils.js
index 01ce1ad..1d2e451 100644
--- a/nodejs/automation/utils.js
+++ b/nodejs/lib/utils.js
@@ -1,3 +1,3 @@
-export function waypointToSystem(waypoint) {
+export function systemFromWaypoint(waypoint) {
 	return waypoint.split('-').slice(0,2).join('-');
 }