autosync_backend2 1.1.21 → 1.1.23

package/dist/index.d.ts

@@ -389,6 +389,12 @@ declare const app: Elysia<"", {
                 clientSecret: import("@sinclair/typebox").TString;
             }>;
         }>]>]>;
+        readonly "CrmCpOrderPaymentModel.wsQuery": import("@sinclair/typebox").TObject<{
+            paymentId: import("@sinclair/typebox").TString;
+        }>;
+        readonly "CrmCpOrderPaymentModel.wsBody": import("@sinclair/typebox").TObject<{
+            state: import("elysia/dist/type-system/types").TUnionEnum<["PENDING", "PAID", "CANCELED"]>;
+        }>;
         readonly "CrmCpOrderModel.create": import("@sinclair/typebox").TObject<{
             phone: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             vin: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -3499,6 +3505,22 @@ declare const app: Elysia<"", {
         } & {
             "cp-order": {
                 payment: {};
+            } & {
+                payment: {
+                    ws: {
+                        subscribe: {
+                            body: {
+                                state: "PENDING" | "PAID" | "CANCELED";
+                            };
+                            params: {};
+                            query: {
+                                paymentId: string;
+                            };
+                            headers: unknown;
+                            response: unknown;
+                        };
+                    };
+                };
             } & {
                 payment: {
                     storepay: {
@@ -3533,7 +3555,7 @@ declare const app: Elysia<"", {
                 payment: {
                     ubpay: {
                         ":id": {
-                            get: {
+                            post: {
                                 body: unknown;
                                 params: {
                                     id: string;
@@ -3541,10 +3563,7 @@ declare const app: Elysia<"", {
                                 query: unknown;
                                 headers: unknown;
                                 response: {
-                                    200: undefined;
-                                    404: "Төлбөрийн тохиргоо олдсонгүй." | "Төлбөрийн мэдээлэл олдсонгүй.";
-                                    400: string;
-                                    500: "Сервер алдаа гарлаа";
+                                    200: void;
                                     422: {
                                         type: "validation";
                                         on: string;
@@ -4050,18 +4069,6 @@ declare const app: Elysia<"", {
                     };
                 };
             };
-        } & {
-            "cp-order": {
-                ws: {
-                    subscribe: {
-                        body: unknown;
-                        params: {};
-                        query: unknown;
-                        headers: unknown;
-                        response: unknown;
-                    };
-                };
-            };
         } & {
             "cp-order": {
                 ":id": {

package/dist/index.js

@@ -144022,8 +144022,8 @@ var UbPay = class {
       return {
         access_token: res.data.accessToken,
         refresh_token: res.data.refreshToken,
-        refresh_expires_in: parseInt(res.data.refreshTokenExpriresIn, 10),
-        expires_in: parseInt(res.data.accessTokenExpriresIn, 10)
+        refresh_expires_in: res.data.refreshTokenExpiresIn,
+        expires_in: res.data.accessTokenExpiresIn
       };
     });
   }
@@ -144076,7 +144076,7 @@ var UbPay = class {
   checkInvoice(invoiceId, token) {
     return __async(this, null, function* () {
       token = yield this.checkToken(token);
-      const req = yield fetch(`${this.baseUrl}/api/invoices/${invoiceId}`, {
+      const req = yield fetch(`${this.baseUrl}/api/v1/invoices/${invoiceId}`, {
         headers: {
           Authorization: `Bearer ${token.access_token}`
         }
@@ -144144,6 +144144,11 @@ class PaymentGateway {
       invoiceNumber
     }).where(eq(crmCpOrderPaymentTable.id, id));
   }
+  async updateState(id, state) {
+    await db_default.update(crmCpOrderPaymentTable).set({
+      state
+    }).where(eq(crmCpOrderPaymentTable.id, id));
+  }
 }
 
 // src/routes/crm/cpOrder/payment/gateways/storepay.ts
@@ -144197,10 +144202,13 @@ class UbPayGateway extends PaymentGateway {
     });
     const invoice = await this.ubPay.createInvoice({
       amount: payment.amount,
-      description: "",
+      description: "Autosync",
       customData: undefined,
-      callbackUrl: "http://202.70.40.82:3000/crm/cp-order/payment/ubpay/" + payment.id
+      callbackUrl: "http://202.70.40.82:3000/api/crm/cp-order/payment/ubpay/" + payment.id
     }, this.token);
+    if (invoice.data.success === false) {
+      throw new Error("\u041D\u044D\u0445\u044D\u043C\u0436\u043B\u044D\u043B \u04AF\u04AF\u0441\u0433\u044D\u0445\u044D\u0434 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430.");
+    }
     await this.updatePaymentInfo(invoice.token);
     await this.updateInvoiceNumber(payment.id, invoice.data.data.invoiceNumber);
     return {
@@ -144211,10 +144219,14 @@ class UbPayGateway extends PaymentGateway {
   async checkInvoice(invoiceId) {
     const payment = await this.getPaymentById(invoiceId);
     const check2 = await this.ubPay.checkInvoice(payment.invoiceNumber ?? "", this.token);
+    console.log(check2.data);
     await this.updatePaymentInfo(check2.token);
-    if (check2.data.data.amount !== payment.amount) {
+    if (check2.data.data.status === "open") {
       throw new Error("\u0422\u04E9\u043B\u0431\u04E9\u0440 \u0442\u04E9\u043B\u04E9\u0433\u0434\u04E9\u04E9\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
     }
+    if (check2.data.data.status === "void") {
+      this.updateState(invoiceId, "CANCELED");
+    }
     await this.setPaid(invoiceId);
   }
 }
@@ -144385,6 +144397,14 @@ var CrmCpOrderPaymentModel;
       })
     ])
   ]);
+  CrmCpOrderPaymentModel.wsQuery = t.Object({
+    paymentId: t.String({
+      format: "uuid"
+    })
+  });
+  CrmCpOrderPaymentModel.wsBody = t.Object({
+    state: t.UnionEnum(["PENDING", "PAID", "CANCELED"])
+  });
 })(CrmCpOrderPaymentModel ||= {});
 var model_default6 = CrmCpOrderPaymentModel;
 
@@ -144392,7 +144412,21 @@ var model_default6 = CrmCpOrderPaymentModel;
 var paymentRoutes = new Elysia({
   prefix: "/payment",
   tags: ["CrmCpOrderPayment"]
-}).use(better_auth_default).model(prefix_model_default("CrmCpOrderPaymentModel", model_default6)).get("/storepay/:id", async ({ params: { id } }) => logic_default11.checkStorePay(id)).get("/ubpay/:id", async ({ params: { id } }) => logic_default11.checkUbPay(id)).guard({ auth: true }).post("/storepay", async ({ body, user: user2 }) => logic_default11.createStorepay(body, user2), { body: "CrmCpOrderPaymentModel.storepay" }).post("/ubpay", async ({ body, user: user2 }) => logic_default11.createUbPay(body, user2), {
+}).use(better_auth_default).model(prefix_model_default("CrmCpOrderPaymentModel", model_default6)).ws("/ws", {
+  open: (ws) => {
+    ws.subscribe(`cp_order_payment:${ws.data.query.paymentId}`);
+  },
+  close: (ws) => {
+    ws.unsubscribe(`cp_order_payment:${ws.data.query.paymentId}`);
+  },
+  query: "CrmCpOrderPaymentModel.wsQuery",
+  body: "CrmCpOrderPaymentModel.wsBody"
+}).get("/storepay/:id", async ({ params: { id } }) => logic_default11.checkStorePay(id)).post("/ubpay/:id", async ({ params: { id } }) => {
+  logic_default11.checkUbPay(id);
+  paymentRoutes.server?.publish(`cp_order_payment:${id}`, JSON.stringify({
+    state: "PAID"
+  }));
+}).guard({ auth: true }).post("/storepay", async ({ body, user: user2 }) => logic_default11.createStorepay(body, user2), { body: "CrmCpOrderPaymentModel.storepay" }).post("/ubpay", async ({ body, user: user2 }) => logic_default11.createUbPay(body, user2), {
   body: "CrmCpOrderPaymentModel.create"
 }).guard({
   userKind: "ADMIN"
@@ -144500,8 +144534,7 @@ var cpOrderRoutes = new Elysia({
   prefix: "/cp-order",
   tags: ["CrmCpOrder"]
 }).use(better_auth_default).use(service_default).use(product_default).use(payment_default).guard({ auth: true }).model(prefix_model_default("CrmCpOrderModel", model_default5)).get("/", async ({ query, user: user2 }) => logic_default10.select(query, user2), {
-  query: "CrmCpOrderModel.select",
-  transform: ({ query }) => {}
+  query: "CrmCpOrderModel.select"
 }).post("/", async ({ body, user: user2 }) => {
   const created = await logic_default10.create(body, user2);
   if ("code" in created) {
@@ -144514,23 +144547,11 @@ var cpOrderRoutes = new Elysia({
       size: 1
     }
   }, user2);
-  const message2 = {
-    type: "Create",
-    body: result.result[0]
-  };
-  cpOrderRoutes.server?.publish(`cp_order:${user2.branchId}`, JSON.stringify(message2));
   return result;
 }, {
   body: "CrmCpOrderModel.create"
 }).post("/package", async ({ body, user: user2 }) => logic_default10.addPackage(body, user2), {
   body: "CrmCpOrderModel.addPackage"
-}).ws("/ws", {
-  open(ws) {
-    ws.subscribe(`cp_order:${ws.data.user.branchId}`);
-  },
-  close(ws) {
-    ws.unsubscribe(`cp_order:${ws.data.user.branchId}`);
-  }
 }).guard({
   params: IdSchema
 }).post("/:id/complete", async ({ user: user2, params: { id } }) => logic_default10.complete(id, user2)).delete("/:id", async ({ user: user2, params: { id } }) => logic_default10.remove(id, user2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosync_backend2",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",
@@ -31,7 +31,7 @@
     "exceljs": "^4.4.0",
     "fast-xml-parser": "^5.2.5",
     "generate-password": "^1.7.1",
-    "mn-payment": "^0.0.12",
+    "mn-payment": "^0.0.15",
     "nodemailer": "^7.0.3",
     "pg": "^8.16.1",
     "pino": "^9.7.0",