Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions controllers/authController.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ import User from "../models/User.js";
import jwt from "jsonwebtoken";

export const registerUser = async (req, res) => {
console.log(">>>>Register user function callled",req.body);

try {
const { username, email, password, role, age } = req.body;
const { username, email, password, age } = req.body;

if (!username || !email || !password) {
return res
Expand All @@ -18,12 +16,10 @@ export const registerUser = async (req, res) => {
return res.status(400).json({ message: "User already exists" });
}

// Include optional fields role and age
const user = await User.create({
username,
email,
password,
role: role || "user",
age: age || null,
});

Expand Down Expand Up @@ -70,7 +66,6 @@ export const loginUser = async (req, res) => {
username: user.username,
email,
token,
role: user.role,
});
} catch (error) {
console.log(error);
Expand Down
11 changes: 3 additions & 8 deletions controllers/productController.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export const addProduct = async (req, res, next) => {
publisher,
isbn,
stock,
// createdBy: req.user._id
});
res.status(201).json(product);
} catch (err) {
Expand All @@ -24,16 +23,13 @@ export const addProduct = async (req, res, next) => {
export const getProducts = async (req, res, next) => {
try {
const query = {};
// console.log(">>>>>req.query", req.query.category);

// Category filter (case-insensitive)
if (req.query.category) {
query.category = {
$regex: new RegExp(`^${req.query.category.trim()}$`, "i"),
$regex: new RegExp(`^${req.query.category.trim().replace(/[.*+?^${}()|[\]\]/g, '\$&')}$`, "i"),
};
}

// Price range filter
if (req.query.minPrice || req.query.maxPrice) {
query.price = {};
if (req.query.minPrice) query.price.$gte = Number(req.query.minPrice);
Expand Down Expand Up @@ -75,17 +71,16 @@ export const updateProduct = async (req, res, next) => {

// Delete product
export const deleteProduct = async (req, res, next) => {
console.log(">>>>>delet product function called")
try {
const product = await Product.findById(req.params.id);
if (!product) {
res.status(404);
return next(new Error('Product not found'));
}

await product.deleteOne(); // ✅ updated from remove()
await product.deleteOne();
res.json({ message: 'Product deleted' });
} catch (err) {
next(err);
}
};
};
18 changes: 3 additions & 15 deletions controllers/userController.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,17 @@ import User from "../models/User.js";


export const getallUsers = async (req, res, next) => {
// console.log(">>>>req.headers",req.headers)
console.log(">>>>>>function called")
try {
const query = {};

// Age filter (convert to Number)
if (req.query.age) {
query.age = Number(req.query.age);
}

// Role filter (case-insensitive & trim spaces)
if (req.query.role) {
query.role = { $regex: new RegExp(`^${req.query.role.trim()}$`, 'i') };
query.role = { $regex: new RegExp(`^${req.query.role.trim().replace(/[.*+?^${}()|[\]\]/g, '\$&')}$`, 'i') };
}

console.log("Final Query:", query); // Debugging

const users = await User.find(query).select('-password');
res.json(users);
} catch (err) {
Expand All @@ -29,26 +23,20 @@ export const getallUsers = async (req, res, next) => {

export const getUserByIdPublic = async (req, res, next) => {
try {
console.log(req)
console.log(req.params)
const userId = req.params.id.trim();

// 1️⃣ Validate ID format
if (!mongoose.Types.ObjectId.isValid(userId)) {
return res.status(400).json({ message: 'Invalid user ID format' });
}

// 2️⃣ Find user, exclude password
const user = await User.findById(userId).select('-password');

// 3️⃣ Handle not found
if (!user) {
return res.status(404).json({ message: `User with ID ${userId} not found` });
}

// 4️⃣ Return user
res.status(200).json(user);
} catch (err) {
next(err); // Pass errors to your global error handler
next(err);
}
};
};
4 changes: 2 additions & 2 deletions models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const userSchema = new mongoose.Schema(
username: { type: String, required: true },
email: { type: String, required: true, unique: true },
password: { type: String, required: true },
role: { type: String, default: "user" },
age: { type: Number }, // Added age
role: { type: String, default: "user", enum: ["user", "admin"] },
age: { type: Number },
},
{ timestamps: true }
);
Expand Down
7 changes: 4 additions & 3 deletions routes/userRoutes.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { Router } from "express";
import { getallUsers, getUserByIdPublic } from "../controllers/userController.js";
import { verifyUser } from "../middleware/authMiddleware.js";

const userRoutes = Router({ mergeParams: true });

userRoutes.get("/",getallUsers)
userRoutes.get("/", verifyUser, getallUsers)

userRoutes.get("/:id", getUserByIdPublic);
userRoutes.get("/:id", verifyUser, getUserByIdPublic);


export default userRoutes;
export default userRoutes;
1 change: 1 addition & 0 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const app = express();

const PORT = process.env.PORT || 3000;

app.use(helmet());
app.use(express.json({ limit: "30mb", extented: true }));
app.use(express.urlencoded({ limit: "30mb", extented: true }));

Expand Down