Compare commits

..

3 Commits

Author SHA1 Message Date
Fred Boniface d8d2799145 Adjust comments and notes 2023-01-11 13:59:22 +00:00
Fred Boniface dc4c50efc6 Update proxy cache time for list API 2023-01-11 13:35:55 +00:00
Fred Boniface dac9adf666 list.services now queries DB 2023-01-11 13:34:24 +00:00
5 changed files with 25 additions and 14 deletions

View File

@ -1,3 +1,3 @@
# What to do next:
* Ensure existing 'meta' entries are updated and new entries aren't made.
* LDB to lookup and validate CRS or convert TIPLOC/STANOX to CRS before fetch.

View File

@ -40,5 +40,12 @@ http {
proxy_ignore_headers Cache-Control;
proxy_cache_valid 200 1m;
}
location /api/v1/list/ {
proxy_pass http://localhost:8460;
proxy_cache_key $scheme://$host$uri$is_args$query_string;
proxy_ignore_headers Cache-Control;
proxy_cache_valid 200 1440m;
}
}
}

View File

@ -75,9 +75,10 @@ async function updateMeta(type, target, unixTime){
async function query(collection, query){
await client.connect();
let qcoll = db.collection(collection);
let qcursor = qcoll.find(query)
let qresult = await qcursor.toArray();
var qcoll = db.collection(collection);
var qcursor = qcoll.find(query)
qcursor.project({_id: 0})
var qresult = await qcursor.toArray();
return qresult;
}

View File

@ -8,7 +8,6 @@
// convertTiploc(TIPLOC) : Exported: Looks up CRS, Name & STANOX for Tiploc
const log = require('../utils/log.utils'); // Log Helper
const ldb = require('ldbs-json')
const util = require('../utils/ldb.utils')

View File

@ -1,13 +1,17 @@
const log = require('../utils/log.utils'); // Log Helper
const db = require('../services/dbAccess.services')
const corpus = require('../services/corpus.services');
async function getStations(){
// Databse lookup, get list of all stations as per the Python script output
return {state:"No can do, not fully implemented."};
var out = await db.query("stations")
log.out(`listServices.getStations: fetched stations list`)
return out;
}
async function getCorpus(){
// Raw corpus data, currently fetches from Network Rail each time its called
return corpus.get();
var out = await db.query("corpus")
log.out(`listServices.getCorpus: fetched CORPUS list`)
return out;
}
module.exports = {