Migrate trainService.service to new logger

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

src/services/registration.services.js

@@ -1,4 +1,3 @@
-const log = require("../utils/logs.utils");
 const auth = require("../utils/auth.utils");
 const db = require("./dbAccess.services");
 const mail = require("./mail.services");
@@ -6,23 +5,21 @@ const clean = require("../utils/sanitizer.utils");
 const domains = require("../configs/domains.configs");
 const errors = require("../configs/errorCodes.configs");
 
+import { logger } from "../utils/logger.utils";
+
 async function createRegKey(body) {
-  log.out("registerServices.createRegKey: Incoming request", "INFO");
+  logger.debug("registerServices.createRegKey: Incoming request");
   if (body.email) {
     const domain = await clean.getDomainFromEmail(body.email);
-    log.out(`registerServices: Registration request from: ${domain}`, "info");
+    logger.info(`registerServices: Registration request from: ${domain}`);
     if (domains.includes(domain)) {
-      log.out(
+      logger.debug(`registerServices.createRegKey: Key from valid: ${domain}`);
-        `registerServices.createRegKey: Key from valid: ${domain}`,
-        "info"
-      );
       const uuid = await auth.generateKey();
       db.addRegReq(uuid, domain);
       const message = await auth.generateConfirmationEmail(body.email, uuid);
       if (!message) {
         const err = new Error("Message generation error");
-        log.out("registerServices.createRegKey: Error generating email", "err");
+        logger.error(err, 'registerServices.createRegKey: Error generating email');
-        log.out(err, "err");
         return 500;
       }
       if ((await mail.send(message)) == true) {
@@ -38,10 +35,9 @@ async function createRegKey(body) {
 
 async function regUser(req) {
   // Add input validation
-  log.out(`Read UUID: ${req.uuid}`, "dbug");
+  logger.trace(`Read UUID: ${req.uuid}`);
-  log.out(`registrationServices.regUser: Request from: ${req.uuid}`, "info");
   const res = await auth.checkRequest(req.uuid);
-  log.out(`registrationServices.regUser: ${JSON.stringify(res)}`, "info");
+  logger.debug(res, 'registrationServices');
   if (res.result) {
     const uuid = await auth.generateKey();
     const apiKey = await db.addUser(uuid, res.domain);
@@ -54,7 +50,6 @@ async function regUser(req) {
 }
 
 async function getUser(uuid) {
-  log.out("registrationServices: Finding user for given UUID", "dbug");
   try {
     const filter = {
       uuid: uuid,

src/services/stats.services.js

@@ -1,8 +1,9 @@
-const log = require("../utils/logs.utils"); // Log Helper
 const db = require("../services/dbAccess.services");
 const os = require("os");
 const vers = require("../configs/version.configs");
 
+import { logger } from "../utils/logger.utils";
+
 async function buildJson() {
   let json = {};
   json.count = {};
@@ -34,14 +35,13 @@ async function buildJson() {
 }
 
 async function hits() {
-  log.out("statsServices.hits: Statistics Requested", "info");
+  logger.debug("statsServices.hits: Statistics Requested");
   const out = await buildJson();
-  log.out(`statsServices.hits: Sending Data: ${JSON.stringify(out)}`, "info");
   return out;
 }
 
 async function getVersions() {
-  log.out("statsServices.getVersions: Fetching versions", "info");
+  logger.debug("statsServices.getVersions: Fetching versions");
   const dbMan = await db.query("versions", { target: "dbmanager" });
   const mqClt = await db.query("versions", { target: "mq-client" });
   const data = {
@@ -53,7 +53,7 @@ async function getVersions() {
 }
 
 async function statistics() {
-  log.out("statsServices.statistics: Fetching statistics", "info");
+  logger.debug("statsServices.statistics: Fetching statistics");
 
   const countersPromise = db.query("meta", { target: "counters" });
   const timetablePromise = db.query("meta", { target: "timetable" });

src/services/trainService.services.js

@@ -1,15 +1,12 @@
-const log = require("../utils/logs.utils");
 const db = require("./dbAccess.services");
 const clean = require("../utils/sanitizer.utils");
 const pis = require("../services/pis.services");
 
+import { logger } from "../utils/logger.utils";
+
 async function findByHeadcodeToday(headcode) {
   const sanitizedHeadcode = clean.removeNonAlphanumeric(headcode).toUpperCase();
-  log.out(
+  logger.debug(`trainServiceServices.findByHeadcode: Searching for headcode ${sanitizedHeadcode}`);
-    "trainServiceServices.findByHeadcode: Searching for headcode " +
-      sanitizedHeadcode,
-    "dbug"
-  );
   const now = new Date();
   const dayMap = ["su", "m", "t", "w", "th", "f", "s"];
   const shortDay = dayMap[now.getDay()]; // Fetch short day from map
@@ -42,11 +39,7 @@ async function findByHeadcodeToday(headcode) {
 
 async function findByHeadcode(date, headcode) {
   const sanitizedHeadcode = clean.removeNonAlphanumeric(headcode).toUpperCase();
-  log.out(
+  logger.debug(`trainServiceServices.findByHeadcode: Searching for headcode ${sanitizedHeadcode}`);
-    "trainServiceServices.findByHeadcode: Searching for headcode " +
-      sanitizedHeadcode,
-    "dbug"
-  );
   let searchDate;
   if (date === "now") {
     searchDate = new Date();
@@ -81,7 +74,6 @@ async function findByHeadcode(date, headcode) {
     },
   ];
   const queryData = await db.queryAggregate("timetable", pipeline);
-  console.log(JSON.stringify(queryData));
   let filteredData = filterServices(queryData);
   return await filteredData;
 }