Merge branch 'ft-stripe-payment' of https://github.com/atlp-rwanda/kn…

…ights-ecomm-be into ft-stripe-payment

jest.config.ts

@@ -6,7 +6,7 @@ export default {
   verbose: true,
   forceExit: true,
   clearMocks: true,
-  testTimeout: 30000,
+  testTimeout: 50000,
   resetMocks: true,
   restoreMocks: true,
   collectCoverageFrom: [

src/__test__/cart.test.ts

@@ -608,4 +608,4 @@ describe('Order management tests', () => {
       expect(response.status).toBe(500);
     });
   });
-});
+});

src/entities/User.ts

@@ -108,6 +108,9 @@ export class User {
   @UpdateDateColumn()
   updatedAt!: Date;
 
+  @Column({ type: 'numeric', precision: 24, scale: 2, default: 0 })
+  accountBalance!: number;
+
   @BeforeInsert()
   setRole (): void {
     this.role = this.userType === 'Vendor' ? roles.vendor : roles.buyer;

src/entities/transaction.ts

@@ -35,6 +35,16 @@ export class Transaction {
   @IsNumber()
   amount!: number;
 
+  @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 })
+  @IsNotEmpty()
+  @IsNumber()
+  previousBalance!: number;
+
+  @Column({ type: 'numeric', precision: 15, scale: 2, default: 0 })
+  @IsNotEmpty()
+  @IsNumber()
+  currentBalance!: number;
+
   @Column({ type: 'enum', enum: ['debit', 'credit'] })
   @IsNotEmpty()
   @IsString()
@@ -48,4 +58,4 @@ export class Transaction {
 
   @UpdateDateColumn()
   updatedAt!: Date;
-}
+}

src/services/orderServices/createOrder.ts

@@ -60,6 +60,14 @@ export const createOrderService = async (req: Request, res: Response) => {
       orderItems.push(orderItem);
     }
 
+    if (!buyer.accountBalance || buyer.accountBalance < totalPrice) {
+      return sendErrorResponse(res, 400, 'Not enough funds to perform this transaction');
+    }
+
+    const previousBalance = buyer.accountBalance;
+    buyer.accountBalance -= totalPrice;
+    const currentBalance = buyer.accountBalance;
+
     const newOrder = new Order();
     newOrder.buyer = buyer;
     newOrder.totalPrice = totalPrice;
@@ -86,6 +94,8 @@ export const createOrderService = async (req: Request, res: Response) => {
       orderTransaction.user = buyer;
       orderTransaction.order = newOrder;
       orderTransaction.amount = totalPrice;
+      orderTransaction.previousBalance = previousBalance;
+      orderTransaction.currentBalance = currentBalance;
       orderTransaction.type = 'debit';
       orderTransaction.description = 'Purchase of products';
       await transactionalEntityManager.save(Transaction, orderTransaction);
@@ -173,4 +183,4 @@ const saveVendorRelatedOrder = async (order: Order, CartItem: CartItem[]) => {
   } catch (error) {
     console.log((error as Error).message);
   }
-};
+};