- Minor cleanup

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server.js

@@ -16,24 +16,6 @@ require("dotenv").config({
 // Import custom utilities and handlers
 const logger = require("./server/utils/logger");
 
-const countRoutes = (app) => {
-    let routeCount = 0;
-
-    app._router.stack.forEach(function(middleware){
-        if(middleware.route){ // if it's a route, count it
-            routeCount++;
-        } else if(middleware.name === 'router'){ // if it's a router, count its routes
-            middleware.handle.stack.forEach(function(handler){
-                if(handler.route){
-                    routeCount++;
-                }
-            });
-        }
-    });
-
-    return routeCount;
-}
-
 // Express app and server setup
 const app = express();
 const port = process.env.PORT || 5000;
@@ -72,7 +54,6 @@ const dataRoutes = require("./server/routes/dataRoutes");
 const adminRoutes = require("./server/routes/adminRoutes");
 const techRoutes = require("./server/routes/techRoutes");
 const intellipayRoutes = require("./server/routes/intellipayRoutes");
-const osRoutes = require("./server/routes/osRoutes");
 const cdkRoutes = require("./server/routes/cdkRoutes");
 const miscellaneousRoutes = require("./server/routes/miscellaneousRoutes");
 const mixdataRoutes = require("./server/routes/mixDataRoutes");
@@ -103,7 +84,6 @@ app.use('/data', dataRoutes);
 app.use('/adm', adminRoutes);
 app.use('/tech', techRoutes);
 app.use('/intellipay', intellipayRoutes);
-app.use('/opensearch', osRoutes);
 app.use('/cdk', cdkRoutes);
 
 // Default route for forbidden access
@@ -111,9 +91,8 @@ app.get("/", (req, res) => {
     res.status(200).send("Access Forbidden.");
 });
 
-
 // Start server
 server.listen(port, (error) => {
     if (error) throw error;
-    logger.log(`[${process.env.NODE_ENV || "DEVELOPMENT"}] Server with ${countRoutes(app)} routes running on port ${port}`, "INFO", "api");
+    logger.log(`[${process.env.NODE_ENV || "DEVELOPMENT"}] Server with routes running on port ${port}`, "INFO", "api");
 });

server/routes/miscellaneousRoutes.js

@@ -7,7 +7,7 @@ const fb = require("../firebase/firebase-handler");
 const bodyParser = require("body-parser");
 const ioevent = require("../ioevent/ioevent");
 const taskHandler = require("../tasks/tasks");
-
+const os = require("../opensearch/os-handler");
 
 //Test route to ensure Express is responding.
 router.get("/test", async function (req, res) {
@@ -29,6 +29,10 @@ router.get("/test", async function (req, res) {
     res.status(200).send(`OK - ${commit}`);
 });
 
+router.post("/search", fb.validateFirebaseIdToken, os.search);
+router.post("/opensearch", os.handler);
+
+
 router.post('/ioevent', ioevent.default);
 router.post('/sendemail', fb.validateFirebaseIdToken, sendEmail.sendEmail);
 router.post('/emailbounce', bodyParser.text(), sendEmail.emailBounce);

server/routes/osRoutes.js

@@ -1,9 +0,0 @@
-const express = require('express');
-const router = express.Router();
-const fb = require('../firebase/firebase-handler');
-const osHandler = require('../opensearch/os-handler');
-
-router.post('/', osHandler.handler);
-router.post('/search', fb.validateFirebaseIdToken, osHandler.search);
-
-module.exports = router;