adde some file

added coverages fix(review-swagger-docs): fix swagger documentation of thereview task (#114) - add missing security tag in review docs [Fixes #113] adde some file added some tests added coverages fix(review-swagger-docs): fix swagger documentation of thereview task (#114) - add missing security tag in review docs [Fixes #113] adde some file * fix(create-review): fix failing create review function -add validation before processing data [Fixes #116] * fix(create-review): fix failing create review function -add validation before processing data [Fixes #116] dockerizing project by creating containers for app & postgres (#110) fix minor issue in deployment of render latest commit Update Readme file to include Docker-specific information Update Readme file to include Docker-specific information * fix(create-review): fix failing create review function -add validation before processing data [Fixes #116] * fix(create-review): fix failing create review function -add validation before processing data [Fixes #116] dockerizing project by creating containers for app & postgres (#110) fix minor issue in deployment of render latest commit Update Readme file to include Docker-specific information Update Readme file to include Docker-specific information fix(review-swagger-docs): fix swagger documentation of thereview task (#114) (#115) - add missing security tag in review docs [Fixes #113] update profile (#72) (#104) review controller adding testing fix lint issue update profile (#72) (#104) review controller adding testing fix lint issue Co-authored-by: Joslyn Manzi Karenzi <[email protected]> fix(stripe-payment): fix minor issue in stripe payment (#120) - add status check on the stripe response before setting order.paid to true [Fixes #119]
atlp-rwanda · Jun 4, 2024 · 65ef6d7 · 65ef6d7
1 parent de5f934
commit 65ef6d7
Show file tree

Hide file tree

Showing 10 changed files with 778 additions and 102 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "format": "prettier --write .",
     "test": "cross-env NODE_ENV=test jest --runInBand --no-cache --detectOpenHandles",
     "test:ci": "cross-env NODE_ENV=test jest --runInBand --coverage --detectOpenHandles"
-  },
+  }, 
   "repository": {
     "type": "git",
     "url": "git+https://github.com/atlp-rwanda/dynamites-ecomm-be.git"

diff --git a/src/__test__/buyerWishlist.test.ts b/src/__test__/buyerWishlist.test.ts
@@ -0,0 +1,143 @@
+import request from 'supertest';
+import app from '../app';
+import { afterAllHook, beforeAllHook } from './testSetup';
+import { getBuyerToken, getVendorToken } from './testSetup';
+
+beforeAll(beforeAllHook);
+afterAll(afterAllHook);
+export let buyerToken: string;
+let vendorToken: string;
+let productId: number;
+let categoryId: number;
+
+beforeAll(async () => {
+  buyerToken = await getBuyerToken();
+  vendorToken = await getVendorToken();
+
+  const categoryData = {
+    name: 'Category4',
+    description: 'category description',
+  };
+
+  const categoryResponse = await request(app)
+    .post('/api/v1/category')
+    .set('Authorization', `Bearer ${vendorToken}`)
+    .send(categoryData);
+
+  categoryId = categoryResponse.body.data.id;
+
+  const productData = {
+    name: 'New Product Two',
+    image: 'new_product.jpg',
+    gallery: [],
+    shortDesc: 'This is a new product',
+    longDesc: 'Detailed description of the new product',
+    categoryId: categoryId,
+    quantity: 10,
+    regularPrice: 5,
+    salesPrice: 4,
+    tags: ['tag1', 'tag2'],
+    type: 'Simple',
+    isAvailable: true,
+  };
+
+  const response = await request(app)
+    .post('/api/v1/product')
+    .set('Authorization', `Bearer ${vendorToken}`)
+    .send(productData);
+
+  productId = response.body.data.id;
+
+  const getResponse = await request(app)
+    .get(`/api/v1/buyer/get_product/${productId}`)
+    .set('Authorization', `Bearer ${buyerToken}`);
+
+  expect(getResponse.statusCode).toEqual(200);
+  expect(getResponse.body.msg).toEqual('Product retrieved successfully');
+});
+
+describe('POST /api/v1/buyer/addItemToWishList', () => {
+  it('should add an item to the wishlist', async () => {
+    const res = await request(app)
+      .post('/api/v1/buyer/addItemToWishList')
+      .set('Authorization', `Bearer ${buyerToken}`)
+      .send({
+        productId: productId,
+        time: '2024-05-21T12:00:00Z',
+      });
+
+    expect(res.statusCode).toEqual(201);
+    expect(res.body.message).toContain('Wishlist successfully created');
+  });
+
+  it('should not allow adding an item already in the wishlist', async () => {
+    await request(app)
+      .post('/api/v1/buyer/addItemToWishList')
+      .set('Authorization', `Bearer ${buyerToken}`)
+      .send({
+        productId: productId,
+        time: '2024-05-21T12:00:00Z',
+      });
+
+    const res = await request(app)
+      .post('/api/v1/buyer/addItemToWishList')
+      .set('Authorization', `Bearer ${buyerToken}`)
+      .send({
+        productId: productId,
+        time: '2024-05-21T12:00:00Z',
+      });
+
+    expect(res.statusCode).toEqual(409);
+    expect(res.body.message).toContain('Product is already in the wishlist');
+  });
+});
+
+describe('DELETE /api/v1/buyer/removeToWishList', () => {
+  it('should remove a product from the wishlist', async () => {
+    const res = await request(app)
+      .delete('/api/v1/buyer/removeToWishList')
+      .set('Authorization', `Bearer ${buyerToken}`)
+      .send({
+        productId: productId,
+      });
+
+    expect(res.statusCode).toEqual(200);
+    expect(res.body.message).toContain(
+      'Product successfully removed from wishlist'
+    );
+  });
+});
+
+describe('GET /api/v1/buyer/getWishList', () => {
+  it('should get all wishlists', async () => {
+    const res = await request(app)
+      .get('/api/v1/buyer/getWishList')
+      .set('Authorization', `Bearer ${buyerToken}`);
+
+    expect(res.statusCode).toEqual(200);
+    expect(res.body.message).toContain('Data retrieved successfully');
+  });
+});
+describe('GET /api/v1/buyer/getOneWishList', () => {
+  it('should get all wishlists', async () => {
+    const res = await request(app)
+      .get('/api/v1/buyer/getOneWishList')
+      .set('Authorization', `Bearer ${buyerToken}`);
+
+    expect(res.statusCode).toEqual(200);
+    expect(res.body.message).toContain('Data retrieved successfully');
+  });
+});
+
+describe('RemoveProductFromWishList', () => {
+  it('should return an error when the wishlist or product is not found', async () => {
+    const res = await request(app)
+      .delete('/api/v1/buyer/removeToWishList')
+      .set('Authorization', `Bearer ${buyerToken}`)
+      .send({
+        productId: 9999,
+      });
+    expect(res.statusCode).toEqual(404);
+    expect(res.body.message).toContain('Product not found in wishlist');
+  });
+});
diff --git a/src/__test__/payment.test.ts b/src/__test__/payment.test.ts
@@ -36,7 +36,6 @@ describe('handlePayment', () => {
       id: 'charge_id',
       amount: 10000,
       currency: 'usd',
-      status: 'succeeded',
     } as Stripe.Charge);
 
     MockedStripe.prototype.charges = {

diff --git a/src/controller/buyerController.ts b/src/controller/buyerController.ts
@@ -5,59 +5,51 @@ import errorHandler from '../middlewares/errorHandler';
 import Stripe from 'stripe';
 import { Order } from '../database/models/orderEntity';
 
-
-const stripe = new Stripe(process.env.STRIPE_SECRET_KEY || '', { apiVersion: '2024-04-10' });
+const stripe = new Stripe(process.env.STRIPE_SECRET_KEY || '', {
+  apiVersion: '2024-04-10',
+});
 const productRepository = dbConnection.getRepository(Product);
 const orderRepository = dbConnection.getRepository(Order);
 
-
-
 export const getOneProduct = errorHandler(
   async (req: Request, res: Response) => {
     const productId = parseInt(req.params.id);
-
-
+
     const product = await productRepository.findOne({
       where: { id: productId },
       relations: ['category'],
     });
-
-
+
     if (!product) {
       return res.status(404).json({ msg: 'Product not found' });
     }
-
-
+
     return res
       .status(200)
       .json({ msg: 'Product retrieved successfully', product });
   }
- );
-
-
-
-
- export const handlePayment = errorHandler(
+);
+
+export const handlePayment = errorHandler(
   async (req: Request, res: Response) => {
     const { token, orderId } = req.body;
-
-
+
     const order = await orderRepository.findOne({ where: { id: orderId } });
-
-
+
     if (!order) {
-      return res.status(404).json({ success: false, message: 'Order not found' });
+      return res
+        .status(404)
+        .json({ success: false, message: 'Order not found' });
     }
-
-
+
     if (order.paid) {
-      return res.status(400).json({ success: false, message: 'Order has already been paid' });
+      return res
+        .status(400)
+        .json({ success: false, message: 'Order has already been paid' });
     }
-
-
+
     const amountInCents = order.totalAmount * 100;
-
-
+
     const charge = await stripe.charges.create({
       amount: amountInCents,
       currency: 'usd',
@@ -67,14 +59,15 @@ export const getOneProduct = errorHandler(
 
     if (charge.status === 'succeeded') {
       order.paid = true;
-      await orderRepository.save(order)
+      await orderRepository.save(order);
 
-      return res.status(200).json({ success: true, paid: true, charge});
-    }else{
-      return res
-      .status(400)
-      .json({ success: false, paid: false, message: `Charge status: ${charge.status}` });
-    }  
+      return res.status(200).json({ success: true, paid: true, charge });
+    } else {
+      return res.status(400).json({
+        success: false,
+        paid: false,
+        message: `Charge status: ${charge.status}`,
+      });
+    }
   }
- );
-
+);