Merge pull request #2054 from OneCommunityGlobal/SaiKrishna_EditableAndSelectableFieldsInEquipmentPage

SaiKrishna_EditableAndSelectableFieldsInEquipmentBackEnd

Author: one-community

src/controllers/bmdashboard/bmEquipmentController.js

@@ -1,51 +1,32 @@
 const mongoose = require('mongoose');
 
 const bmEquipmentController = (BuildingEquipment) => {
+  const equipmentPopulateConfig = [
+    { path: 'itemType', select: '_id name description unit imageUrl category' },
+    { path: 'project', select: 'name' },
+    { path: 'userResponsible', select: '_id firstName lastName' },
+    {
+      path: 'purchaseRecord',
+      populate: { path: 'requestedBy', select: '_id firstName lastName' },
+    },
+    {
+      path: 'updateRecord',
+      populate: { path: 'createdBy', select: '_id firstName lastName' },
+    },
+    {
+      path: 'logRecord',
+      populate: [
+        { path: 'createdBy', select: '_id firstName lastName' },
+        { path: 'responsibleUser', select: '_id firstName lastName' },
+      ],
+    },
+  ];
+
   const fetchSingleEquipment = async (req, res) => {
     const { equipmentId } = req.params;
     try {
       BuildingEquipment.findById(equipmentId)
-        .populate([
-          {
-            path: 'itemType',
-            select: '_id name description unit imageUrl category',
-          },
-          {
-            path: 'project',
-            select: 'name',
-          },
-          {
-            path: 'userResponsible',
-            select: '_id firstName lastName',
-          },
-          {
-            path: 'purchaseRecord',
-            populate: {
-              path: 'requestedBy',
-              select: '_id firstName lastName',
-            },
-          },
-          {
-            path: 'updateRecord',
-            populate: {
-              path: 'createdBy',
-              select: '_id firstName lastName',
-            },
-          },
-          {
-            path: 'logRecord',
-            populate: [
-              {
-                path: 'createdBy',
-                select: '_id firstName lastName',
-              },
-              {
-                path: 'responsibleUser',
-                select: '_id firstName lastName',
-              },
-            ],
-          },
-        ])
+        .populate(equipmentPopulateConfig)
         .exec()
         .then((equipment) => res.status(200).send(equipment))
         .catch((error) => res.status(500).send(error));
@@ -140,6 +121,88 @@ const bmEquipmentController = (BuildingEquipment) => {
     }
   };
 
+  const validateEnumField = (value, allowedValues, fieldName) => {
+    if (value && !allowedValues.includes(value)) {
+      return `Invalid ${fieldName}. Allowed values: ${allowedValues.join(', ')}`;
+    }
+    return null;
+  };
+
+  const updateEquipmentById = async (req, res) => {
+    const { equipmentId } = req.params;
+    const { projectId, purchaseStatus, currentUsage, condition } = req.body;
+
+    if (!mongoose.Types.ObjectId.isValid(equipmentId)) {
+      return res.status(400).send({ message: 'Invalid equipment ID.' });
+    }
+
+    if (projectId && !mongoose.Types.ObjectId.isValid(projectId)) {
+      return res.status(400).send({ message: 'Invalid project ID.' });
+    }
+
+    const enumChecks = [
+      [purchaseStatus, ['Rental', 'Purchase', 'Needed', 'Purchased', 'Rented'], 'purchaseStatus'],
+      [currentUsage, ['Operational', 'Under Maintenance', 'Out of Service'], 'currentUsage'],
+      [
+        condition,
+        [
+          'Like New',
+          'Good',
+          'Worn',
+          'Lost',
+          'Needs Repair',
+          'Needs Replacing',
+          'New',
+          'Used',
+          'Refurbished',
+        ],
+        'condition',
+      ],
+    ];
+    const validationError = enumChecks.reduce(
+      (err, [value, allowed, name]) => err || validateEnumField(value, allowed, name),
+      null,
+    );
+    if (validationError) {
+      return res.status(400).send({ message: validationError });
+    }
+
+    try {
+      const updateFields = {};
+      const fieldMap = {
+        projectId: 'project',
+        equipmentClass: 'equipmentClass',
+        purchaseStatus: 'purchaseStatus',
+        currentUsage: 'currentUsage',
+        condition: 'condition',
+      };
+      Object.entries(fieldMap).forEach(([bodyKey, schemaKey]) => {
+        const val = req.body[bodyKey];
+        if (val !== undefined && val !== null) {
+          updateFields[schemaKey] = val;
+        }
+      });
+
+      if (Object.keys(updateFields).length === 0) {
+        return res.status(400).send({ message: 'No valid fields provided to update.' });
+      }
+
+      await BuildingEquipment.updateOne({ _id: equipmentId }, { $set: updateFields });
+
+      const updatedEquipment = await BuildingEquipment.findById(equipmentId)
+        .populate(equipmentPopulateConfig)
+        .exec();
+
+      if (!updatedEquipment) {
+        return res.status(404).send({ message: 'Equipment not found.' });
+      }
+
+      return res.status(200).send(updatedEquipment);
+    } catch (error) {
+      return res.status(500).send({ message: error.message || 'Internal server error.' });
+    }
+  };
+
   const updateLogRecords = async (req, res) => {
     const { project: projectId } = req.query;
     const updates = req.body;
@@ -218,6 +281,7 @@ const bmEquipmentController = (BuildingEquipment) => {
     fetchSingleEquipment,
     bmPurchaseEquipments,
     fetchBMEquipments,
+    updateEquipmentById,
     updateLogRecords,
   };
 };

src/models/bmdashboard/buildingEquipment.js

@@ -3,14 +3,17 @@ const mongoose = require('mongoose');
 const { Schema } = mongoose;
 
 const buildingEquipment = new Schema({
-  itemType: { type: mongoose.SchemaTypes.ObjectId, ref: 'buildingInventoryType' },
+  itemType: { type: mongoose.SchemaTypes.ObjectId, ref: 'invTypeBase' },
   project: { type: mongoose.SchemaTypes.ObjectId, ref: 'buildingProject' },
   code: { type: Number }, // add function to create code for on-site tool tracking.Not marked as 'required' as it breaks the tool purchase form functionality.
-  purchaseStatus: { type: String, enum: ['Rental', 'Purchase'] },
+  purchaseStatus: { type: String, enum: ['Rental', 'Purchase', 'Purchased', 'Rented'] },
   // add discriminator based on rental or purchase so these fields are required if tool is rented. Not marked as 'required' as it breaks the tool purchase form functionality.
   rentedOnDate: Date,
   rentalDue: Date,
   userResponsible: { type: mongoose.SchemaTypes.ObjectId, ref: 'userProfile' },
+  equipmentClass: { type: String },
+  currentUsage: { type: String, enum: ['Operational', 'Under Maintenance', 'Out of Service'] },
+  condition: { type: String, enum: ['New', 'Used', 'Refurbished'] },
   purchaseRecord: [
     {
       // track purchase/rental requests