Compare commits
No commits in common. "c6552489e10f298a71653dfa22bcaf2a4bbe01da" and "648c72fa34c451bcf088d914b474a11875154b6b" have entirely different histories.
c6552489e1
...
648c72fa34
|
@ -1,3 +1,4 @@
|
|||
const log = require("../utils/logs.utils");
|
||||
const auth = require("../utils/auth.utils");
|
||||
const db = require("./dbAccess.services");
|
||||
const mail = require("./mail.services");
|
||||
|
@ -5,21 +6,23 @@ 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) {
|
||||
logger.debug("registerServices.createRegKey: Incoming request");
|
||||
log.out("registerServices.createRegKey: Incoming request", "INFO");
|
||||
if (body.email) {
|
||||
const domain = await clean.getDomainFromEmail(body.email);
|
||||
logger.info(`registerServices: Registration request from: ${domain}`);
|
||||
log.out(`registerServices: Registration request from: ${domain}`, "info");
|
||||
if (domains.includes(domain)) {
|
||||
logger.debug(`registerServices.createRegKey: Key from valid: ${domain}`);
|
||||
log.out(
|
||||
`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");
|
||||
logger.error(err, 'registerServices.createRegKey: Error generating email');
|
||||
log.out("registerServices.createRegKey: Error generating email", "err");
|
||||
log.out(err, "err");
|
||||
return 500;
|
||||
}
|
||||
if ((await mail.send(message)) == true) {
|
||||
|
@ -35,9 +38,10 @@ async function createRegKey(body) {
|
|||
|
||||
async function regUser(req) {
|
||||
// Add input validation
|
||||
logger.trace(`Read UUID: ${req.uuid}`);
|
||||
log.out(`Read UUID: ${req.uuid}`, "dbug");
|
||||
log.out(`registrationServices.regUser: Request from: ${req.uuid}`, "info");
|
||||
const res = await auth.checkRequest(req.uuid);
|
||||
logger.debug(res, 'registrationServices');
|
||||
log.out(`registrationServices.regUser: ${JSON.stringify(res)}`, "info");
|
||||
if (res.result) {
|
||||
const uuid = await auth.generateKey();
|
||||
const apiKey = await db.addUser(uuid, res.domain);
|
||||
|
@ -50,6 +54,7 @@ async function regUser(req) {
|
|||
}
|
||||
|
||||
async function getUser(uuid) {
|
||||
log.out("registrationServices: Finding user for given UUID", "dbug");
|
||||
try {
|
||||
const filter = {
|
||||
uuid: uuid,
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
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 = {};
|
||||
|
@ -35,13 +34,14 @@ async function buildJson() {
|
|||
}
|
||||
|
||||
async function hits() {
|
||||
logger.debug("statsServices.hits: Statistics Requested");
|
||||
log.out("statsServices.hits: Statistics Requested", "info");
|
||||
const out = await buildJson();
|
||||
log.out(`statsServices.hits: Sending Data: ${JSON.stringify(out)}`, "info");
|
||||
return out;
|
||||
}
|
||||
|
||||
async function getVersions() {
|
||||
logger.debug("statsServices.getVersions: Fetching versions");
|
||||
log.out("statsServices.getVersions: Fetching versions", "info");
|
||||
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() {
|
||||
logger.debug("statsServices.statistics: Fetching statistics");
|
||||
log.out("statsServices.statistics: Fetching statistics", "info");
|
||||
|
||||
const countersPromise = db.query("meta", { target: "counters" });
|
||||
const timetablePromise = db.query("meta", { target: "timetable" });
|
||||
|
|
|
@ -1,12 +1,15 @@
|
|||
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();
|
||||
logger.debug(`trainServiceServices.findByHeadcode: Searching for headcode ${sanitizedHeadcode}`);
|
||||
log.out(
|
||||
"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
|
||||
|
@ -39,7 +42,11 @@ async function findByHeadcodeToday(headcode) {
|
|||
|
||||
async function findByHeadcode(date, headcode) {
|
||||
const sanitizedHeadcode = clean.removeNonAlphanumeric(headcode).toUpperCase();
|
||||
logger.debug(`trainServiceServices.findByHeadcode: Searching for headcode ${sanitizedHeadcode}`);
|
||||
log.out(
|
||||
"trainServiceServices.findByHeadcode: Searching for headcode " +
|
||||
sanitizedHeadcode,
|
||||
"dbug"
|
||||
);
|
||||
let searchDate;
|
||||
if (date === "now") {
|
||||
searchDate = new Date();
|
||||
|
@ -74,6 +81,7 @@ async function findByHeadcode(date, headcode) {
|
|||
},
|
||||
];
|
||||
const queryData = await db.queryAggregate("timetable", pipeline);
|
||||
console.log(JSON.stringify(queryData));
|
||||
let filteredData = filterServices(queryData);
|
||||
return await filteredData;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue