src/controllers/CartController.ts

@@ -14,23 +14,26 @@ export async function addToCart(req: Request, res: Response) {
       res.status(400).json({ error: 'A Valid Product id is required.' });
       return;
     }
-
-    let [product, cart] = await getProductAndCart(productId, userId);
-    console.log(`product: ${product}, cart: ${cart}`);
-
+    const isProductExists = await Product.exists({ _id: productId });
+    if (!isProductExists) {
+      res.status(404).json({ error: 'Product not found.' });
+      return;
+    }
+    let cart: ICart | null = await Cart.findOne({ userId });
     if (!cart) {
       cart = await Cart.create({
         userId,
-        products: {},
+        products: { [productId]: 1 },
       });
-    }
-    const currentQuantity = cart.products[productId];
-    if (currentQuantity === undefined) {
-      cart.products[productId] = 1;
     } else {
-      cart.products[productId] += 1;
+      const currentQuantity = cart.products[productId];
+      if (currentQuantity === undefined) {
+        cart.products[productId] = 1;
+      } else {
+        cart.products[productId] += 1;
+      }
+      cart.markModified('products');
     }
-    cart.markModified('products');
     await cart.save();
     res.status(200).json({
       products: cart.products,
@@ -41,18 +44,6 @@ export async function addToCart(req: Request, res: Response) {
   }
 }
 
-async function getProductAndCart(productId: string, userId: string) {
-  try {
-    return Promise.all([
-      Product.findById(productId),
-      Cart.findOne({ userId }),
-    ])
-  } catch (error) {
-    console.error('Error adding product to cart:', error);
-    // res.status(500).json({ error: 'An error occurred while adding the product to the cart.' });
-  }
-}
-
 export async function listCart(req: Request, res: Response) {
   try {
     const { userId } = req.body;

src/controllers/ProductController.ts

@@ -1,9 +1,9 @@
-import { Request, Response, NextFunction} from 'express';
+import { Request, Response } from 'express';
 import { Product } from '../schemas/productSchema';
 import { createProduct, getAllProducts, getOne } from '../models/productModel';
 import { ApiError } from '../utils/ApiError';
 
-const create = async (req: Request, res: Response, next: NextFunction) => {
+const create = async (req: Request, res: Response, next) => {
   try {
     const { name, description, price } = req.body;
     const product = await createProduct({

src/controllers/UserController.ts

@@ -1,10 +1,10 @@
-import { Request, Response, NextFunction } from 'express';
+import { Request, Response } from 'express';
 import { createUser, loginUser, getAllUsers, deleteUser } from '../models/userModel';
 import { ApiError } from '../utils/ApiError';
 import jwt from 'jsonwebtoken';
 import { clearJwtCookie, setJwtCookie } from '../middlewares/checkAuth';
 
-const create = async (req: Request, res: Response, next: NextFunction) => {
+const create = async (req: Request, res: Response, next) => {
   try {
     const { email, password, address } = req.body;
     const user = await createUser({
@@ -24,7 +24,7 @@ const create = async (req: Request, res: Response, next: NextFunction) => {
   }
 }
 
-const login = async (req: Request, res: Response, next: NextFunction) => {
+const login = async (req: Request, res: Response, next) => {
   try {
     const { email, password } = req.body;
     const user: any = await loginUser({
@@ -53,7 +53,7 @@ const login = async (req: Request, res: Response, next: NextFunction) => {
   }
 }
 
-const logout = async (req: Request, res: Response, next: NextFunction) => {
+const logout = async (req: Request, res: Response, next) => {
   try {
     clearJwtCookie(res);
     res.status(200).json({ message: 'Logout successful' });
@@ -65,7 +65,7 @@ const logout = async (req: Request, res: Response, next: NextFunction) => {
   }
 }
 
-const getAll = async (req: Request, res: Response, next: NextFunction) => {
+const getAll = async (req: Request, res: Response, next) => {
   try {
     const users = await getAllUsers();
     res.status(200).json(users);
@@ -77,7 +77,7 @@ const getAll = async (req: Request, res: Response, next: NextFunction) => {
   }
 }
 
-const deleteHandler = async (req: Request, res: Response, next: NextFunction) => {
+const deleteHandler = async (req: Request, res: Response, next) => {
   try {
     const { id } = req.params;
     const user = await deleteUser(id);

src/index.ts

@@ -6,6 +6,7 @@ import userRouter from './routes/userRouter';
 import productRouter from './routes/productRouter';
 import cartRouter from './routes/cartRouter';
 
+import { errorHandler } from './middlewares/errorHandler';
 import { ApiError } from './utils/ApiError';
 
 
@@ -46,6 +47,8 @@ app.all('*', (req, res, next) => {
   next(error)
 });
 
+app.use(errorHandler);
+
 
 // Start server
 app.listen(PORT, () => {

src/middlewares/errorHandler.ts

@@ -0,0 +1,15 @@
+const errorHandler = (error, req, res, next) => {
+  error.statusCode = error.statusCode || 500;
+  error.message = error.message || 'Internal server error';
+  error.status = error.status || 'error';
+  res.status(error.statusCode).json({
+    status: error.status,
+    statusCode: error.statusCode,
+    message: error.message
+  });
+  
+}
+
+export {
+  errorHandler
+}

src/middlewares/productResourceValidation.ts

@@ -1,14 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import { ApiError } from '../utils/ApiError';
-
-const isValidBody = async (req: Request, res: Response, next: NextFunction) => {
-  const { name, description, price } = req.body;
-  if (!name || !description || !price) {
-    console.log("Error in product validation")
-    const error = new ApiError(`${!name ? 'name' : !description ? 'description' : 'price'} is required}`);
-    error.statusCode = 400;
-    error.status = 'fail';
-    return next(error);
-  }
-  next();
-}

src/middlewares/usersResourceValidation.ts

@@ -1,41 +0,0 @@
-import { Request, Response, NextFunction } from 'express';
-import { ApiError } from '../utils/ApiError';
-import validate from 'deep-email-validator';
-
-const isValidLogin = async (req: Request, res: Response, next: NextFunction) => {
-  
-    const user = req.body;
-    if (!user.email || !user.password) {
-      const error = new ApiError(`${!user.email ? 'email' : 'password'} is required`);
-      error.statusCode = 400;
-      error.status = 'fail';
-      return next(error);
-    }
-
-    next();
-}
-
-const isValidCreateUser = async (req: Request, res: Response, next: NextFunction) => {
-
-  const user = req.body;
-  if (!user.email || !user.password || !user.address) {
-    const error = new ApiError(`${!user.email ? 'email' : !user.password ? 'password' : 'address'} is required}`);
-    error.statusCode = 400;
-    error.status = 'fail';
-    return next(error);
-  }
-
-  const { valid, reason } = await validate(user.email);
-  if (!valid) {
-    const error = new ApiError(`Invalid email: ${reason}`);
-    error.statusCode = 400;
-    error.status = 'fail';
-    return next(error);
-  }
-  next();
-}
-
-export {
-  isValidLogin,
-  isValidCreateUser
-}

src/models/productModel.ts

@@ -1,9 +1,10 @@
 import { Product } from '../schemas/productSchema';
 import { Request, Response } from 'express';
+import { errorHandler } from '../middlewares/errorHandler';
 import { ApiError } from '../utils/ApiError';
 
 const createProduct = async (product: any) => {
-  try { 
+  try {
 
     const newProduct = new Product(product);
     const isExist = await Product.findOne({ name: product.name, userId: product.userId });
@@ -53,19 +54,6 @@ const getOne = async (id: string) => {
   }
 }
 
-const removeProduct = async (id: string) => {
-  try {
-    const product = await Product.findByIdAndDelete(id);
-    return product;
-  } catch {
-    const error = new ApiError('Product not found');
-    error.statusCode = 404;
-    error.status = 'fail';
-    return error;
-  }
-}
-
-
 
 export {
   createProduct,

src/models/userModel.ts

@@ -1,9 +1,25 @@
 import { User } from "../schemas/userSchema";
+import validate from 'deep-email-validator';
 import { ApiError } from "../utils/ApiError";
 import bcrypt from 'bcryptjs';
 
 const createUser = async (user: any) => {
 
+  if (!user.email || !user.password || !user.address) {
+    const error = new ApiError('Missing required fields');
+    error.statusCode = 400;
+    error.status = 'fail';
+    return error;
+  }
+
+  const { valid, reason, validators } = await validate(user.email);
+  if (!valid) {
+    const error = new ApiError(reason);
+    error.statusCode = 400;
+    error.status = 'fail';
+    return error;
+  }
+
   const userExists = await User.exists({ email: user.email });
   if (userExists) {
     const error = new ApiError('User already exists, Try login :)');

src/routes/productRouter.ts

@@ -1,6 +1,6 @@
 import express from 'express';
 import { authenticateToken } from '../middlewares/checkAuth';
-import { create, getAll, getProduct } from '../controllers/ProductController';
+import { create, getAll, getProduct } from '../controllers/productController';
 
 const productRouter = express.Router();
 

src/routes/userRouter.ts

@@ -1,14 +1,12 @@
 import express from 'express';
-import { create, login, logout, getAll, deleteHandler } from '../controllers/UserController';
-import { isValidCreateUser, isValidLogin } from '../middlewares/usersResourceValidation';
-import { authenticateToken } from '../middlewares/checkAuth';
+import { create, login, logout, getAll, deleteHandler } from '../controllers/userController';
 
 const userRouter = express.Router();
 
-userRouter.post('/', isValidCreateUser, create);
+userRouter.post('/', create);
 userRouter.get('/', getAll);
-userRouter.post('/login', isValidLogin, login);
+userRouter.post('/login', login);
 userRouter.post('/logout', logout);
-userRouter.delete('/:id', authenticateToken, deleteHandler)
+userRouter.delete('/:id', deleteHandler)
 
 export default userRouter;

src/schemas/productSchema.ts

@@ -1,4 +1,5 @@
 import mongoose, { Schema, Document } from 'mongoose';
+import { Request } from 'express';
 
 interface IProduct extends Document {
   name: string;

tsconfig.json

@@ -9,6 +9,5 @@
     "sourceMap": true,
     "outDir": "./dist",
     "rootDir": "./src",
-    "noImplicitAny": true,
   }
 }