Skip to content
This repository was archived by the owner on Sep 8, 2025. It is now read-only.

Commit 22899f1

Browse files
committed
hmmmm
1 parent 090294d commit 22899f1

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

server/controller/vendor.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const getAllVendorsWithUserDetails = async (req, res) => {
77
try {
88
const vendorUsers = await User.find({ role: "vendor" }).lean();
99

10-
const userIds = vendorUsers.map((user) => new mongoose.Types.ObjectId(user._id));
10+
const userIds = vendorUsers.map((user) => user._id);
1111
const vendorProfiles = await Vendor.find({ userId: { $in: userIds } }).lean();
1212

1313
const vendorMap = {};
@@ -38,21 +38,6 @@ export const getAllVendors = async (req, res) => {
3838
}
3939
};
4040

41-
// Get Vendor by ID
42-
export const getVendorById = async (req, res) => {
43-
try {
44-
const vendor = await Vendor.findById(req.params.id).populate("userId", "username email role status").populate("bids");
45-
46-
if (!vendor) {
47-
return res.status(404).json({ message: "Vendor not found" });
48-
}
49-
50-
res.status(200).json(vendor);
51-
} catch (error) {
52-
res.status(500).json({ message: "Server Error", error: error.message });
53-
}
54-
};
55-
5641
// Update Vendor
5742
export const updateVendor = async (req, res) => {
5843
try {
@@ -197,7 +182,20 @@ export const createVendor = async (req, res) => {
197182
198183
199184
185+
// Get Vendor by ID
186+
export const getVendorById = async (req, res) => {
187+
try {
188+
const vendor = await Vendor.findById(req.params.id).populate("userId", "username email role status").populate("bids");
189+
190+
if (!vendor) {
191+
return res.status(404).json({ message: "Vendor not found" });
192+
}
200193
194+
res.status(200).json(vendor);
195+
} catch (error) {
196+
res.status(500).json({ message: "Server Error", error: error.message });
197+
}
198+
};
201199
202200
203201

server/routes/v1/vendor.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import express from "express";
2-
import mongoose from "mongoose";
3-
import { getAllVendorsWithUserDetails, getAllVendors, getVendorById, updateVendor, deleteVendor, approveVendor, rejectVendor, unapproveVendor } from "../../controller/vendor.js";
2+
3+
import { getAllVendorsWithUserDetails, getAllVendors, updateVendor, deleteVendor, approveVendor, rejectVendor, unapproveVendor } from "../../controller/vendor.js";
44

55
const router = express.Router();
66

77
router.get("/with-users", getAllVendorsWithUserDetails);
88
router.get("/", getAllVendors);
9-
router.get("/:id", (req, res, next) => {
9+
/*router.get("/:id", (req, res, next) => {
1010
const { id } = req.params;
1111
if (!mongoose.Types.ObjectId.isValid(id)) {
1212
return res.status(400).json({ error: "Invalid vendor ID" });
1313
}
1414
return getVendorById(req, res, next);
15-
});
15+
}); */
1616

1717
router.put("/:id", updateVendor);
1818
router.delete("/:id", deleteVendor);

0 commit comments

Comments
 (0)