UpNext.md

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

nginx-proxy-docker/nginx.conf

@@ -35,17 +35,10 @@ http {
         }
 
         location /api/ {
-            proxy_pass http://localhost:8460;
+                proxy_pass http://localhost:8460;
-            proxy_cache_key $scheme://$host$uri$is_args$query_string;
+                proxy_cache_key $scheme://$host$uri$is_args$query_string;
-            proxy_ignore_headers Cache-Control;
+                proxy_ignore_headers Cache-Control;
-            proxy_cache_valid 200 1m;
+                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;
-        }
     }
 }

src/services/dbAccess.services.js

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

src/services/ldb.services.js

@@ -8,6 +8,7 @@
 //  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')
 

src/services/list.services.js

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