@7365admin1/core 3.32.2-staging.31 → 3.32.2-staging.33

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.38.0
+
+### Minor Changes
+
+- d433685: VMS Checkout Bugfix
+
 ## 3.37.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -6873,6 +6873,7 @@ declare function useRedDotPaymentController(): {
     redirectPaymentTransaction: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     enquirePaymentTransaction: (req: Request, res: Response) => Promise<Response<any, Record<string, any>>>;
     createPayment: (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
+    updateStatus: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 interface IDirectPayment extends IBaseModel {
@@ -6933,11 +6934,12 @@ type TBillingPayments = {
 
 declare const useRedDotPaymentRepo: () => {
     paySingleUnitBill: (refId: string, payload: Partial<TUnitBilling>) => Promise<mongodb.WithId<bson.Document> | null>;
-    createPayment: (type: string, payload: Partial<TBillingPayments>, session?: ClientSession) => Promise<ObjectId | undefined>;
+    createPayment: (type: string, payload: Partial<TBillingPayments>, session?: ClientSession) => Promise<string | undefined>;
     payMultipleUnitBill: (refId: string[], payload: Partial<TUnitBilling>) => Promise<{
         message: string;
         remainingBalance: number;
     }>;
+    updateStatus: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
 declare enum VerificationType {

package/dist/index.js

@@ -536,13 +536,13 @@ var require_logger = __commonJS({
     "use strict";
     exports.__esModule = true;
     var _utils = require_utils();
-    var logger202 = {
+    var logger203 = {
       methodMap: ["debug", "info", "warn", "error"],
       level: "info",
       // Maps a given level value to the `methodMap` indexes above.
       lookupLevel: function lookupLevel(level) {
         if (typeof level === "string") {
-          var levelMap = _utils.indexOf(logger202.methodMap, level.toLowerCase());
+          var levelMap = _utils.indexOf(logger203.methodMap, level.toLowerCase());
           if (levelMap >= 0) {
             level = levelMap;
           } else {
@@ -553,9 +553,9 @@ var require_logger = __commonJS({
       },
       // Can be overridden in the host environment
       log: function log(level) {
-        level = logger202.lookupLevel(level);
-        if (typeof console !== "undefined" && logger202.lookupLevel(logger202.level) <= level) {
-          var method = logger202.methodMap[level];
+        level = logger203.lookupLevel(level);
+        if (typeof console !== "undefined" && logger203.lookupLevel(logger203.level) <= level) {
+          var method = logger203.methodMap[level];
           if (!console[method]) {
             method = "log";
           }
@@ -566,7 +566,7 @@ var require_logger = __commonJS({
         }
       }
     };
-    exports["default"] = logger202;
+    exports["default"] = logger203;
     module2.exports = exports["default"];
   }
 });
@@ -64621,6 +64621,13 @@ var import_mongodb134 = require("mongodb");
 var import_node_server_utils223 = require("@7365admin1/node-server-utils");
 var import_mongodb133 = require("mongodb");
 var import_joi126 = __toESM(require("joi"));
+var BillingPaymentStatus = /* @__PURE__ */ ((BillingPaymentStatus2) => {
+  BillingPaymentStatus2["PENDING"] = "pending";
+  BillingPaymentStatus2["SUCCESS"] = "success";
+  BillingPaymentStatus2["FAILED"] = "failed";
+  BillingPaymentStatus2["PARTIAL"] = "partial";
+  return BillingPaymentStatus2;
+})(BillingPaymentStatus || {});
 var schemaBillingItems = import_joi126.default.object({
   _id: import_joi126.default.string().hex().optional(),
   name: import_joi126.default.string().optional().allow(null, "")
@@ -64734,8 +64741,8 @@ var useRedDotPaymentRepo = () => {
     if (type == "single") {
       try {
         payload = MBillingItems(payload);
-        const res = await paymentCollection().insertOne(payload, { session });
-        return res.insertedId;
+        await paymentCollection().insertOne(payload, { session });
+        return payload.referenceNumber;
       } catch (error) {
         import_node_server_utils224.logger.log({
           level: "error",
@@ -64764,7 +64771,7 @@ var useRedDotPaymentRepo = () => {
           { $set: { referenceNumber } },
           { session }
         );
-        return res.insertedId;
+        return referenceNumber;
       } catch (error) {
         import_node_server_utils224.logger.log({
           level: "error",
@@ -64944,6 +64951,29 @@ var useRedDotPaymentRepo = () => {
       session?.endSession();
     }
   }
+  async function updateStatus(_id, status, session) {
+    try {
+      _id = new import_mongodb134.ObjectId(_id);
+    } catch {
+      throw new import_node_server_utils224.BadRequestError("Invalid payment ID format.");
+    }
+    try {
+      const res = await paymentCollection().updateOne(
+        { _id },
+        { $set: { status, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      if (res.matchedCount === 0) {
+        throw new import_node_server_utils224.NotFoundError("Payment not found.");
+      }
+      return res;
+    } catch (error) {
+      if (error instanceof import_node_server_utils224.AppError) {
+        throw error;
+      }
+      throw new import_node_server_utils224.InternalServerError("Failed to update payment status.");
+    }
+  }
   function formatDateString(today) {
     today = typeof today === "string" ? new Date(today) : today;
     let month = today.getMonth() + 1;
@@ -64952,7 +64982,7 @@ var useRedDotPaymentRepo = () => {
     const formattedDate = `${month.toString().padStart(2, "0")}${day.toString().padStart(2, "0")}${year}`;
     return formattedDate;
   }
-  return { paySingleUnitBill, createPayment, payMultipleUnitBill };
+  return { paySingleUnitBill, createPayment, payMultipleUnitBill, updateStatus };
 };
 
 // src/services/reddot-payment.service.ts
@@ -65096,7 +65126,7 @@ var useRedDotPaymentSvc = () => {
 var import_joi127 = __toESM(require("joi"));
 var import_node_server_utils226 = require("@7365admin1/node-server-utils");
 function useRedDotPaymentController() {
-  const { createPayment: _createPayment } = useRedDotPaymentRepo();
+  const { createPayment: _createPayment, updateStatus: _updateStatus } = useRedDotPaymentRepo();
   const redirectPaymentTransaction = async (req, res) => {
     try {
       const data = req.body;
@@ -65160,17 +65190,43 @@ function useRedDotPaymentController() {
     try {
       const payment = await _createPayment(type, value);
       res.status(201).json({
-        message: "Payment created successfully.",
+        message: "success",
         data: payment
       });
     } catch (error) {
-      next(error);
+      const status = error?.statusCode ?? 500;
+      res.status(status).json({ message: "failed" });
+    }
+  }
+  async function updateStatus(req, res, next) {
+    const schema2 = import_joi127.default.object({
+      _id: import_joi127.default.string().hex().length(24).required(),
+      status: import_joi127.default.string().valid(...Object.values(BillingPaymentStatus)).required()
+    });
+    const { error, value } = schema2.validate({
+      _id: req.params.id,
+      status: req.body.status
+    });
+    if (error) {
+      import_node_server_utils226.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils226.BadRequestError(error.message));
+      return;
+    }
+    try {
+      const data = await _updateStatus(value._id, value.status);
+      res.status(200).json({ message: "success", data });
+      return;
+    } catch (error2) {
+      import_node_server_utils226.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
     }
   }
   return {
     redirectPaymentTransaction,
     enquirePaymentTransaction,
-    createPayment
+    createPayment,
+    updateStatus
   };
 }