Merge branch 'fix-payment' of https://github.com/atlp-rwanda/knights-…

…ecomm-be into fix-payment
atlp-rwanda · Jul 17, 2024 · 685c692 · 685c692
2 parents 50bca3d + aed8a54
commit 685c692
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 30 deletions.
diff --git a/migrations/1714595134552-UserMigration.ts b/migrations/1714595134552-UserMigration.ts
diff --git a/src/__test__/orderManagement.test.ts b/src/__test__/orderManagement.test.ts
@@ -133,6 +133,7 @@ const sampleOrder = {
   buyer: sampleBuyer,
   orderStatus: 'received',
   address: 'Rwanda, Kigali, KK20st',
+  cartId: uuid()
 };
 const sampleOrder2 = {
   id: order2Id,
@@ -142,6 +143,7 @@ const sampleOrder2 = {
   buyer: sampleBuyer,
   orderStatus: 'order placed',
   address: 'Rwanda, Kigali, KK20st',
+  cartId: uuid()
 };
 
 const sampleOrderItem = {

diff --git a/src/__test__/user.entity.test.ts b/src/__test__/user.entity.test.ts
@@ -105,6 +105,7 @@ const sampleOrder = {
   quantity: 2,
   orderDate: new Date(),
   buyer: sampleBuyer,
+  cartId:uuid(),
   orderStatus: 'received',
   address: 'Rwanda, Kigali, KK20st',
 };
@@ -247,6 +248,7 @@ describe('User Entity', () => {
       buyer: savedUser,
       orderStatus: 'order placed',
       address: 'Rwanda, Kigali, KK20st',
+      cartId: uuid(),
     });
 
     const savedOrder = await orderRepository.save(order);

diff --git a/src/entities/Order.ts b/src/entities/Order.ts
@@ -6,12 +6,14 @@ import {
   OneToMany,
   CreateDateColumn,
   UpdateDateColumn,
+  OneToOne,
 } from 'typeorm';
 import { IsNotEmpty, IsNumber, IsDate, IsIn } from 'class-validator';
 import { User } from './User';
 import { OrderItem } from './OrderItem';
 import { Transaction } from './transaction';
 import { Feedback } from './Feedback';
+import { Cart } from './Cart';
 
 @Entity()
 export class Order {
@@ -22,7 +24,11 @@ export class Order {
   @ManyToOne(() => User, user => user.orders)
   @IsNotEmpty()
   buyer!: User;
-
+
+  @Column('uuid')
+  @IsNotEmpty()
+  cartId!: string;
+
   @OneToMany(() => OrderItem, orderItem => orderItem.order, { cascade: true })
   @IsNotEmpty()
   orderItems!: OrderItem[];

diff --git a/src/services/orderServices/createOrder.ts b/src/services/orderServices/createOrder.ts
@@ -67,6 +67,7 @@ export const createOrderService = async (req: Request, res: Response) => {
     newOrder.quantity = cart.items.reduce((acc, item) => acc + item.quantity, 0);
     newOrder.orderDate = new Date();
     newOrder.address = `${address.country}, ${address.city}, ${address.street}`;
+    newOrder.cartId = cart.id;
 
     await getManager().transaction(async transactionalEntityManager => {
       for (const item of cart.items) {
@@ -107,6 +108,7 @@ export const createOrderService = async (req: Request, res: Response) => {
       quantity: newOrder.quantity,
       orderDate: newOrder.orderDate,
       address: newOrder.address,
+      cartId: newOrder.cartId
     };
 
     const message = {

diff --git a/src/services/orderServices/getOrderService.ts b/src/services/orderServices/getOrderService.ts
@@ -89,6 +89,7 @@ export const getOrderService = async (req: Request, res: Response) => {
       quantity: order.quantity,
       address: order.address,
       orderDate: order.orderDate,
+      cartId: order.cartId,
       createdAt: order.createdAt,
       updatedAt: order.updatedAt,
       buyer: {