Fix console log of original data

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20 as builder
+FROM node:latest as builder
 WORKDIR /usr/src/app
 COPY ./package*.json ./
 COPY ./.npmrc ./

package-lock.json

@@ -21,7 +21,6 @@
         "mongodb": "^4.13.0",
         "nodemailer": "^6.9.1",
         "pino": "^8.15.1",
-        "pino-http": "^8.5.0",
         "redis": "^4.6.7",
         "zlib": "^1.0.5"
       },
@@ -4366,6 +4365,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -6289,17 +6289,6 @@
         "split2": "^4.0.0"
       }
     },
-    "node_modules/pino-http": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/pino-http/-/pino-http-8.5.0.tgz",
-      "integrity": "sha512-kLGKNLyfWfdmrG1Ug0YdYpCTGbNcuD/YGC3g+elRU/Cm44UTs+tj/dZTxDN3bYauekxFxdLZhJuZdKKl0cml9w==",
-      "dependencies": {
-        "get-caller-file": "^2.0.5",
-        "pino": "^8.0.0",
-        "pino-std-serializers": "^6.0.0",
-        "process-warning": "^2.0.0"
-      }
-    },
     "node_modules/pino-std-serializers": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz",

package.json

@@ -28,7 +28,6 @@
     "mongodb": "^4.13.0",
     "nodemailer": "^6.9.1",
     "pino": "^8.15.1",
-    "pino-http": "^8.5.0",
     "redis": "^4.6.7",
     "zlib": "^1.0.5"
   },

src/services/dbAccess.services.js

@@ -16,16 +16,16 @@ const db = client.db(dbName);
 
 async function query(collection, query, returnId = false) {
   await client.connect();
-  logger.logger.debug(`dbAccess.query: Connecting to collection: '${collection}'`)
+  logger.logger.trace(`dbAccess.query: Connecting to collection: '${collection}'`)
   var qcoll = db.collection(collection);
   var qcursor = qcoll.find(query);
   if (!returnId) {
     qcursor.project({ _id: 0 });
   }
-  logger.logger.debug(query, "dbAccess.query: Runnung Query")
+  logger.logger.trace(query, "dbAccess.query: Runnung Query")
   increment(collection);
   let result = await qcursor.toArray();
-  logger.logger.debug(result, "dbAccess.query: Response");
+  logger.logger.trace(result, "dbAccess.query: Response");
   return result;
 }
 

src/services/ldb.services.js

@@ -1,11 +1,12 @@
 // Parse and return an LDB Request
 
-const log = require("../utils/logs.utils"); // Log Helper
 const ldb = require("ldbs-json");
 const util = require("../utils/ldb.utils");
 const san = require("../utils/sanitizer.utils");
 const db = require("../services/dbAccess.services");
 
+import { logger } from "../utils/logger.utils";
+
 import { transform as staffStationTransform } from "../utils/translators/ldb/staffStation";
 import { msgCodes } from "../configs/errorCodes.configs";
 
