Merge pull request #2044 from OneCommunityGlobal/SaiKrishna_UpdateHistoryButtonBackend

SaiKrishna  Update History Button Backend Changes

Author: one-community

src/controllers/bmdashboard/__tests__/bmConsumableController.test.js

@@ -1,6 +1,12 @@
 const mongoose = require('mongoose');
 const bmConsumableController = require('../bmConsumableController');
 
+jest.mock('../../../models/bmdashboard/updateHistory', () => ({
+  create: jest.fn().mockResolvedValue({}),
+}));
+
+const flushPromises = () => new Promise(setImmediate);
+
 mongoose.Types.ObjectId = jest.fn((id) => id);
 
 const mockBuildingConsumable = {
@@ -139,6 +145,7 @@ describe('Building Consumable Controller', () => {
       mockBuildingConsumable.updateOne.mockResolvedValue({});
 
       await controller.bmPostConsumableUpdateRecord(mockRequest, mockResponse);
+      await flushPromises();
 
       expect(mockBuildingConsumable.updateOne).toHaveBeenCalledWith(
         { _id: '123' },
@@ -175,6 +182,7 @@ describe('Building Consumable Controller', () => {
       mockBuildingConsumable.updateOne.mockResolvedValue({});
 
       await controller.bmPostConsumableUpdateRecord(percentRequest, mockResponse);
+      await flushPromises();
 
       const expectedUsed = 10; // 10% of 100
       const expectedWasted = 5; // 5% of 100

src/controllers/bmdashboard/bmConsumableController.js

@@ -1,4 +1,5 @@
 const mongoose = require('mongoose');
+const UpdateHistory = require('../../models/bmdashboard/updateHistory');
 
 const bmConsumableController = function (BuildingConsumable) {
   const fetchBMConsumables = async (req, res) => {
@@ -138,7 +139,46 @@ const bmConsumableController = function (BuildingConsumable) {
         },
       },
     )
-      .then((results) => {
+      .then(async (results) => {
+        // Log update history - 1 entry per update action
+        try {
+          const itemName = consumable.itemType?.name || 'Unknown Consumable';
+          const projectName = consumable.project?.name || 'Unknown Project';
+          const changes = {};
+
+          if (consumable.stockUsed !== newStockUsed) {
+            changes.stockUsed = { old: consumable.stockUsed, new: newStockUsed };
+          }
+          if (consumable.stockWasted !== newStockWasted) {
+            changes.stockWasted = { old: consumable.stockWasted, new: newStockWasted };
+          }
+          if (stockAvailable !== newAvailable) {
+            changes.stockAvailable = { old: stockAvailable, new: newAvailable };
+          }
+
+          if (Object.keys(changes).length > 0) {
+            console.log(
+              '=== CREATING UPDATE HISTORY ===',
+              new Date().toISOString(),
+              itemName,
+              projectName,
+            );
+            await UpdateHistory.create({
+              itemType: 'consumable',
+              itemId: consumable._id,
+              itemName,
+              projectId: consumable.project?._id || consumable.project,
+              projectName,
+              changes,
+              modifiedBy: req.body.requestor.requestorId,
+              date: new Date(),
+            });
+            console.log('=== UPDATE HISTORY CREATED ===');
+          }
+        } catch (historyError) {
+          console.log('Error logging update history:', historyError);
+        }
+
         res.status(200).send(results);
       })
       .catch((error) => {

src/controllers/bmdashboard/bmUpdateHistoryController.js

@@ -0,0 +1,33 @@
+const UpdateHistory = require('../../models/bmdashboard/updateHistory');
+
+const bmUpdateHistoryController = function () {
+  // GET /api/bm/consumables/updateHistory
+  const getConsumablesUpdateHistory = async (req, res) => {
+    try {
+      const history = await UpdateHistory.find({ itemType: 'consumable' })
+        .populate('modifiedBy', 'firstName lastName _id')
+        .sort({ date: -1 })
+        .limit(500);
+
+      // Format response for frontend display
+      const formattedHistory = history.map((record) => ({
+        _id: record._id,
+        date: record.date,
+        itemName: record.itemName,
+        projectName: record.projectName,
+        changes: record.changes,
+        modifiedBy: record.modifiedBy,
+      }));
+
+      res.status(200).json(formattedHistory);
+    } catch (error) {
+      res.status(500).json({ message: 'Error fetching update history', error: error.message });
+    }
+  };
+
+  return {
+    getConsumablesUpdateHistory,
+  };
+};
+
+module.exports = bmUpdateHistoryController;

src/models/bmdashboard/updateHistory.js

@@ -0,0 +1,49 @@
+const mongoose = require('mongoose');
+
+/**
+ * UpdateHistory Schema
+ * Tracks all modifications made to consumables (1 entry per update action)
+ */
+const updateHistorySchema = new mongoose.Schema({
+  itemType: {
+    type: String,
+    enum: ['consumable', 'material', 'reusable', 'equipment', 'tool'],
+    required: true,
+  },
+  itemId: {
+    type: mongoose.SchemaTypes.ObjectId,
+    required: true,
+    ref: 'smallItemBase',
+  },
+  itemName: {
+    type: String,
+    required: true,
+  },
+  projectId: {
+    type: mongoose.SchemaTypes.ObjectId,
+    ref: 'buildingProject',
+  },
+  projectName: {
+    type: String,
+  },
+  changes: {
+    type: mongoose.Schema.Types.Mixed, // { stockUsed: {old, new}, stockWasted: {old, new}, ... }
+    required: true,
+  },
+  modifiedBy: {
+    type: mongoose.SchemaTypes.ObjectId,
+    ref: 'userProfile',
+    required: true,
+  },
+  date: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+updateHistorySchema.index({ itemType: 1, date: -1 });
+updateHistorySchema.index({ itemId: 1, date: -1 });
+
+const UpdateHistory = mongoose.model('UpdateHistory', updateHistorySchema, 'updateHistory');
+
+module.exports = UpdateHistory;

src/routes/bmdashboard/bmUpdateHistoryRouter.js

@@ -0,0 +1,15 @@
+const express = require('express');
+
+const routes = function () {
+  const updateHistoryRouter = express.Router();
+  const controller = require('../../controllers/bmdashboard/bmUpdateHistoryController')();
+
+  // GET /api/bm/consumables/updateHistory
+  updateHistoryRouter
+    .route('/consumables/updateHistory')
+    .get(controller.getConsumablesUpdateHistory);
+
+  return updateHistoryRouter;
+};
+
+module.exports = routes;

src/startup/routes.js

@@ -239,6 +239,7 @@ const biddingRouter = require('../routes/lbdashboard/biddingRouter')(biddingHome
 const titleRouter = require('../routes/titleRouter')(title);
 const bmToolRouter = require('../routes/bmdashboard/bmToolRouter')(buildingTool, toolType);
 const bmEquipmentRouter = require('../routes/bmdashboard/bmEquipmentRouter')(buildingEquipment);
+const bmUpdateHistoryRouter = require('../routes/bmdashboard/bmUpdateHistoryRouter')();
 const buildingIssue = require('../models/bmdashboard/buildingIssue');
 const bmIssueRouter = require('../routes/bmdashboard/bmIssueRouter')(buildingIssue);
 const bmInjuryRouter = require('../routes/bmdashboard/bmInjuryRouter')(injujrySeverity);
@@ -472,6 +473,7 @@ module.exports = function (app) {
   app.use('/api/bm', bmToolRouter);
   app.use('/api/bm', bmEquipmentRouter);
   app.use('/api/bm', bmConsumablesRouter);
+  app.use('/api/bm', bmUpdateHistoryRouter);
   app.use('/api/dropbox', dropboxRouter);
   app.use('/api/github', githubRouter);
   app.use('/api/sentry', sentryRouter);