Port kube.services to TS

Signed-off-by: Fred Boniface <fred@fjla.uk>

src/services/find.services.js

@@ -1,63 +0,0 @@
-// Parse and return a find request
-
-const db = require("../services/dbAccess.services");
-const san = require("../utils/sanitizer.utils");
-/*
-import { query } from "../services/dbAccess.services";
-import { cleanApiEndpointTxt, cleanApiEndpointNum } from "../utils/sanitizer.utils";
-*/
-import { logger } from "../utils/logger.utils";
-
-// DB Query: query(collection, query)
-
-// Define collection as all queries are for the "corpus" collection.
-const col = "corpus";
-
-async function name(id) {
-  logger.debug(`findServices.name: Finding station name: ${id}`);
-  var name = san.cleanApiEndpointTxt(id.toUpperCase());
-  let query = { NLCDESC: name };
-  //var data = await db.query(col,query)
-  return await db.query(col, query);
-}
-
-async function crs(id) {
-  logger.debug(`findServices.crs: Finding crs: ${id}`);
-  var crs = san.cleanApiEndpointTxt(id.toUpperCase());
-  let query = { "3ALPHA": crs };
-  //var data = await db.query(col,query)
-  return await db.query(col, query);
-}
-
-async function nlc(id) {
-  logger.debug(`findServices.nlc: Finding nlc: ${id}`);
-  var nlc = san.cleanApiEndpointNum(id);
-  let query = { NLC: parseInt(nlc) };
-  logger.trace(`findServices.nlc: NLC Converted to int: ${query}`);
-  //var data = await db.query(col,query)
-  return await db.query(col, query);
-}
-
-async function tiploc(id) {
-  logger.debug(`findServices.tiploc: Finding tiploc: ${id}`);
-  var tiploc = san.cleanApiEndpointTxt(id.toUpperCase());
-  let query = { TIPLOC: tiploc };
-  //var data = await db.query(col,query)
-  return await db.query(col, query);
-}
-
-async function stanox(id) {
-  logger.debug(`findServices.stanox: Finding stanox: ${id}`);
-  var stanox = san.cleanApiEndpointNum(id);
-  let query = { STANOX: String(stanox) };
-  //var data = await db.query(col,query)
-  return await db.query(col, query);
-}
-
-module.exports = {
-  name,
-  crs,
-  nlc,
-  tiploc,
-  stanox,
-};

src/services/find.services.ts

@@ -0,0 +1,52 @@
+// Parse and return a find request
+
+import { query } from "../services/dbAccess.services";
+import { cleanApiEndpointTxt, cleanApiEndpointNum } from "../utils/sanitizer.utils";
+import { logger } from "../utils/logger.utils";
+
+// Define collection as all queries are for the "corpus" collection.
+const col: string = "corpus";
+
+async function name(id: string) {
+  logger.debug(`findServices.name: Finding station name: ${id}`);
+  var name = cleanApiEndpointTxt(id.toUpperCase());
+  let queryObj = { NLCDESC: name };
+  return await query(col, queryObj);
+}
+
+async function crs(id: string) {
+  logger.debug(`findServices.crs: Finding crs: ${id}`);
+  var crs = cleanApiEndpointTxt(id.toUpperCase());
+  let queryObj = { "3ALPHA": crs };
+  return await query(col, queryObj);
+}
+
+async function nlc(id: string) {
+  logger.debug(`findServices.nlc: Finding nlc: ${id}`);
+  var nlc = cleanApiEndpointNum(id);
+  let queryObj = { NLC: parseInt(nlc) };
+  logger.trace(`findServices.nlc: NLC Converted to int: ${query}`);
+  return await query(col, queryObj);
+}
+
+async function tiploc(id: string) {
+  logger.debug(`findServices.tiploc: Finding tiploc: ${id}`);
+  var tiploc = cleanApiEndpointTxt(id.toUpperCase());
+  let queryObj = { TIPLOC: tiploc };
+  return await query(col, queryObj);
+}
+
+async function stanox(id: string) {
+  logger.debug(`findServices.stanox: Finding stanox: ${id}`);
+  var stanox = cleanApiEndpointNum(id);
+  let queryObj = { STANOX: String(stanox) };
+  return await query(col, queryObj);
+}
+
+module.exports = {
+  name,
+  crs,
+  nlc,
+  tiploc,
+  stanox,
+};

src/services/kube.services.ts

@@ -1,5 +1,3 @@
-const testing = require("../services/mail.services");
-
 import { logger } from "../utils/logger.utils";
 
 async function getAlive() {
@@ -9,16 +7,11 @@ async function getAlive() {
 
 async function getReady() {
   logger.trace("kubeServices.getReady: ready hook checked");
-  testing.send({
-    to: "fred@fjla.uk",
-    subject: "OwlBoard Test",
-    txt: "This is a test message from OwlBoard (testing)",
-  });
   return "not_implemented";
 }
 
 async function getTime() {
-  var now = new Date();
+  var now: Date = new Date();
   return { responseGenerated: now };
 }