resolving conflict

src/__test__/cart.test.ts

@@ -625,4 +625,4 @@ describe('Cart| Order  management for guest/buyer', () => {
       expect(response.body.data.cart).toBeDefined;
     });
   });
-});
+});

src/__test__/test-assets/DatabaseCleanup.ts

@@ -49,4 +49,5 @@ export const cleanDatabase = async () => {
 //   console.log('Database cleaned');
 // }).catch(error => {
 //   console.error('Error cleaning database:', error);
-// });
+
+// });

src/routes/ProductRoutes.ts

@@ -53,6 +53,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;

src/services/orderServices/updateOrderService.ts

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

src/services/productServices/getRecommendedProductsService.ts

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

src/services/productServices/listAllProductsService.ts

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

src/services/productServices/readProduct.ts

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

src/services/productServices/viewSingleProduct.ts

@@ -28,4 +28,4 @@ export const viewSingleProduct = async (req: Request, res: Response) => {
     console.error('Error handling request:', error);
     res.status(500).send('Error fetching product details');
   }
-};
+};