Backend Release to Main [3.07]

package.json

@@ -22,7 +22,7 @@
     "test:ci": "npm test -- --coverage",
     "lint": "eslint ./src --ext .js,.jsx --max-warnings=2000 --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
     "lint:fix": "eslint ./src --ext .js,.jsx --fix --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
-    "build": "babel src -d dist && shx mkdir -p dist/data && shx cp -r src/data/* dist/data/",
+    "build": "babel src -d dist && mkdir -p dist/data && cp -r src/data/* dist/data/ 2>/dev/null || true",
     "buildw": "babel src -d dist --watch",
     "start": "node dist/server.js",
     "dev": "nodemon --exec \"babel-node --only src src/server.js\"",
@@ -61,7 +61,6 @@
     "pidtree": "^0.6.0",
     "prettier": "3.2.5",
     "puppeteer": "^24.40.0",
-    "shx": "^0.4.0",
     "supertest": "^6.3.4"
   },
   "dependencies": {
@@ -83,13 +82,13 @@
     "abort-controller": "^3.0.0",
     "async-exit-hook": "^2.0.1",
     "aws-sdk": "^2.1692.0",
-    "axios": "^1.7.7",
+    "axios": "^1.16.1",
     "babel-plugin-module-resolver": "^5.0.0",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.4",
     "card-validator": "^10.0.2",
     "cheerio": "^0.22.0",
-    "cloudinary": "^2.9.0",
+    "cloudinary": "^2.8.0",
     "compression": "^1.8.0",
     "cors": "^2.8.4",
     "cron": "^1.8.2",

src/app.js

@@ -1,36 +1,39 @@
 const express = require('express');
 const Sentry = require('@sentry/node');
 const testRoutes = require('./routes/testRoutes');
 
 const app = express();
 const logger = require('./startup/logger');
 const globalErrorHandler = require('./utilities/errorHandling/globalErrorHandler');
 // const experienceRoutes = require('./routes/applicantAnalyticsRoutes');
 
-// 1. Core initialization
 logger.init();
+
 app.use(Sentry.Handlers.requestHandler());
 
-// 2. Load essential middleware (The "Engine")
+// Then load all other setup
 require('./startup/compression')(app);
 require('./startup/cors')(app);
-require('./startup/bodyParser')(app); // <--- Crucial this runs before routes
-require('./startup/session')(app);
+require('./startup/bodyParser')(app);
+require('./startup/session')(app); // Add session before middleware and routes
 
-// 3. Define Routes (The "Destination")
-// It is better to move these INSIDE startup/routes.js, but if they stay here:
 app.use('/api/test', testRoutes);
 
 const helpFeedbackRouter = require('./routes/helpFeedbackRouter');
 const helpRequestRouter = require('./routes/helpRequestRouter');
+
 app.use('/api/feedback', helpFeedbackRouter);
 app.use('/api/helprequest', helpRequestRouter);
 
 require('./startup/middleware')(app);
-// This handles all other routes and likely has your 404 handler
-require('./startup/routes')(app); 
 
-// 4. Error Handling (The "Safety Net")
+const weeklyReportsRouter = require('./routes/weeklyReportsRouter');
+
+app.use('/api', weeklyReportsRouter);
+
+// ⚠ This must come *after* your custom /api routes
+require('./startup/routes')(app);
+
 app.use(Sentry.Handlers.errorHandler());
 app.use(globalErrorHandler);
 

src/controllers/bmdashboard/bmToolStoppageReasonController.js

@@ -0,0 +1,149 @@
+const { ObjectId } = require('mongoose').Types;
+
+const toolStoppageReasonController = function (ToolStoppageReason) {
+  const stoppageReasonFields = ['usedForLifetime', 'damaged', 'lost'];
+
+  const createPercentageProjection = (field) => ({
+    $cond: [
+      { $gt: ['$total', 0] },
+      {
+        $round: [
+          {
+            $multiply: [{ $divide: [`$${field}`, '$total'] }, 100],
+          },
+          2,
+        ],
+      },
+      0,
+    ],
+  });
+
+  const buildProjectDateMatchStage = (projectId, startDate, endDate) => {
+    const matchStage = {
+      projectId: new ObjectId(projectId),
+    };
+
+    if (startDate || endDate) {
+      matchStage.date = {};
+
+      if (startDate) {
+        matchStage.date.$gte = new Date(startDate);
+      }
+
+      if (endDate) {
+        matchStage.date.$lte = new Date(endDate);
+      }
+    }
+
+    return matchStage;
+  };
+
+  const buildProjectIdAggregation = (collectionName, projectNameField) => [
+    {
+      $group: {
+        _id: '$projectId',
+      },
+    },
+    {
+      $lookup: {
+        from: collectionName,
+        localField: '_id',
+        foreignField: '_id',
+        as: 'projectDetails',
+      },
+    },
+    {
+      $project: {
+        _id: 1,
+        projectName: { $arrayElemAt: [`$projectDetails.${projectNameField}`, 0] },
+      },
+    },
+    {
+      $sort: { projectName: 1 },
+    },
+  ];
+
+  const getToolsStoppageReason = async (req, res) => {
+    try {
+      const { id: projectId } = req.params;
+      const { startDate, endDate } = req.query;
+
+      if (!ObjectId.isValid(projectId)) {
+        return res.status(400).json({ error: 'Invalid project ID format' });
+      }
+
+      const matchStage = buildProjectDateMatchStage(projectId, startDate, endDate);
+
+      const groupSums = stoppageReasonFields.reduce(
+        (accumulator, field) => ({
+          ...accumulator,
+          [field]: { $sum: `$${field}` },
+        }),
+        {},
+      );
+
+      const percentageProjection = stoppageReasonFields.reduce(
+        (accumulator, field) => ({
+          ...accumulator,
+          [field]: createPercentageProjection(field),
+        }),
+        {},
+      );
+
+      const results = await ToolStoppageReason.aggregate([
+        { $match: matchStage },
+        {
+          $group: {
+            _id: '$toolName',
+            ...groupSums,
+          },
+        },
+        {
+          $addFields: {
+            total: {
+              $add: stoppageReasonFields.map((field) => `$${field}`),
+            },
+          },
+        },
+        {
+          $project: {
+            _id: 0,
+            toolName: '$_id',
+            ...percentageProjection,
+          },
+        },
+        { $sort: { toolName: 1 } },
+      ]);
+
+      return res.json(results);
+    } catch (error) {
+      console.error('Error fetching tools stoppage reason:', error);
+      return res.status(500).json({ error: 'Internal server error' });
+    }
+  };
+
+  const getUniqueProjectIds = async (req, res) => {
+    try {
+      const results = await ToolStoppageReason.aggregate(
+        buildProjectIdAggregation('buildingProjects', 'name'),
+      );
+
+      const formattedResults = results.map((item) => ({
+        projectId: item._id,
+        projectName: item.projectName || 'Unknown Project',
+      }));
+
+      return res.json(formattedResults);
+    } catch (error) {
+      console.error('Error fetching unique project IDs:', error);
+      return res.status(500).json({ error: 'Internal server error' });
+    }
+  };
+
+  return {
+    getToolsStoppageReason,
+    getUniqueProjectIds,
+  };
+};
+
+module.exports = toolStoppageReasonController;