resolve rebase conflict

atlp-rwanda · Jun 14, 2024 · 3966b3b · 3966b3b
1 parent 53d0a50
commit 3966b3b
Show file tree

Hide file tree

Showing 9 changed files with 10,032 additions and 44 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -69,13 +69,15 @@
     "coveragePathIgnorePatterns": [
       "/node_modules/",
       "/src/emails/",
-      "/src/utilis/"
+      "/src/utilis/",
+      "/src/Notification.vendor/"
     ],
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/src/emails/",
       "/src/middlewares/",
-      "/src/utilis/"
+      "/src/utilis/",
+      "/src/Notification.vendor/"
     ]
   },
   "devDependencies": {

diff --git a/src/Notification.vendor/EmailSendor.ts b/src/Notification.vendor/EmailSendor.ts
@@ -18,14 +18,14 @@ async function sendEmail(vendorEmail: string, message_title: string, messageCont
 
     const mailOptions = {
       from: `"The E-commerce Team" <${process.env.EMAIL_USER}>`,
-      to: '[email protected]',
+      to: vendorEmail,
       subject: 'Notification from Your Company',
       text: messageContent,
       html: `<p>${messageContent.replace(/\n/g, '<br>')}</p>`,
     };
 
     await transporter.sendMail(mailOptions);
-    console.log('Email sent successfully');
+
   } catch (error) {
     throw error
   }

diff --git a/src/Notification.vendor/event.services.ts b/src/Notification.vendor/event.services.ts
@@ -65,7 +65,9 @@ const orderRepository = dbConnection.getRepository(Order);
 
 eventEmitter.on('addToCart', async (product_id, userId) => {
   try {
-
+    if (process.env.NODE_ENV == 'test'){
+      return
+    }
     const product = await productRepository.findOne({
       where: { id: product_id },
       select: { vendor: { firstName: true, lastName: true, picture: true, id: true, email: true } },
@@ -96,15 +98,20 @@ eventEmitter.on('addToCart', async (product_id, userId) => {
     new_notification.message_title = 'your product is add to buyer cart';
     new_notification.message_content = added_to_cart_message(product, User);
     await NotificationRepository.save(new_notification);
-    sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
-  } catch (error) {
-    throw error
+    await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+
+  } 
+  catch (error) {
+   throw error 
+
   }
 });
 
 eventEmitter.on('removeItem', async (removeItem) => {
   try {
-
+    if (process.env.NODE_ENV == 'test'){
+      return
+    }
     const product = await productRepository.findOne({
       where: { id: removeItem.product.id },
       select: { vendor: { firstName: true, lastName: true, picture: true, id: true, email: true } },
@@ -135,7 +142,7 @@ eventEmitter.on('removeItem', async (removeItem) => {
     new_notification.message_content = removed_to_cart_message(product, user);
 
     await NotificationRepository.save(new_notification);
-    sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+    await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
 
   } catch (error) {
     throw error
@@ -144,6 +151,9 @@ eventEmitter.on('removeItem', async (removeItem) => {
 
 eventEmitter.on('pressorder', async (order:order) => {
   try {
+      if (process.env.NODE_ENV == 'test'){
+        return
+      }
      const orderDetail = order.orderDetails  
      for(let i=0; i<orderDetail.length; i++)
       {
@@ -170,7 +180,7 @@ eventEmitter.on('pressorder', async (order:order) => {
 
         await NotificationRepository.save(new_notification);
 
-        sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+        await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
       }
 
     }
@@ -181,7 +191,9 @@ eventEmitter.on('pressorder', async (order:order) => {
 
 eventEmitter.on('order_status_change', async (orderId:number) => {
   try {
-
+    if (process.env.NODE_ENV == 'test'){
+      return
+    }
     const order = await orderRepository.findOne({
       where: {
         id: orderId,
@@ -190,7 +202,6 @@ eventEmitter.on('order_status_change', async (orderId:number) => {
     });
     if(order == null)
       {
-        console.log('order is null')
         return
       }
      const orderDetail = order.orderDetails  
@@ -219,9 +230,9 @@ eventEmitter.on('order_status_change', async (orderId:number) => {
         new_notification.message_content = order_status_changed(product, order);
 
         await NotificationRepository.save(new_notification);
-        sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+        await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
       }
-
+      
     }
   catch (error) {
     throw error
@@ -231,7 +242,9 @@ eventEmitter.on('order_status_change', async (orderId:number) => {
 
 eventEmitter.on('productCreated', async(product:product)=>{
   try{
-
+        if (process.env.NODE_ENV == 'test'){
+          return
+        }
        if(!product)
         {
           return
@@ -249,7 +262,7 @@ eventEmitter.on('productCreated', async(product:product)=>{
         new_notification.message_content = new_product_created(product);
 
         await NotificationRepository.save(new_notification);
-        sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+        await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
   }
   catch(error)
   {
@@ -261,7 +274,9 @@ eventEmitter.on('productCreated', async(product:product)=>{
 eventEmitter.on('product_updated', async(product:product)=>{
 
   try{
-
+        if (process.env.NODE_ENV == 'test'){
+          return
+        }
         if(!product)
           {
             return
@@ -278,7 +293,7 @@ eventEmitter.on('product_updated', async(product:product)=>{
         new_notification.message_content = updated_Product(product);
 
         await NotificationRepository.save(new_notification);
-        sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+        await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
   }
   catch(error)
   {
@@ -289,7 +304,9 @@ eventEmitter.on('product_updated', async(product:product)=>{
 
 eventEmitter.on('product_deleted', async(product_id:number)=>{
   try{
-
+        if (process.env.NODE_ENV == 'test'){
+          return
+        }
         const product= await productRepository.findOne({
           where:{id: product_id},
           relations:['vendor']
@@ -307,11 +324,11 @@ eventEmitter.on('product_deleted', async(product_id:number)=>{
         new_notification.product_id =product.id ;
         new_notification.vendor_id = product.vendor.id
         new_notification.vendor_email = product.vendor.email;
-        new_notification.message_title = 'Your product was Updated succesfull';
+        new_notification.message_title = 'Your product was deleted succesfull';
         new_notification.message_content = product_deleted(product);
 
         await NotificationRepository.save(new_notification);
-        sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+        await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
   }
   catch(error)
   {
@@ -322,7 +339,9 @@ eventEmitter.on('product_deleted', async(product_id:number)=>{
 
 eventEmitter.on('order_canceled', async (orderId) => {
   try {
-
+    if (process.env.NODE_ENV == 'test'){
+      return
+    }
     const order = await orderRepository.findOne({
       where: { id: orderId },
       relations: ['orderDetails','orderDetails.product', 'orderDetails.product.vendor'],
@@ -354,12 +373,12 @@ eventEmitter.on('order_canceled', async (orderId) => {
         new_notification.product_id = orderDetail[i].product.id;
         new_notification.vendor_id = product.vendor.id
         new_notification.vendor_email = product.vendor.email;
-        new_notification.message_title = 'order with you product was placed';
+        new_notification.message_title = 'order with you product was cancaled';
         new_notification.message_content = order_canceled(product, order);
 
         await NotificationRepository.save(new_notification);
 
-        sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
+        await sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
       }
 
     }

diff --git a/src/Notification.vendor/node.cron.services.ts b/src/Notification.vendor/node.cron.services.ts
@@ -59,11 +59,9 @@ const dailyTasks = cron.schedule('0 0 * * *', async () => {
 
                 await NotificationRepository.save(new_notification);
 
-                console.log('press order notification created')
                 sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
                 }      
 
-                console.log(`Order ${order.id} cancelled due to expiry.`);
         }
     }
 
@@ -88,7 +86,6 @@ const dailyTasks = cron.schedule('0 0 * * *', async () => {
 
         await NotificationRepository.save(new_notification);
 
-        console.log('press order notification created')
         sendEmailfunc(product.vendor.email, new_notification.message_title, new_notification.message_content)
     }
 });

diff --git a/src/__test__/notification.vendor.test.ts b/src/__test__/notification.vendor.test.ts
@@ -4,18 +4,18 @@ import { getVendorToken, afterAllHook, beforeAllHook } from './testSetup';
 import Notification_box from '../database/models/inbox_notification';
 import dbConnection from '../database';
 
+const notificationRepository = dbConnection.getRepository(Notification_box);
+
 beforeAll(beforeAllHook);
 afterAll(afterAllHook);
 
 describe('Notification Controller Tests', () => {
   let token: string;
   let vendor_id: number;
-  let notificationRepository;
-  let notificationId: number;
+  let notification_id: number
 
   beforeAll(async () => {
     token = await getVendorToken();
-    notificationRepository = dbConnection.getRepository(Notification_box);
 
     // make notification for test
     // ------------------------------------------
@@ -27,10 +27,8 @@ describe('Notification Controller Tests', () => {
     notification.vendor_id = 1; 
     const savedNotification = await notificationRepository.save(notification);
     // --------------------------------------------------
-    notificationId = savedNotification.notification_id;
     vendor_id = savedNotification.vendor_id
-
-    console.log(`Created notification with ID: ${notificationId}`);
+    notification_id = savedNotification.notification_id
   });
 
   it('should retrieve all notifications', async () => {
@@ -53,18 +51,20 @@ describe('Notification Controller Tests', () => {
     expect(Array.isArray(response.body.notification)).toBeTruthy();
   });
 
-  it('should delete all notifications', async () => {
+  it('should delete notification by notification ID', async () => {
     const response = await request(app)
-      .delete('/api/v1/notification/vendor')
+      .delete(`/api/v1/notification/vendor/${notification_id}`)
+      .set('Authorization', `Bearer ${token}`);
 
     expect(response.statusCode).toEqual(200);
-    expect(response.body.msg).toEqual('All notifications deleted successfully');
   });
 
-  it('should delete a notification by ID', async () => {
-    const response = await request(app).delete(`/api/v1/notification/vendor/53`)
-
+  it('should delete all notifications', async () => {
+    const response = await request(app)
+      .delete('/api/v1/notification/vendor')
+
     expect(response.statusCode).toEqual(200);
+    expect(response.body.msg).toEqual('All notifications deleted successfully');
   });
 
 

diff --git a/src/controller/cartController.ts b/src/controller/cartController.ts
@@ -65,7 +65,7 @@ export const addToCart = errorHandler(async (req: Request, res: Response) => {
   newItem.quantity = quantity;
 
   const savedItem = await cartRepository.save(newItem);
-  console.log('caller the event')
+
   eventEmitter.emit('addToCart',productId, userId)
 
   return res

diff --git a/src/controller/notificationController.ts b/src/controller/notificationController.ts
@@ -24,7 +24,6 @@ export const getallNotification= errorHandler(
 
 export const deleteallNotification = errorHandler(
     async (req: Request , res: Response)=>{
-        const vendorId = req.params.id
         const Notication = await NotificationRepository.find()
         if(!Notication)
             {
@@ -46,7 +45,6 @@ export const deletenotification = errorHandler(
             where: { notification_id: id }
         });
 
-        console.log(`this is the notification:${notification}`)
 
         if (!notification) {
             return res.status(400).json({ msg: 'No Notifications was found' });

diff --git a/src/routes/notificationRoutes.ts b/src/routes/notificationRoutes.ts
@@ -12,7 +12,7 @@ notificationRouter.route('/vendor')
                 .get(getallNotification)
                 .delete(deleteallNotification)
 notificationRouter.route('/vendor/:id')
-                .delete(deletenotification)
+                .delete(IsLoggedIn,checkRole(['Vendor']),deletenotification)
                 .get(IsLoggedIn,checkRole(['Vendor']),getvendorNotifications)
 
 export default notificationRouter