User Search Products by FIlters (#65)

* [delivers #187584936] User filter products

* mend

* mend

* mend

* [delivers #187584936] Update the search logic

* Re-test

* mend

* mend

* mend

README.md

@@ -49,6 +49,7 @@ Our e-commerce web application server, developed by Team Ninjas, facilitates smo
 - Seller update product status Endpoint
 - Seller get products Endpoint
 - User get product Endpoint
+- User search products Endpoint
 - Buyer get cart Endpoint
 
 ## TABLE OF API ENDPOINTS SPECIFICATION AND DESCRIPTION
@@ -81,7 +82,8 @@ Our e-commerce web application server, developed by Team Ninjas, facilitates smo
 | 24  | PUT    | /api/shop/seller-update-product-status/:id | 200 OK      | private | Seller update product status        |
 | 25  | GET    | /api/shop/seller-get-products              | 200 OK      | private | Seller get products                 |
 | 26  | GET    | /api/shop/user-get-products                | 200 OK      | public  | User get product                    |
-| 27  | GET    | /api/cart/buyer-get-cart                   | 200 OK      | private | Buyer get cart                      |
+| 27 | GET | /api/shop/user-search-products | 200 OK | public | User search products |
+| 28  | GET    | /api/cart/buyer-get-cart                   | 200 OK      | private | Buyer get cart                      |
 
 ## INSTALLATION
 

src/databases/seeders/20240520202759-users.ts

@@ -10,6 +10,7 @@ import {
   userSixId,
   userSevenId,
   userEightId,
+  userNineId
 } from "../../types/uuid";
 
 const userOne = {
@@ -170,17 +171,37 @@ const userEight = {
   isVerified: true,
   is2FAEnabled: false
 }
+const userNine = {
+  id: userNineId,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+  firstName: "IR Buyer2",
+  lastName: "U Buyer2",
+  email: "invalidroleuser@gmail.com",
+  password: hashPassword("Password@123"),
+  phone: 25089767809,
+  profilePicture: "",
+  gender: "male",
+  birthDate: "2-2-2014",
+  language: "english",
+  currency: "USD",
+  role: "nurse",
+  status: "enabled",
+  isVerified: true,
+  is2FAEnabled: false
+}
 
 export const up = (queryInterface: QueryInterface) =>
   queryInterface.bulkInsert("users", [
-    userOne,
+    userOne, 
     userTwo,
     userThree,
     userFour,
     userFive,
     userSix,
     userSeven,
     userEight,
+    userNine
   ]);
 
 export const down = async (queryInterface: QueryInterface) => {

src/middlewares/authorization.ts

@@ -48,10 +48,9 @@ export const userAuthorization = function (roles: string[]) {
       }
 
       if (!roles.includes(user.role)) {
-        res
+        return res
           .status(httpStatus.UNAUTHORIZED)
           .json({ status: httpStatus.UNAUTHORIZED, message: "Not authorized" });
-          return;
       }
 
       req.user = user;

src/middlewares/validation.ts

@@ -13,6 +13,11 @@ import Shops from "../databases/models/shops";
 import Products from "../databases/models/products";
 import { ExtendRequest } from "../types";
 import { sendEmail } from "../services/sendEmail";
+import { Op } from "sequelize";
+
+
+const currentDate = new Date();
+
 import cartRepositories from "../modules/cart/repositories/cartRepositories";
 import db from "../databases/models";
 
@@ -386,7 +391,7 @@ const isGoogleEnabled = async (req: any, res: Response, next: NextFunction) => {
 
 const isCartExist = async (req: any, res: Response, next: NextFunction) => {
   const cart = await cartRepositories.getCartByUserId(req.user.id);
-  if(!cart) return res.status(httpStatus.NOT_FOUND).json({ status: httpStatus.NOT_FOUND, message: "Cart not found. Please add items to your cart." })
+  if (!cart) return res.status(httpStatus.NOT_FOUND).json({ status: httpStatus.NOT_FOUND, message: "Cart not found. Please add items to your cart." })
   return next();
 }
 
@@ -404,16 +409,73 @@ const isPaginated = (req: any, res: Response, next: NextFunction) => {
 };
 
 
+const isSearchFiltered = (req: ExtendRequest, res: Response, next: NextFunction) => {
+  const name = req.query.name || undefined;
+  const category = req.query.category || undefined;
+  const description = req.query.description || undefined;
+  const minPrice = req.query.minprice || undefined;
+  const maxPrice = req.query.maxprice || undefined;
+
+  const searchQuery: any = { where: {} };
+
+  if ((minPrice && !maxPrice) || (!minPrice && maxPrice)) {
+    return res.status(httpStatus.BAD_REQUEST).json({
+      status: httpStatus.BAD_REQUEST,
+      message: "Minimum and maximum price are required"
+    });
+  }
+
+  if (Number(minPrice) > Number(maxPrice)) {
+    return res.status(httpStatus.BAD_REQUEST).json({
+      status: httpStatus.BAD_REQUEST,
+      message: "Minimum Price must be less than Maximum price"
+    });
+  }
+
+  const orConditions = [];
+
+  if (name !== undefined) orConditions.push({ name: { [Op.iLike]: `%${name}%` } });
+  if (category !== undefined) orConditions.push({ category });
+  if (description !== undefined) orConditions.push({ description: { [Op.iLike]: `%${description}%` } });
+  if (minPrice !== undefined && maxPrice !== undefined) {
+    orConditions.push({
+      price: {
+        [Op.gte]: minPrice,
+        [Op.lte]: maxPrice
+      }
+    });
+  }
+
+  if (orConditions.length > 0) {
+    searchQuery.where[Op.or] = orConditions;
+  }
+  searchQuery.where.status = "available";
+  searchQuery.where.expiryDate = {
+    [Op.gte]: currentDate
+  };
+
+  req.searchQuery = searchQuery;
+  return next();
+};
+
 export {
   validation,
   isUserExist,
   isAccountVerified,
-  verifyUserCredentials, isUsersExist,
-  isProductExist, isShopExist,
-  transformFilesToBody, credential,
-  isSessionExist, verifyUser, isGoogleEnabled,
-  isUserEnabled, isUserVerified, isSellerShopExist,
+  verifyUserCredentials,
+  isUsersExist,
+  isProductExist,
+  isShopExist,
+  transformFilesToBody,
+  credential,
+  isSessionExist,
+  verifyUser,
+  isGoogleEnabled,
+  isUserEnabled,
+  isUserVerified,
+  isSellerShopExist,
   verifyOtp,
   isPaginated,
+  isSearchFiltered,
   isCartExist
 };