Fixes

package.json

@@ -79,6 +79,7 @@
     "chai-http": "^4.4.0",
     "cloudinary": "^2.2.0",
     "compression": "^1.7.4",
+    "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "coverage": "^0.4.1",
     "coveralls": "^3.1.1",
@@ -122,6 +123,7 @@
   "devDependencies": {
     "@types/bcrypt": "^5.0.2",
     "@types/compression": "^1.7.5",
+    "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/jsonwebtoken": "^9.0.6",

src/databases/migrations/20240704115209-create-termsAndCondition.ts

@@ -4,20 +4,28 @@ export default {
   up: async (queryInterface: QueryInterface) => {
     await queryInterface.createTable("termsAndConditions", {
 
-    id: {
-      type: DataTypes.UUID,
-      allowNull: false,
-      primaryKey: true,
-      defaultValue: DataTypes.UUIDV4
-    },
-    content: {
+      id: {
+        type: DataTypes.UUID,
         allowNull: false,
-        type: DataTypes.STRING
-    },
-    type: {
+        primaryKey: true,
+        defaultValue: DataTypes.UUIDV4
+      },
+      content: {
+        allowNull: true,
+        type: DataTypes.TEXT
+      },
+      type: {
         type: DataTypes.STRING,
-        allowNull: true
-    },
+        allowNull: false
+      },
+      pdfUrl: {
+        type: DataTypes.STRING,
+        allowNull: true,
+        unique: true,
+        validate: {
+          isUrl: true
+        }
+      },
       createdAt: {
         allowNull: false,
         type: DataTypes.DATE,

src/databases/models/termsAndCodition.ts

@@ -9,11 +9,13 @@ export interface ITermsAndConditions {
     id: string;
     content:string;
     type: string;
+    pdfUrl: string;
 }
 class TermsAndConditions extends Model<ITermsAndConditions> implements ITermsAndConditions {
     declare id: string;
     declare content: string;
     declare type: string;     
+    declare pdfUrl: string;
 
     static associate() {
 
@@ -29,12 +31,20 @@ TermsAndConditions.init(
             defaultValue: DataTypes.UUIDV4
         },
         content: {
-            allowNull: false,
-            type: DataTypes.STRING,
+            allowNull: true,
+            type: DataTypes.TEXT,
         },
         type: {
             type: DataTypes.STRING,
-            allowNull: true
+            allowNull: false
+        },
+        pdfUrl:{
+            type: DataTypes.STRING,
+            allowNull: true,
+            unique: true,
+            validate:{
+                isUrl: true
+            }
         }
     },
     {

src/databases/seeders/20240520202759-users.ts

@@ -88,7 +88,7 @@ const userFour = {
   passwordUpdatedAt: new Date(),
   firstName: "F Seller",
   lastName: "L Seller",
-  email: "seller@gmail.com",
+  email: "aimegetz@gmail.com",
   password: hashPassword("Password@123"),
   phone: 25089767099,
   profilePicture: "https://res.cloudinary.com/djrmfg6k9/image/upload/v1720294521/cce1ffu7uw3j2vg9s2vl.jpg",
@@ -109,7 +109,7 @@ const userFive = {
   passwordUpdatedAt: new Date(),
   firstName: "dj5090",
   lastName: "dj2090",
-  email: "dj@gmail.com",
+  email: "jadowacu@gmail.com",
   password: hashPassword("Password@123"),
   phone: 25089767899,
   profilePicture: "https://res.cloudinary.com/djrmfg6k9/image/upload/v1720294521/cce1ffu7uw3j2vg9s2vl.jpg",
@@ -130,7 +130,7 @@ const userSix = {
   passwordUpdatedAt: new Date(),
   firstName: "F Seller3",
   lastName: "L Seller3",
-  email: "seller3@gmail.com",
+  email: "ndahimana154@gmail.com",
   password: hashPassword("Password@123"),
   phone: 25089767899,
   profilePicture: "https://res.cloudinary.com/djrmfg6k9/image/upload/v1720294521/cce1ffu7uw3j2vg9s2vl.jpg",
@@ -151,7 +151,7 @@ const userSeven = {
   passwordUpdatedAt: new Date(),
   firstName: "F Seller4",
   lastName: "L Seller4",
-  email: "seller4@gmail.com",
+  email: "ijbapte@gmail.com",
   password: hashPassword("Password@123"),
   phone: 25089767899,
   profilePicture: "https://res.cloudinary.com/djrmfg6k9/image/upload/v1720294521/cce1ffu7uw3j2vg9s2vl.jpg",

src/databases/seeders/20240601224834-shops.ts

@@ -3,58 +3,60 @@ import { shopFiveId, shopFourId, shopOneId, shopSixId, shopThreeId, shopTwoId, u
 
 const shopOne = {
     id: shopOneId,
-    name: "Paccy Shop 250",
+    name: "GadgetHub 250",
     userId: userFourId,
-    description: "Selling",
+    description: "Your one-stop shop for the latest gadgets and electronics.",
     createdAt: new Date(),
     updatedAt: new Date()
 }
 
 const shopTwo = {
     id: shopTwoId,
-    name: "Paccy Shop 509",
+    name: "UrbanStyle Boutique",
     userId: userSevenId,
-    description: "Selling",
+    description: "Bringing you the trendiest fashion and accessories in town.",
     createdAt: new Date(),
     updatedAt: new Date()
 }
 
 const shopThree = {
     id: shopThreeId,
-    name: "Shoes Shop 509",
+    name: "SoleMates",
     userId: userFourTeenId,
-    description: "Selling",
+    description: "Premium footwear for every step of your journey.",
     createdAt: new Date(),
     updatedAt: new Date()
 }
+
 const shopFour = {
     id: shopFourId,
-    name: "electronic Shop 509",
+    name: "TechNest",
     userId: userSixId,
-    description: "Selling",
+    description: "Explore a world of cutting-edge electronics and accessories.",
     createdAt: new Date(),
     updatedAt: new Date()
 }
+
 const shopFive = {
     id: shopFiveId,
-    name: "Shop 509",
+    name: "HomeEssentials",
     userId: userFiveId,
-    description: "Selling",
+    description: "Everything you need to make your house a home.",
     createdAt: new Date(),
     updatedAt: new Date()
 }
+
 const shopSix = {
     id: shopSixId,
-    name: "electronics Shop 509",
+    name: "ElectroMart",
     userId: userFiveTeenId,
-    description: "Selling",
+    description: "Your trusted source for all things electronic.",
     createdAt: new Date(),
     updatedAt: new Date()
 }
 
-
 export const up = async (queryInterface: QueryInterface) => {
-    await queryInterface.bulkInsert("shops", [shopOne, shopTwo,shopThree,shopFour, shopFive, shopSix]);
+    await queryInterface.bulkInsert("shops", [shopOne, shopTwo, shopThree, shopFour, shopFive, shopSix]);
 };
 
 export const down = async (queryInterface: QueryInterface) => {

src/databases/seeders/20240601224835-products.ts

@@ -51,7 +51,7 @@ const productTwo = {
   description: "A women's bag is a fashionable and functional accessory designed to carry personal belongings. Available in various styles, sizes, and materials, women's bags cater to diverse needs and preferences. From elegant clutches and chic handbags to spacious totes and practical backpacks, each type serves a unique purpose. High-quality women's bags offer a blend of style, durability, and convenience, making them essential for everyday use, special occasions, and professional settings.",
   price: 19.99,
   discount: "13%",
-  category: "Handbags:",
+  category: "Handbags",
   expiryDate: new Date("2050-12-31"),
   expired: false,
   bonus: "Bonus 1",

src/index.ts

@@ -1,4 +1,5 @@
 import express, { Express, Request, Response, NextFunction } from "express";
+import cookieParser from "cookie-parser";
 import dotenv from "dotenv";
 import morgan from "morgan";
 import compression from "compression";
@@ -19,7 +20,7 @@ const app: Express = express();
 const PORT = process.env.PORT; 
 const server = createServer(app);
 
-const allowedOrigins = ["http://localhost:5000" , "https://e-commerce-ninja-fn-staging.netlify.app"]; 
+const allowedOrigins = ["http://localhost:5000" , "https://e-commerce-ninjas.netlify.app"]; 
 
 export const io = new Server(server, {
   cors: {
@@ -42,7 +43,11 @@ app.use((req: Request, res: Response, next: NextFunction) => {
 
 app.use(morgan(process.env.NODE_EN));
 app.use(compression());
-app.use(cors());
+app.use(cookieParser());
+app.use(cors({
+  origin:allowedOrigins,
+  credentials:true
+}));
 
 app.use("/api-docs", SwaggerUi.serve, SwaggerUi.setup(Document));
 app.use("/api", router);

src/middlewares/authorization.ts

@@ -117,4 +117,4 @@ export const socketAuthMiddleware = async (socket: Socket, next: NextFunction) =
     err.data = { message: "Internal server error" };
     return next(err);
   }
-};
+};

src/middlewares/validation.ts

@@ -1049,33 +1049,37 @@ const isSellerRequestExist = async (
     const role = req.user.role;
     let existingRequest = null;
     let user = null;
-    if(req.params.userId){
-      user = await userRepositories.findUserById(req.params.userId)
-    }
 
     switch (role) {
       case "admin":
         const requestCount = await db.SellerProfile.count();
+
         if (requestCount === 0) {
           return res.status(httpStatus.NOT_FOUND).json({
             status: httpStatus.NOT_FOUND,
             message: "No seller requests found",
           });
         }
-        if(req.params.userId){
-        existingRequest = await userRepositories.findSellerRequestByUserId(req.params.userId);
-        if (!existingRequest) {
-          return res.status(httpStatus.NOT_FOUND).json({
-            status: httpStatus.NOT_FOUND,
-            message: "No seller requests found for the provided user ID",
-          });
+
+        if (req.params.userId) {
+          existingRequest = await userRepositories.findSellerRequestByUserId(req.params.userId);
+          user = await userRepositories.findUserById(req.params.userId);
+
+          if (!existingRequest) {
+            return res.status(httpStatus.NOT_FOUND).json({
+              status: httpStatus.NOT_FOUND,
+              message: "No seller requests found for the provided user ID",
+            });
+          }
+
+          req.user = user;
         }
-      }
         break;
 
       case "buyer":
         const userId = req.user.id || req.params.userId;
         existingRequest = await userRepositories.findSellerRequestByUserId(userId);
+
         if (existingRequest) {
           return res.status(httpStatus.BAD_REQUEST).json({
             status: httpStatus.BAD_REQUEST,
@@ -1090,7 +1094,7 @@ const isSellerRequestExist = async (
           message: "Invalid role or request",
         });
     }
-    req.user = user
+
     next();
   } catch (error) {
     return res.status(httpStatus.INTERNAL_SERVER_ERROR).json({
@@ -1100,6 +1104,7 @@ const isSellerRequestExist = async (
   }
 };
 
+
 const isRequestAcceptedOrRejected = (req: any, res: Response, next: NextFunction) => {
   try {
     const { requestStatus } = req.body;

src/modules/auth/controller/authControllers.ts

@@ -47,7 +47,7 @@ const registerSeller = async (req: Request, res: Response): Promise<void> => {
     const { firstName, lastName, email, password, phone, businessName, businessDescription, Tin, mobileNumber, mobilePayment, bankPayment, bankAccount, bankName,terms } = req.body;
     if (req.file) {
       const result = await uploadImages(req.file);
-      console.log(result)
+
       req.body.rdbDocument = result.secure_url;
     }
 
@@ -59,7 +59,6 @@ const registerSeller = async (req: Request, res: Response): Promise<void> => {
       phone,
       role: "seller",
     }
-    console.log(userInfo)
 
     const sellerData = {
       businessName,

src/modules/auth/repository/authRepositories.ts

@@ -4,7 +4,6 @@ import { Op } from "sequelize";
 import db from "../../../databases/models";
 
 const createUser = async (body: any) => {
-  console.log("body" + JSON.stringify(body))
   return await db.Users.create(body);
 };