Merge pull request #95 from AVtheking/wallet

Wallet
AVtheking · Nov 26, 2023 · 0455518 · 0455518
2 parents 2a95192 + bf50e9e
commit 0455518
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/controllers/course_controller.js b/controllers/course_controller.js
@@ -96,7 +96,7 @@ const courseCtrl = {
       const course = await Course.findById(courseId, {
         isPublished: true,
         isPublished: 0,
-        reviews: 0,
+
         __v: 0,
         ratings: 0,
       })
@@ -113,6 +113,10 @@ const courseCtrl = {
           path: "preview",
           select:
             "_id videoTitle videoUrl videoDuration videoUrl_144p videoUrl_360p videoUrl_720p",
+        })
+        .populate({
+          path: "reviews.user",
+          select: "_id username name profileimg",
         });
 
       if (!course) {
@@ -122,6 +126,7 @@ const courseCtrl = {
       const courseIdIndex = user.ownedCourse.findIndex((course) =>
         course.courseId.equals(courseId)
       );
+
       const cartIdIndex = user.cart.findIndex((course) =>
         course.equals(courseId)
       );
@@ -215,6 +220,7 @@ const courseCtrl = {
             duration: 1,
             totalStudents: 1,
             category: 1,
+            weightedRating: 1,
             rating: 1,
             thumbnail: 1,
             createdAt: 1,
@@ -289,7 +295,7 @@ const courseCtrl = {
         .populate({
           path: "courses",
           select:
-            "_id title description category price thumbnail rating duration createdAt updatedAt ",
+            "_id title description category price thumbnail rating weightedRating duration createdAt updatedAt ",
           options: {
             limit: limit ? limit : pageSize,
           },
@@ -323,7 +329,7 @@ const courseCtrl = {
         .sort({ count: -1 })
         .select({ search: 1, _id: 0 })
         .limit(5);
-      
+
       res.json({
         success: true,
         message: "List of popular searches",
@@ -454,7 +460,7 @@ const courseCtrl = {
             thumbnail: 1,
             createdAt: 1,
             updatedAt: 1,
-            weightedRating:1,
+            weightedRating: 1,
             createdBy: { _id: 1, username: 1, name: 1 },
           },
         },

diff --git a/controllers/payment_controller.js b/controllers/payment_controller.js
@@ -54,8 +54,10 @@ const paymentCtrl = {
     try {
       const user = req.user;
       const amount = parseInt(req.params.amount);
-      const result = amountSchema.validateAsync(amount)
+      console.log(amount)
+      const result = await amountSchema.validateAsync({amount})
       const price = result.amount
+      console.log(price)
       if (user.cart.length == 0) {
         return next(new ErrorHandler(404, "No course in cart"));
       }
@@ -156,7 +158,7 @@ const paymentCtrl = {
     try {
       // const user = req.user;
       const amount = parseInt(req.params.amount);
-      const result = amountSchema.validateAsync(amount)
+      const result =await amountSchema.validateAsync({amount})
       const price = result.amount
       const razorpayInstance = new Razorpay({
         key_id: process.env.KEY_ID,
@@ -189,7 +191,7 @@ const paymentCtrl = {
   checkPayment: async (req, res, next) => {
     try {
       const amount = parseInt(req.params.amount);
-      const result =amountSchema.validateAsync(amount)
+      const result =await amountSchema.validateAsync({amount})
       const price = result.amount
 
       const user = req.user;