Merge pull request #103 from atlp-rwanda/ft-stripe-payment

Stripe Payment system Integration

.github/workflows/ci.yml

@@ -18,6 +18,8 @@ env:
   GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}}
   GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}}
 
+  STRIPE_SECRET_KEY: ${{secrets.STRIPE_SECRET_KEYT}}
+
 jobs:
   build-lint-test-coverage:
     runs-on: ubuntu-latest

package.json

@@ -50,6 +50,7 @@
     "reflect-metadata": "^0.2.2",
     "socket.io": "^4.7.5",
     "source-map-support": "^0.5.21",
+    "stripe": "^15.8.0",
     "superagent": "^9.0.1",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.0",

src/__test__/getProduct.test.ts

@@ -7,9 +7,11 @@ import { User, UserInterface } from '../entities/User';
 import { v4 as uuid } from 'uuid';
 import { Product } from '../entities/Product';
 import { Category } from '../entities/Category';
+import { Cart } from '../entities/Cart';
 import { cleanDatabase } from './test-assets/DatabaseCleanup';
 
 const vendor1Id = uuid();
+const BuyerID = uuid();
 const product1Id = uuid();
 const Invalidproduct = '11278df2-d026-457a-9471-4749f038df68';
 const catId = uuid();
@@ -37,6 +39,18 @@ const sampleVendor1: UserInterface = {
   photoUrl: 'https://example.com/photo.jpg',
   role: 'VENDOR',
 };
+const sampleBuyer1: UserInterface = {
+  id: BuyerID,
+  firstName: 'vendor1o',
+  lastName: 'user',
+  email: '[email protected]',
+  password: 'password',
+  userType: 'Vendor',
+  gender: 'Male',
+  phoneNumber: '000380996348',
+  photoUrl: 'https://example.com/photo.jpg',
+  role: 'BUYER',
+};
 
 const sampleCat = {
   id: catId,
@@ -53,23 +67,23 @@ const sampleProduct1 = {
   vendor: sampleVendor1,
   categories: [sampleCat],
 };
-
+let cardID : string;
 beforeAll(async () => {
   const connection = await dbConnection();
 
   const categoryRepository = connection?.getRepository(Category);
   await categoryRepository?.save({ ...sampleCat });
 
   const userRepository = connection?.getRepository(User);
-  await userRepository?.save({ ...sampleVendor1 });
+  await userRepository?.save({ ...sampleVendor1});
+  await userRepository?.save({ ...sampleBuyer1 });
 
   const productRepository = connection?.getRepository(Product);
   await productRepository?.save({ ...sampleProduct1 });
 });
 
 afterAll(async () => {
   await cleanDatabase();
-
   server.close();
 });
 
@@ -122,3 +136,23 @@ describe('Get single product', () => {
     expect(response.body.message).toBe('Product not found');
   }, 10000);
 });
+describe('Cart Order and payment  functionalities', () => {
+  it('should create a cart for a product', async () => {
+    const productId = product1Id; 
+    const quantity = 8;
+
+    const token = getAccessToken(BuyerID, sampleBuyer1.email); 
+
+    const response = await request(app)
+      .post('/cart')
+      .set('Authorization', `Bearer ${token}`)
+      .send({ productId, quantity });
+
+
+    expect(response.status).toBe(201); 
+    expect(response.body.data.cart).toBeDefined();
+    cardID = JSON.stringify(response.body.data.cart.id)
+  });
+
+}
+)

src/controllers/productController.ts

@@ -10,7 +10,8 @@ import {
   productStatusServices,
   viewSingleProduct,
   searchProductService,
-  listAllProductsService,
+  listAllProductsService, 
+  confirmPayment,
 } from '../services';
 
 export const readProduct = async (req: Request, res: Response) => {
@@ -70,3 +71,6 @@ export const searchProduct = async (req: Request, res: Response) => {
     res.status(500).json({ error: 'Internal Server Error' });
   }
 };
+export const Payment = async (req: Request, res: Response) => {
+  await confirmPayment(req, res);
+};

src/entities/User.ts

@@ -1,3 +1,4 @@
+
 import {
   Entity,
   PrimaryGeneratedColumn,

src/entities/transaction.ts

@@ -58,4 +58,4 @@ export class Transaction {
 
   @UpdateDateColumn()
   updatedAt!: Date;
-}
+}

src/routes/ProductRoutes.ts

