Merge branch 'main' into dev

FS-38 · Dec 2, 2023 · 9f0bfdb · 9f0bfdb
2 parents b73c037 + befd798
commit 9f0bfdb
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 22 deletions.
diff --git a/controllers/auth.controller.js b/controllers/auth.controller.js
@@ -75,14 +75,13 @@ const register = async (req, res) => {
     }
 
     const hashPassword = bcrypt.hashSync(data.password, 10);
-    data.password = hashPassword;
+
     const user = await User.create({
       username,
       fullname,
       email,
       no_hp,
       password: hashPassword,
-      otp
     });
 
     res.status(201).json({

diff --git a/controllers/booking.controller.js b/controllers/booking.controller.js
@@ -38,7 +38,7 @@ module.exports = {
         const data = await Booking.create({
           user_id,
           conselor_id,
-          tanggal_konseling: new Date(),
+          tanggal_konseling,
           media_konseling,
           link_konseling: zoomMeeting,
           kode_pembayaran,
@@ -53,7 +53,7 @@ module.exports = {
         const data = await Booking.create({
           user_id,
           conselor_id,
-          tanggal_konseling: new Date(),
+          tanggal_konseling,
           media_konseling,
           kode_pembayaran,
           status: "pending",
@@ -72,6 +72,62 @@ module.exports = {
     }
   },
 
+  getBookingById: async (req, res) => {
+    const { id } = req.params;
+
+    try {
+      const data = await Booking.findById(id)
+        .populate("user_id")
+        .populate({
+          path: "conselor_id",
+          populate: {
+            path: "user_id",
+            select: "fullname",
+          },
+        })
+        .exec();
+
+      res.json({
+        message: "Data booking by booking id berhasil didapatkan",
+        data,
+      });
+    } catch (error) {
+      res.status(500).json({
+        message: "Terjadi error",
+        error: error.message,
+      });
+    }
+  },
+
+  getBookingByUserId: async (req, res) => {
+    const user = req.user;
+
+    const user_id = user.id;
+
+    try {
+      const data = await Booking.find({ user_id })
+        .populate("user_id")
+        .populate({
+          path: "conselor_id",
+          populate: {
+            path: "user_id",
+            select: "fullname",
+          },
+        })
+        .exec();
+
+      res.json({
+        message: "Data booking by user id berhasil didapatkan",
+        data,
+      });
+    } catch (error) {
+      res.status(500).json({
+        message: "Terjadi error",
+        error: error.message,
+      });
+    }
+  },
+
   readBooking: async (req, res) => {
     try {
       const data = await Booking.find().sort({ createdAt: -1 });
@@ -94,17 +150,18 @@ module.exports = {
     const { status, tanggal_konseling } = req.body;
 
     try {
-      const data = await Booking.findByIdAndUpdate(
-        { _id: id },
+      const data = await Booking.findOneAndUpdate(
+        { kode_pembayaran: id },
         {
           status,
-          tanggal_konseling,
         }
       );
 
+      const findBook = await Booking.findOne({ kode_pembayaran: id });
+
       res.json({
         message: "Booking berhasil diupdate",
-        data,
+        data: findBook,
       });
     } catch (error) {
       res.status(500).json({

diff --git a/controllers/conselor.controller.js b/controllers/conselor.controller.js
@@ -5,7 +5,7 @@ const User = require("../models/user");
 // getAllConselor
 const getConselor = async (req, res) => {
   try {
-    const conselorsData = await Conselor.find();
+    const conselorsData = await Conselor.find().populate("user_id").exec();
 
     res.status(200).json({
       status: "OK",
@@ -54,7 +54,7 @@ const registConselor = async (req, res) => {
 const getConselorById = async (req, res) => {
   const { id } = req.params;
   try {
-    const conselor = await Conselor.findById(id);
+    const conselor = await Conselor.findById(id).populate("user_id").exec();
 
     if (!conselor) {
       return res.status(400).json({
@@ -250,5 +250,5 @@ module.exports = {
   saveSchedule,
   updateSchedule,
   addPrice,
-  updatePrice
+  updatePrice,
 };
diff --git a/controllers/payment-xendit.controller.js b/controllers/payment-xendit.controller.js
@@ -58,8 +58,8 @@ module.exports = {
           invoiceExpired: ["sms", "whatsapp", "email"],
         },
 
-        successRedirectUrl: "https://www.google.com",
-        failureRedirectUrl: "https://www.google.com",
+        successRedirectUrl: process.env.FRONTEND_URL + "/history/" + external_id,
+        failureRedirectUrl: process.env.FRONTEND_URL + "/history/" + external_id + "/fail",
       };
 
       const invoice = await xenditInvoiceClient.createInvoice({ data: data2 });
@@ -80,7 +80,9 @@ module.exports = {
 
   getInvoices: async (req, res) => {
     try {
-      const response = await xenditInvoiceClient.getInvoices({});
+      const response = await xenditInvoiceClient.getInvoices({
+        limit: 100,
+      });
       res.status(200).json({
         message: "Berhasil mendapatkan data invoice",
         data: response,

diff --git a/controllers/story.controller.js b/controllers/story.controller.js
@@ -39,8 +39,6 @@ module.exports = {
       story.isLike = story.likes.some(
         (like) => like.user._id.toString() === userId
       );
-      story.likes = story.likes.length;
-      story.comments = story.comments.length;
     });
 
     return res.status(200).json({
@@ -51,12 +49,31 @@ module.exports = {
   },
 
   getStoryById: async (req, res) => {
+    const header = req.headers.authorization;
+    const token = header.split(" ")[1];
+    const decoded = jwt.verify(token, "treasure");
+    const userId = decoded.id;
+
     const { id } = req.params;
     if (!id) {
       return badRequest(res);
     }
     try {
-      const story = await Story.findById(id);
+      const story = await Story.findById(id)
+        .populate({
+          path: "user",
+          select: "username",
+        })
+        .populate({
+          path: "comments.user",
+          select: "username",
+        })
+        .lean();
+      story.isLike = story.likes.some(
+        (like) => like.user._id.toString() === userId
+      );
+      story.likes = story.likes.length;
+
       return res.status(200).json({
         status: "OK",
         message: "Get Data Story Successfully",

diff --git a/controllers/zoom.controller.js b/controllers/zoom.controller.js
@@ -65,7 +65,7 @@ exports.createMeeting = async (topic, duration, start_time) => {
     const content = {
       meeting_url: response_data.join_url,
       password: response_data.password,
-      meetingTime: response_data.start_time,
+      meetingTime: start_time,
       purpose: response_data.topic,
       duration: response_data.duration,
       message: "Success",

diff --git a/package-lock.json b/package-lock.json
diff --git a/routes/booking.route.js b/routes/booking.route.js
@@ -1,10 +1,12 @@
 const express = require("express");
-const { createBooking, readBooking, updateBooking, deleteBooking } = require("../controllers/booking.controller");
+const { createBooking, readBooking, updateBooking, deleteBooking, getBookingById, getBookingByUserId } = require("../controllers/booking.controller");
 const authToken = require("../middlewares/auth");
 const router = express.Router();
 
 router.post("/", authToken, createBooking);
 router.get("/", readBooking);
+router.get("/user", authToken, getBookingByUserId);
+router.get("/:id", getBookingById);
 router.put("/:id", updateBooking);
 router.delete("/:id", deleteBooking);