Conflift resolution

src/__test__/getProduct.test.ts

@@ -104,7 +104,7 @@ describe('Creating new product', () => {
 
     expect(response.status).toBe(201);
     expect(response.body.data.product).toBeDefined;
-  }, 60000);
+  }, 20000);
 });
 describe('Get single product', () => {
   it('should get a single product', async () => {

src/__test__/roleCheck.test.ts

@@ -6,7 +6,7 @@ import { dbConnection } from '../startups/dbConnection';
 import { v4 as uuid } from 'uuid';
 import { getConnection } from 'typeorm';
 import { cleanDatabase } from './test-assets/DatabaseCleanup';
-import { server } from '..';
+
 
 let reqMock: Partial<Request>;
 let resMock: Partial<Response>;
@@ -37,7 +37,6 @@ beforeAll(async () => {
 
 afterAll(async () => {
   await cleanDatabase();
-  server.close();
 });
 
 describe('hasRole MiddleWare Test', () => {

src/__test__/test-assets/DatabaseCleanup.ts

@@ -13,6 +13,8 @@ import { server } from '../..';
 import { VendorOrderItem } from '../../entities/VendorOrderItem';
 import { VendorOrders } from '../../entities/vendorOrders';
 import { Feedback } from '../../entities/Feedback';
+import { NotificationItem } from '../../entities/NotificationItem';
+import { Notification } from '../../entities/Notification';
 
 export const cleanDatabase = async () => {
   const connection = getConnection();
@@ -28,6 +30,8 @@ export const cleanDatabase = async () => {
   await connection.getRepository(CartItem).delete({});
   await connection.getRepository(Cart).delete({});
   await connection.getRepository(wishList).delete({});
+  await connection.getRepository(NotificationItem).delete({});
+  await connection.getRepository(Notification).delete({});
 
   // Many-to-Many relations
   // Clear junction table entries before deleting products and categories
@@ -49,4 +53,4 @@ export const cleanDatabase = async () => {
 //   console.log('Database cleaned');
 // }).catch(error => {
 //   console.error('Error cleaning database:', error);
-// });
+// });

src/__test__/vendorProduct.test.ts

@@ -133,7 +133,7 @@ describe('Vendor product management tests', () => {
 
       expect(response.status).toBe(201);
       expect(response.body.data.product).toBeDefined;
-    }, 120000);
+    }, 60000);
 
     it('return an error if the number of product images exceeds 6', async () => {
       const response = await request(app)
@@ -470,4 +470,4 @@ describe('Vendor product management tests', () => {
       expect(response.status).toBe(400);
     });
   });
-});
+});

src/__test__/wishList.test.ts

@@ -201,4 +201,4 @@ describe('Wish list management tests', () => {
       expect(response.body.message).toBe('All products removed successfully');
     });
   });
-});
+});

src/controllers/productController.ts

@@ -73,4 +73,4 @@ export const searchProduct = async (req: Request, res: Response) => {
 };
 export const Payment = async (req: Request, res: Response) => {
   await confirmPayment(req, res);
-};
+};

src/docs/notifications.yml

@@ -0,0 +1,126 @@
+/notification:
+  get:
+    tags:
+      - Notification Management
+    summary: Get all user notifications
+    description: Return all user notifications of an authenticated buyer
+    security:
+      - bearerAuth: []
+    responses:
+      '200':
+        description: Return all user notifications for a user
+      '400':
+        description: Bad Request (syntax error, incorrect input format, etc..)
+      '401':
+        description: Unauthorized
+      '403':
+        description: Forbidden (Unauthorized action)
+      '500':
+        description: Internal server error
+
+  delete:
+    tags:
+      - Notification Management
+    summary: Delete selected notifications
+    description: Delete all selected notification for an authenticated buyer
+    security:
+      - bearerAuth: []
+    consumes:
+      - application/json
+    requestBody:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              notificationIds:
+                example: "[]"
+    responses:
+      '200':
+        description: Notifications deleted successfully
+      '400':
+        description: Bad Request (syntax error, incorrect input format, etc..)
+      '401':
+        description: Unauthorized
+      '403':
+        description: Forbidden (Unauthorized action)
+      '404':
+        description: Notification not found
+      '500':
+        description: Internal server error
+
+  put:
+    tags:
+      - Notification Management
+    summary: Update selected notifications
+    description: Update selected notifications for an authenticated buyer
+    security:
+      - bearerAuth: []
+    consumes:
+      - application/json
+    requestBody:
+      required: true
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              notificationIds:
+                example: "[]"
+    responses:
+      '200':
+        description: Notification updated successfully
+      '400':
+        description: Bad Request (syntax error, incorrect input format, etc..)
+      '401':
+        description: Unauthorized
+      '403':
+        description: Forbidden (Unauthorized action)
+      '404':
+        description: Notification not found
+      '500':
+        description: Internal server error
+
+/notification/all:
+  delete:
+    tags:
+      - Notification Management
+    summary: Delete all notifications
+    description: Delete all notification for an authenticated buyer
+    security:
+      - bearerAuth: []
+    responses:
+      '200':
+        description: All notifications deleted successfully
+      '400':
+        description: Bad Request (syntax error, incorrect input format, etc..)
+      '401':
+        description: Unauthorized
+      '403':
+        description: Forbidden (Unauthorized action)
+      '404':
+        description: Notification not found
+      '500':
+        description: Internal server error
+
+  put:
+    tags:
+      - Notification Management
+    summary: Update all notifications
+    description: Update all notifications for an authenticated buyer
+    security:
+      - bearerAuth: []
+    responses:
+      '200':
+        description: Notification updated successfully
+      '400':
+        description: Bad Request (syntax error, incorrect input format, etc..)
+      '401':
+        description: Unauthorized
+      '403':
+        description: Forbidden (Unauthorized action)
+      '404':
+        description: Notification not found
+      '500':
+        description: Internal server error

src/docs/orderDocs.yml

@@ -106,3 +106,32 @@ paths:
           description: Order not found
         '500':
           description: Internal Server Error
+
+  /product/client/orders/{orderId}: 
+    get:
+      tags:
+        - Order
+      summary: Get a single order
+      description: Retrieve an order for the authenticated user
+      security:
+        - bearerAuth: []
+      parameters:
+        - in: path
+          name: orderId
+          schema:
+            type: string
+          required: true
+          description: The ID of the order
+      responses:
+        '200':
+          description: Order Retrived successfully
+        '400':
+          description: Bad Request
+        '401':
+          description: Unauthorized
+        '403':
+          description: Forbidden
+        '404':
+          description: Order not found
+        '500':
+          description: Internal Server Error

src/entities/Cart.ts

@@ -47,4 +47,4 @@ export class Cart {
       this.totalAmount = 0;
     }
   }
-}
+}

src/entities/CartItem.ts

@@ -50,4 +50,4 @@ export class CartItem {
   updateTotal (): void {
     this.total = this.newPrice * this.quantity;
   }
-}
+}

src/entities/Category.ts

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

src/entities/Feedback.ts

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

src/entities/Order.ts

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

src/entities/OrderItem.ts

@@ -26,4 +26,4 @@ export class OrderItem {
   @IsNotEmpty()
   @IsNumber()
   quantity!: number;
-}
+}

src/entities/Product.ts

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

src/entities/VendorOrderItem.ts

@@ -27,4 +27,4 @@ export class VendorOrderItem {
   @IsNotEmpty()
   @IsNumber()
   'quantity'!: number;
-}
+}

src/entities/coupon.ts

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

src/entities/vendorOrders.ts

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

src/entities/wishList.ts

@@ -32,4 +32,4 @@ export class wishList extends BaseEntity {
 
   @UpdateDateColumn()
   updatedAt!: Date;
-}
+}

src/routes/ProductRoutes.ts

@@ -16,7 +16,7 @@ import {
   listAllProducts,
   singleProduct,
   createOrder,
-  getOrders,
+  getOrders, getOrder,
   updateOrder,
   getOrdersHistory,Payment,
   getSingleVendorOrder,
@@ -41,6 +41,7 @@ router.put('/availability/:id', authMiddleware as RequestHandler, hasRole('VENDO
 
 router.post('/orders', authMiddleware as RequestHandler, hasRole('BUYER'), createOrder);
 router.get('/client/orders', authMiddleware as RequestHandler, hasRole('BUYER'), getOrders);
+router.get('/client/orders/:orderId', authMiddleware as RequestHandler, hasRole('BUYER'), getOrder);
 router.put('/client/orders/:orderId', authMiddleware as RequestHandler, hasRole('BUYER'), updateOrder);
 router.get('/orders/history', authMiddleware as RequestHandler, hasRole('BUYER'), getOrdersHistory);
 
@@ -53,6 +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)
+router.post('/payment/:id', authMiddleware as RequestHandler, hasRole('BUYER'), Payment);
 
-export default router;
+export default router;