tsk

Author: Dasaineee

client/src/views/pages/Procurement/VendorManagement.js

@@ -47,11 +47,14 @@ const Vendors = () => {
           },
         })
 
+        console.log('Response:', response)
+
         if (!response.ok) {
           throw new Error(`HTTP error! Status: ${response.status}`)
         }
 
         const data = await response.json()
+        console.log('Data:', data)
         setUsers(data.vendors)
       } catch (error) {
         console.error('Error fetching vendors:', error)
@@ -152,7 +155,6 @@ const Vendors = () => {
           {alertMessage}
         </CAlert>
       )}
-
       <CRow>
         <CCol xs="12">
           <CCard className="shadow-lg">

server/controller/vendor.js

@@ -2,20 +2,19 @@ import mongoose from "mongoose";
 import Vendor from "../models/vendor.js";
 import User from "../models/UserModel.js";
 
-// GET /api/v1/vendor/with-users
 export const getAllVendorsWithUserDetails = async (req, res) => {
     try {
         const vendorUsers = await User.find({ role: "vendor" }).lean();
 
         const userIds = vendorUsers.map((user) => user._id);
+
         const vendorProfiles = await Vendor.find({ userId: { $in: userIds } }).lean();
 
-        const vendorMap = {};
-        vendorProfiles.forEach((vendor) => {
-            vendorMap[vendor.userId.toString()] = vendor;
-        });
+        const vendorMap = vendorProfiles.reduce((acc, vendor) => {
+            acc[vendor.userId.toString()] = vendor;
+            return acc;
+        }, {});
 
-        // Merge user with corresponding vendor profile
         const combined = vendorUsers.map((user) => ({
             ...user,
             vendorProfile: vendorMap[user._id.toString()] || null,

server/routes/v1/vendor.js

@@ -1,19 +1,10 @@
 import express from "express";
-
 import { getAllVendorsWithUserDetails, getAllVendors, updateVendor, deleteVendor, approveVendor, rejectVendor, unapproveVendor } from "../../controller/vendor.js";
 
 const router = express.Router();
 
 router.get("/with-users", getAllVendorsWithUserDetails);
 router.get("/", getAllVendors);
-/*router.get("/:id", (req, res, next) => {
-    const { id } = req.params;
-    if (!mongoose.Types.ObjectId.isValid(id)) {
-        return res.status(400).json({ error: "Invalid vendor ID" });
-    }
-    return getVendorById(req, res, next);
-}); */
-
 router.put("/:id", updateVendor);
 router.delete("/:id", deleteVendor);
 router.put("/approve/:id", approveVendor);