@@ -17,7 +18,7 @@ async function get(id, staff = false) {
   const obj = await util.checkCrs(cleanId);
   try {
     const crs = obj[0]["3ALPHA"];
-    log.out(`ldbService.get: Determined CRS for lookup to be: ${crs}`, "info");
+    logger.debug(`ldbService.get: Determined CRS for lookup to be: ${crs}`)
     if (staff) {
       const data = arrDepBoardStaff(crs);
       db.increment("ldbsvws");
@@ -28,7 +29,7 @@ async function get(id, staff = false) {
       return await data;
     }
   } catch (err) {
-    log.out(`ldbService.get: Error, Unable to find CRS: ${err}`, "info");
+    logger.error(err, "ldbService.get: Error, Unable to find CRS")
     return {
       obStatus: "LOC_NOT_FOUND",
       obMsg: "UNABLE TO FIND MESSAGE",
@@ -37,7 +38,7 @@ async function get(id, staff = false) {
 }
 
 async function arrDepBoard(CRS) {
-  log.out(`ldbService.arrDepBoard: Trying to fetch board for ${CRS}`, "info");
+  logger.trace(`ldbService.arrDepBoard: Trying to fetch board for ${CRS}`)
   try {
     const options = {
       numRows: 10,
@@ -47,7 +48,7 @@ async function arrDepBoard(CRS) {
     let d = await api.call("GetArrDepBoardWithDetails", options, false, false);
     return await util.cleanData(d);
   } catch (err) {
-    log.out(`ldbService.arrDepBoard: Lookup Failed for: ${CRS}`, "warn");
+    logger.error(err, "ldbService.arrDepBoard: Lookup Failed")
     return {
       GetStationBoardResult: "not available",
       Reason: `The CRS code ${CRS} is not valid`,
@@ -56,7 +57,7 @@ async function arrDepBoard(CRS) {
 }
 
 async function arrDepBoardStaff(CRS) {
-  log.out(`ldbService.arrDepBoardStaff: Try to fetch board for ${CRS}`, "dbug");
+  logger.debug(`ldbService.arrDepBoardStaff: Try to fetch board for ${CRS}`)
   try {
     const options = {
       numRows: 40,
@@ -74,23 +75,24 @@ async function arrDepBoardStaff(CRS) {
       false,
       false
     );
+    console.log("\n\n\nORIGINAL DATA")
+    console.log("\n" + JSON.stringify(result) + "\n\n\n")
     console.timeEnd(`Fetch Staff LDB for ${CRS.toUpperCase()}`);
     try {
       const _staffLdb = staffStationTransform(result);
-      console.log("Transformation Test Successful");
-      console.log(JSON.stringify(_staffLdb));
+      logger.debug("StaffLDB Transformed")
+      logger.trace(_staffLdb, "StaffLDB Transformed")
       return {
         obStatus: "OK",
         obMsg: "OK",
         data: _staffLdb,
       };
     } catch (err) {
-      console.log("Transformation Test Failed: " + err);
+      logger.error(err, "Transformation Error")
     }
     return result;
   } catch (err) {
-    log.out(`ldbService.arrDepBoardStaff: Lookup Failed for: ${CRS}`, "warn");
-    log.out(`ldbService.arrDepBoardStaff: ${err}`);
+    logger.error(err, "ldbService.arrDepBoardStaff error")
     return {
       GetStationBoardResult: "not available",
       Reason: `The CRS code ${CRS} is not valid`,
@@ -99,7 +101,7 @@ async function arrDepBoardStaff(CRS) {
 }
 
 async function getServiceByRID(rid) {
-  log.out(`ldbService.getServiceByRID: Finding RID: ${rid}`, "dbug");
+  logger.debug(`ldbService.getServiceByRID: Finding RID: ${rid}`);
   try {
     const options = {
       rid: String(rid),
@@ -107,12 +109,12 @@ async function getServiceByRID(rid) {
     const api = new ldb(ldbsvKey, true);
     return await api.call("GetServiceDetailsByRID", options, false, false);
   } catch (err) {
-    log.out(`ldbService.queryService: ${err}`, "EROR");
+    logger.error(err, `ldbService.queryService`);
   }
 }
 
 async function getServicesByOther(id) {
-  log.out(`ldbService.getServiceByOther: Finding services: ${id}`, "dbug");
+  logger.debug(`ldbService.getServiceByOther: Finding services: ${id}`);
   try {
     const options = {
       serviceID: id,
@@ -121,30 +123,30 @@ async function getServicesByOther(id) {
     const api = new ldb(ldbsvKey, true);
     return await api.call("QueryServices", options, false, false);
   } catch (err) {
-    log.out(`ldbService.getServiceByOther: Error: ${err}`, "EROR");
+    logger.error(err, "ldbService.getServiceByOther")
     return false;
   }
 }
 
 async function getReasonCodeList() {
-  log.out("ldbService.getReasonCodeList: Fetching reason code list", "eror");
+  logger.debug("ldbService.getReasonCodeList: Fetching reason code list")
   try {
     const dbFilter = {};
     return await db.query("reasonCodes", dbFilter, false);
   } catch (err) {
-    log.out(`ldbService.getReasonCodeList: ${err}`, "eror");
+    logger.error(err, "ldbService.getReasonCodeList")
   }
 }
 
 async function getReasonCode(code) {
-  log.out(`ldbService.getReasonCode: Fetching reason code ${code}`, "dbug");
+  logger.debug(`ldbService.getReasonCode: Fetching reason code ${code}`);
   try {
     const dbFilter = {
       code: code,
     };
     return await db.query("reasonCodes", dbFilter, false);
   } catch (err) {
-    log.out(`ldbService.getReasonCode: ${err}`, "eror");
+    logger.error(err, "ldbService.getReasonCode")
   }
 }
 

src/utils/logger.utils.ts

@@ -8,8 +8,6 @@ let level: string
     level = "debug"
   }
 
-  console.log(`Runtime mode: ${runtime || "dev"}, Log Level: ${level}`)
-
   export const logger = pino({
     level: level,
     formatters: {