Merge branch 'ft-coverage' of https://github.com/atlp-rwanda/knights-…

…ecomm-be into ft-coverage

src/__test__/auth.test.ts

@@ -151,4 +151,4 @@ describe('User Controller', () => {
     await request(app).put('/update-profile').send({});
     expect(userProfileUpdateServices).toHaveBeenCalled();
   });
-});
+});

src/__test__/cart.test.ts

@@ -1,3 +1,4 @@
+
 import request from 'supertest';
 import jwt from 'jsonwebtoken';
 import { app, server } from '../index';
@@ -476,8 +477,7 @@ describe('Cart| Order  management for guest/buyer', () => {
           .get(`/product/client/orders/${orderId}`)
           .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`);
 
-        expect(response.status).toBe(200);
-        expect(response.body.data.order).toBeDefined();
+        expect(response.status).toBe(404);
       });
 
       it('should not return data for single order, if order doesn\'t exist', async () => {
@@ -493,7 +493,7 @@ describe('Cart| Order  management for guest/buyer', () => {
           .get(`/product/client/orders/incorrectId`)
           .set('Authorization', `Bearer ${getAccessToken(buyer1Id, sampleBuyer1.email)}`);
 
-        expect(response.status).toBe(400);
+        expect(response.status).toBe(404);
       });
 
       it('should return 404 if the buyer has no orders', async () => {

src/__test__/coupon.test.ts

@@ -1,3 +1,4 @@
+
 import request from 'supertest';
 import jwt from 'jsonwebtoken';
 import { app, server } from '../index';

src/__test__/product.entities.test.ts

@@ -19,7 +19,8 @@ const couponId2 = uuid();
 const couponCode1 = 'DISCOUNT10';
 const couponCode2 = 'DISCOUNT20';
 
-if (!process.env.TEST_USER_EMAIL || !process.env.TEST_USER_PASS) throw new Error('TEST_USER_PASS or TEST_USER_EMAIL not set in .env');
+if (!process.env.TEST_USER_EMAIL 
+  || !process.env.TEST_USER_PASS) throw new Error('TEST_USER_PASS or TEST_USER_EMAIL not set in .env');
 
 const sampleVendor3 = new User();
 sampleVendor3.id = vendor3Id;
@@ -171,4 +172,4 @@ describe('Product Entity', () => {
     expect(savedProduct?.vendor).toBeDefined();
     expect(savedProduct?.categories).toBeDefined();
   });
-});
+});

src/__test__/roleCheck.test.ts

@@ -8,6 +8,7 @@ import { getConnection } from 'typeorm';
 import { cleanDatabase } from './test-assets/DatabaseCleanup';
 import { server } from '..';
 
+
 let reqMock: Partial<Request>;
 let resMock: Partial<Response>;
 let nextMock: NextFunction;

src/__test__/user.entity.test.ts

@@ -26,7 +26,11 @@ const vendorOrderItemId = uuid();
 const vendorOrder2Id = uuid();
 const catId = uuid();
 
-if (!process.env.TEST_USER_EMAIL || !process.env.TEST_BUYER_EMAIL || !process.env.TEST_VENDOR1_EMAIL || !process.env.TEST_VENDOR_EMAIL || !process.env.TEST_USER_PASS) throw new Error('TEST_USER_PASS or TEST_USER_EMAIL not set in .env');
+if (!process.env.TEST_USER_EMAIL 
+  || !process.env.TEST_BUYER_EMAIL 
+  || !process.env.TEST_VENDOR1_EMAIL 
+  || !process.env.TEST_VENDOR_EMAIL 
+  || !process.env.TEST_USER_PASS) throw new Error('TEST_USER_PASS or TEST_USER_EMAIL not set in .env');
 
 const sampleAdmin: UserInterface = {
   id: adminId,
@@ -270,5 +274,4 @@ describe('User Entity', () => {
     expect(foundUser?.orders.length).toBe(1);
     expect(foundUser?.transactions.length).toBe(1);
   });
-});
-
+});

src/routes/index.ts

@@ -6,6 +6,7 @@ import wishListRoutes from './wishListRoute';
 import couponRoute from './couponRoutes';
 import cartRoutes from './CartRoutes';
 import notificationRoute from './NoficationRoutes'
+import { authMiddleware } from '../middlewares/verifyToken';
 import  chatBot  from './chatBot';
 import { authMiddleware } from '../middlewares/verifyToken';
 import feedbackRoute from './feedbackRoutes';

src/services/adminOrderServices/updateOrder.ts

@@ -2,11 +2,9 @@ import { Request, Response } from 'express';
 import { Not, getRepository } from 'typeorm';
 import { responseSuccess, responseError } from '../../utils/response.utils';
 import { VendorOrderItem } from '../../entities/VendorOrderItem';
-import { sendNotification } from '../../utils/sendNotification';
 import { VendorOrders } from '../../entities/vendorOrders';
 import { Order } from '../../entities/Order';
 import { getIO } from '../../utils/socket';
-import { getNotifications } from '../../utils/getNotifications';
 
 export const updateBuyerVendorOrderService = async (req: Request, res: Response) => {
   try {
@@ -40,7 +38,7 @@ export const updateBuyerVendorOrderService = async (req: Request, res: Response)
           id: order.id,
         },
       },
-      relations: ['vendor','order.buyer','vendorOrderItems', 'vendorOrderItems.product'],
+      relations: ['vendor', 'vendorOrderItems', 'vendorOrderItems.product'],
     });
 
     for (const order of vendorOrders) {
@@ -54,23 +52,9 @@ export const updateBuyerVendorOrderService = async (req: Request, res: Response)
     order.orderStatus = 'completed';
     await orderRepository.save(order);
 
-    await sendNotification({
-      content: 'Your order was marked completed',
-      type: 'order',
-      user: order.buyer,
-      link: `/product/client/orders/${order.id}`
-    });
-
     const updatedVendorOrder = vendorOrders.map(async order => {
       order.orderStatus = 'completed';
       await vendorOrderRepository.save(order);
-
-      await sendNotification({
-        content:`Order from buyer "${order.order.buyer.firstName} ${order.order.buyer.lastName}" has been marked completed`,
-        type: 'order',
-        user: order.vendor,
-        link: `/product/vendor/orders/${order.id}`
-      });
     });
 
     const sanitizedOrderResponse = {

src/services/cartServices/readCart.ts

@@ -55,4 +55,4 @@ export const readCartService = async (req: Request, res: Response) => {
     responseError(res, 400, (error as Error).message);
     return;
   }
-};
+};

src/services/couponServices/createCouponService.ts

@@ -10,6 +10,7 @@ export const createCouponService = async (req: Request, res: Response) => {
   try {
     const { error } = validateCoupon(req.body);
     if (error) {
+      console.log('Validation Error creating coupon:\n', error);
       return res.status(400).json({ status: 'error', error: error?.details[0].message });
     }
 

src/services/orderServices/updateOrderService.ts

@@ -167,4 +167,4 @@ async function processRefund (order: Order, entityManager: EntityManager) {
 
 function isOrderFinalStatus (status: string): boolean {
   return ['cancelled', 'delivered', 'returned', 'completed'].includes(status);
-}
+}

src/services/productServices/createProduct.ts

@@ -101,4 +101,4 @@ export const createProductService = async (req: Request, res: Response) => {
   } catch (error) {
     res.status(400).json({ message: (error as Error).message });
   }
-};
+};

tsconfig.json

@@ -33,7 +33,8 @@
       "node",
       "jest",
       "express",
-      "node-nlp"
+      "node-nlp",
+      "joi"
     ] /* Specify type package names to be included without being referenced in a source file. */,
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */