Merge branch 'develop' of github.com:atlp-rwanda/e-commerce-ninjas-bn…

… into fixes

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/middlewares/authorization.ts

@@ -8,7 +8,6 @@ import { decodeToken } from "../helpers";
 import Session from "../databases/models/sessions";
 import { Socket } from "socket.io"
 import { ExtendedError } from "socket.io/dist/namespace"
-import cookie from "cookie";
 
 
 interface ExtendedRequest extends Request {
@@ -19,7 +18,7 @@ interface ExtendedRequest extends Request {
 export const userAuthorization = function (roles: string[]) {
   return async (req: ExtendedRequest, res: Response, next: NextFunction) => {
     try {
-      const token = req.cookies.token;
+      const token = req.headers["authorization"]?.split(" ")[1];
 
       if (!token) {
         return res
@@ -71,19 +70,7 @@ export const userAuthorization = function (roles: string[]) {
 
 export const socketAuthMiddleware = async (socket: Socket, next: NextFunction) => {
   try {
-    // Extract the cookie from the socket handshake headers
-    const cookies = socket.handshake.headers.cookie;
-
-    if (!cookies) {
-      const err = new Error("Authentication error") as ExtendedError;
-      err.data = { message: "No cookies found" };
-      return next(err);
-    }
-
-    // Parse the cookies and extract the token
-    const parsedCookies = cookie.parse(cookies);
-    const token = parsedCookies.token; // Adjust 'token' to match the cookie name where the token is stored
-
+    const token = socket.handshake.auth.token;
     if (!token) {
       const err = new Error("Authentication error") as ExtendedError;
       err.data = { message: "No token provided" };
@@ -120,7 +107,7 @@ export const socketAuthMiddleware = async (socket: Socket, next: NextFunction) =
       firstName: user.firstName,
       lastName: user.lastName,
       email: user.email,
-      role: user.role,
+      role:user.role,
       profilePicture: user.profilePicture,
     };
 
@@ -130,4 +117,4 @@ export const socketAuthMiddleware = async (socket: Socket, next: NextFunction) =
     err.data = { message: "Internal server error" };
     return next(err);
   }
-};
+};

src/modules/auth/controller/authControllers.ts

@@ -151,12 +151,6 @@ const loginUser = async (req: any, res: Response) => {
       otp: null
     };
     await authRepositories.createSession(session);
-    res.cookie('token', token, {
-      httpOnly: process.env.NODE_ENV === 'production' ? true : false,
-      secure: process.env.NODE_ENV === 'production' ? true : false,
-      sameSite: process.env.NODE_ENV === 'production' ? 'strict' : 'lax',
-      maxAge: 3600000
-    });
     res
       .status(httpStatus.OK)
       .json({ message: "Logged in successfully", data: { token } });
@@ -175,12 +169,6 @@ const logoutUser = async (req: any, res: Response) => {
       "token",
       req.session.token
     );
-    res.cookie('token', "", {
-      httpOnly: process.env.NODE_ENV === 'production' ? true : false,
-      secure: process.env.NODE_ENV === 'production' ? true : false,
-      sameSite: process.env.NODE_ENV === 'production' ? 'strict' : 'lax',
-      expires: new Date(0)
-    });
     res.status(httpStatus.OK).json({ status: httpStatus.OK, message: "Successfully logged out" });
   } catch (err) {
     return res

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);
 };
 

src/modules/auth/test/auth.spec.ts

@@ -882,11 +882,10 @@ describe("updateUser2FA", () => {
     router()
       .post("/api/auth/login")
       .send({
-        email: "seller4@gmail.com",
+        email: "ijbapte@gmail.com",
         password: "Password@123"
       })
       .end((error, response) => {
-        console.log(response)
         token = response.body.data.token;
         done(error);
       });
@@ -1029,7 +1028,7 @@ describe("verifyUserCredentials Middleware", () => {
     router()
       .post("/api/auth/login")
       .send({
-        email: "seller4@gmail.com",
+        email: "ijbapte@gmail.com",
         password: "Password@123"
       })
       .end((error, response) => {

src/modules/product/controller/productController.ts

@@ -441,6 +441,31 @@ const sellerGetOrdersHistory = async(req: ExtendRequest, res:Response)=>{
  })
 }
 
+const getProductsByShopId = async (req: ExtendRequest, res: Response) => {
+  try {
+    const products = await productRepositories.getProductsByShopId(req.params.id);
+
+    if (products.length === 0) {
+      return res.status(httpStatus.OK).json({
+        status: httpStatus.OK,
+        message: "No products found for this shop",
+        data: { products: [] },
+      });
+    }
+
+    res.status(httpStatus.OK).json({
+      status: httpStatus.OK,
+      message: "Products fetched successfully",
+      data: { products },
+    });
+  } catch (error) {
+    res.status(httpStatus.INTERNAL_SERVER_ERROR).json({
+      status: httpStatus.INTERNAL_SERVER_ERROR,
+      message: error.message,
+    });
+  }
+};
+
 export {
   sellerCreateProduct,
   sellerCreateShop,
@@ -460,5 +485,6 @@ export {
   buyerViewWishListProducts,
   buyerDeleteWishListProduct,
   adminGetShops,
-  sellerGetOrdersHistory
+  sellerGetOrdersHistory,
+  getProductsByShopId
 };

src/modules/product/repositories/productRepositories.ts

@@ -250,6 +250,10 @@ const sellerGetOrdersHistory = async (shopId: string) => {
   return db.Orders.findAll({ where: { shopId } });
 };
 
+const getProductsByShopId = async (shopId: string) => {
+  return await db.Products.findAll({ where: { shopId } });
+};
+
 export default {
   createProduct,
   updateProduct,
@@ -280,7 +284,8 @@ export default {
   removeWishList,
   userCreateReview,
   findSingleProductById,
-  sellerGetOrdersHistory
+  sellerGetOrdersHistory,
+  getProductsByShopId
 };
 
 

src/modules/product/test/product.spec.ts

@@ -50,8 +50,9 @@ describe("Product and Shops API Tests", () => {
   before((done) => {
     router()
       .post("/api/auth/login")
-      .send({ email: "dj@gmail.com", password: "Password@123" })
+      .send({ email: "jadowacu@gmail.com", password: "Password@123" })
       .end((err, res) => {
+        console.log(res);
         token = res.body.data.token;
         done(err);
       });
@@ -399,7 +400,7 @@ describe("Seller test cases", () => {
   before((done) => {
     router()
       .post("/api/auth/login")
-      .send({ email: "seller@gmail.com", password: "Password@123" })
+      .send({ email: "aimegetz@gmail.com", password: "Password@123" })
       .end((err, res) => {
         token = res.body.data.token;
         done(err);
@@ -465,7 +466,6 @@ describe("Seller test cases", () => {
 //   //       description: "A new Shops description",
 //   //     })
 //   //     .end((err, res) => {
-//   //       console.log(res)
 //   //       expect(res).to.have.status(httpStatus.INTERNAL_SERVER_ERROR);
 //   //       expect(res.body).to.have.property("message");
 //   //       done(err);
@@ -601,7 +601,7 @@ describe("Product Controller", () => {
   before((done) => {
     router()
       .post("/api/auth/login")
-      .send({ email: "seller3@gmail.com", password: "Password@123" })
+      .send({ email: "ndahimana154@gmail.com", password: "Password@123" })
       .end((err, res) => {
         token = res.body.data.token;
         done(err);