@@ -1,6 +1,6 @@
 import { RequestHandler, Router } from 'express';
 
-import { productStatus, searchProduct } from '../controllers/index';
+import { productStatus, searchProduct, } from '../controllers/index';
 import { hasRole } from '../middlewares/roleCheck';
 import upload from '../middlewares/multer';
 import { authMiddleware } from '../middlewares/verifyToken';
@@ -18,7 +18,7 @@ import {
   createOrder,
   getOrders,
   updateOrder,
-  getOrdersHistory,
+  getOrdersHistory,Payment,
   getSingleVendorOrder,
   getVendorOrders,
   updateVendorOrder,
@@ -54,5 +54,6 @@ router.put('/vendor/orders/:id', authMiddleware as RequestHandler, hasRole('VEND
 router.get('/admin/orders', authMiddleware as RequestHandler, hasRole('ADMIN'), getBuyerVendorOrders);
 router.get('/admin/orders/:id', authMiddleware as RequestHandler, hasRole('ADMIN'), getSingleBuyerVendorOrder);
 router.put('/admin/orders/:id', authMiddleware as RequestHandler, hasRole('ADMIN'), updateBuyerVendorOrder);
+router.post('/payment/:id', authMiddleware as RequestHandler, hasRole('BUYER'), Payment)
 
 export default router;

src/services/index.ts

@@ -21,6 +21,7 @@ export * from './productServices/listAllProductsService';
 export * from './productServices/productStatus';
 export * from './productServices/viewSingleProduct';
 export * from './productServices/searchProduct';
+export * from './productServices/payment'
 
 // Buyer wishlist services
 export * from './wishListServices/addProduct';

src/services/orderServices/createOrder.ts

@@ -183,4 +183,4 @@ const saveVendorRelatedOrder = async (order: Order, CartItem: CartItem[]) => {
   } catch (error) {
     console.log((error as Error).message);
   }
-};
+};

src/services/orderServices/updateOrderService.ts

@@ -93,7 +93,7 @@ export const updateOrderService = async (req: Request, res: Response) => {
       return sendSuccessResponse(res, 200, 'Order updated successfully', orderResponse);
     });
   } catch (error) {
-    console.error('Error updating order:', error);
+    console.error('Error updating order:', (error as Error).message);
     return sendErrorResponse(res, 500, (error as Error).message);
   }
 };

src/services/productServices/payment.ts

@@ -0,0 +1,52 @@
+import { Request, Response } from 'express';
+import { Cart } from '../../entities/Cart'; // Import your Cart entity
+import { Order } from '../../entities/Order'; // Import your Order entity
+import { getRepository, getTreeRepository } from 'typeorm';
+import dotenv from 'dotenv';
+import Stripe from 'stripe';
+dotenv.config();
+const stripeInstance = new Stripe(process.env.STRIPE_SECRET_KEY as string, {
+  apiVersion: "2024-04-10",
+});
+
+export const confirmPayment = async (req: Request, res: Response) => {
+  try {
+    const {  payment_method } = req.body;
+    const cartId = req.params.cartId; // Get the cart ID from the params
+
+    const cartRepository = getRepository(Cart);
+    const orderRepository = getTreeRepository(Order)
+    const cart = await cartRepository.findOne({where: {id : cartId}});
+    if (!cart) {
+      return res.status(404).json({ error: 'Cart not found.' });
+    }
+    const order = await orderRepository.findOne({ where: { buyer: cart.user } });
+    if (!order) {
+        return res.status(404).json({ error: 'order not found.' });
+      }
+
+    const paymentIntent = await stripeInstance.paymentIntents.create({
+      amount: cart.totalAmount, // Convert total to cents
+      currency: 'usd',
+      description: `Order #${cartId}`,
+      return_url: 'https://frontend-website.com/success', 
+      confirm: true,
+      payment_method,
+    });
+
+      order.orderStatus = 'awaiting shipment';
+      await orderRepository.save(order);
+
+
+    if (paymentIntent.status === 'succeeded') {
+      // Payment succeeded
+      res.status(200).json({ message: 'Payment successful!' });
+    } else {
+      // Payment failed
+      res.status(400).json({ error: 'Payment failed.' });
+    }
+  } catch (error) {
+    console.error('Error confirming payment:', error);
+    res.status(500).json({ error: 'Something went wrong' });
+  }
+};