autosync_backend2 1.2.105 → 1.2.106

package/dist/index.d.ts

@@ -6047,28 +6047,77 @@ export declare const app: Elysia<"", {
                             params: {};
                             query: {};
                             headers: {};
+                            response: {
+                                200: {};
+                                401: "Токен олдсонгүй";
+                                402: "Системийн төлбөр хийгдээгүй байна. 88046194";
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            } & {
+                payment: {
+                    "cabpay-data": {
+                        get: {
+                            body: {};
+                            params: {};
+                            query: {
+                                date?: string | undefined;
+                                companyId?: string | undefined;
+                            };
+                            headers: {};
                             response: {
                                 200: {
-                                    qrCode: string;
-                                    deeplink: string;
-                                    id: string;
-                                    createdAt: string;
-                                    updatedAt: string;
-                                    deletedAt: string | null;
-                                    oldId: number | null;
-                                    state: "PENDING" | "EXPIRED" | "PAID" | "FAILED" | "REFUNDED" | "NOT_PAID" | "DECLINED" | "CANCELED" | "REFUNDING";
-                                    amount: number;
-                                    paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
-                                    paymentChannel: string;
-                                    description: string | null;
-                                    cpOrderId: string;
-                                    paymentPackageId: string | null;
-                                    invoiceNumber: string | null;
-                                    pocketOrderNumber: string | null;
+                                    payments: {
+                                        cp_order: {
+                                            companyId: string;
+                                            companyBranchId: string;
+                                            customerId: string | null;
+                                            vehicleId: string | null;
+                                            orderId: string;
+                                            state: "CREATED" | "PROGRESSING" | "COMPLETE";
+                                            isNoat: boolean | null;
+                                            timeCompleted: string | null;
+                                            km: number;
+                                            type: "Service" | "ProductSell";
+                                            description: string | null;
+                                            id: string;
+                                            createdAt: string;
+                                            updatedAt: string;
+                                            deletedAt: string | null;
+                                            oldId: number | null;
+                                        };
+                                        cp_order_payment: {
+                                            cpOrderId: string;
+                                            paymentPackageId: string | null;
+                                            paymentMethod: "CASH" | "BANK_TRANSFER" | "POS_TERMINAL" | "PAYMENT_PACKAGE" | "CARD";
+                                            paymentChannel: string;
+                                            amount: number;
+                                            state: "PENDING" | "EXPIRED" | "PAID" | "FAILED" | "REFUNDED" | "NOT_PAID" | "DECLINED" | "CANCELED" | "REFUNDING";
+                                            invoiceNumber: string | null;
+                                            description: string | null;
+                                            pocketOrderNumber: string | null;
+                                            id: string;
+                                            createdAt: string;
+                                            updatedAt: string;
+                                            deletedAt: string | null;
+                                            oldId: number | null;
+                                        };
+                                    }[];
+                                    totalAmount: string | number;
                                 };
-                                400: string;
                                 401: "Токен олдсонгүй";
                                 402: "Системийн төлбөр хийгдээгүй байна. 88046194";
+                                403: "Хандах эрхгүй байна.";
                                 422: {
                                     type: "validation";
                                     on: string;
@@ -6078,7 +6127,6 @@ export declare const app: Elysia<"", {
                                     property?: string;
                                     expected?: string;
                                 };
-                                500: "Сервер алдаа гарлаа";
                             };
                         };
                     };

package/dist/index.js

@@ -338365,19 +338365,12 @@ class Pocket {
     this.terminalId = config5.terminalId ?? 82326876454013;
   }
   getOAuthUrl(path) {
-    return `${this.schema}://${this.oauthHost}/auth/realms/${this.realm}/protocol/openid-connect/${path}`;
+    return `${this.schema}://${this.oauthHost}/realms/${this.realm}/protocol/openid-connect/${path}`;
   }
   getMerchantUrl(path) {
     return `${this.schema}://${this.merchantHost}/${path}`;
   }
   async makeOAuthRequest(path, params) {
-    logger2.debug({
-      path,
-      params,
-      clientId: env_default.POCKET_CLIENT_ID,
-      clientSecret: env_default.POCKET_CLIENT_SECRET,
-      url: this.getOAuthUrl(path)
-    }, "[Pocket] Making OAuth request");
     const response = await distribution_default.post(this.getOAuthUrl(path), {
       headers: {
         "Content-Type": "application/x-www-form-urlencoded"
@@ -338392,27 +338385,24 @@ class Pocket {
     return response;
   }
   async checkLocalToken() {
-    logger2.debug("[Pocket] Checking local token...");
     if (this.token) {
-      logger2.debug("[Pocket] Token is present in instance.");
       return;
     }
     const raw = await redis_client_default.get(CACHE_KEY);
-    logger2.debug({ raw }, "[Pocket] Fetched raw token from redis");
     const cached4 = raw ? JSON.parse(raw) : null;
-    const isExpired = cached4 ? Date.now() >= cached4.expires_in * 1000 : true;
-    logger2.debug({ hasCached: !!cached4, isExpired }, "[Pocket] Token cache status");
+    let isExpired = true;
+    if (cached4) {
+      const payload = JSON.parse(Buffer.from(cached4.access_token.split(".")[1], "base64").toString());
+      const now = Math.floor(Date.now() / 1000);
+      isExpired = payload.exp <= now;
+    }
     if (cached4 && !isExpired) {
       this.token = cached4;
-      logger2.debug("[Pocket] Using valid cached token.");
       return;
     }
-    logger2.debug("[Pocket] No valid token available, requesting new token.");
     const newToken = await this.getToken();
-    logger2.debug({ token: newToken }, "[Pocket] New token obtained");
     this.token = newToken;
     await redis_client_default.set(CACHE_KEY, JSON.stringify(newToken));
-    logger2.debug({ token: newToken }, "[Pocket] Token set in redis and cache updated");
   }
   async getToken() {
     logger2.info("[Pocket] Requesting new token...");
@@ -338447,10 +338437,10 @@ class Pocket {
   async createInvoice(input) {
     logger2.info({ input }, "[Pocket] Creating invoice");
     await this.checkLocalToken();
-    logger2.info({
-      url: this.getMerchantUrl("v2/invoicing/generate-invoice"),
-      token: this.token?.access_token ? "[hidden]" : undefined,
-      terminalId: this.terminalId
+    logger2.debug({ token: this.token?.access_token }, "[Pocket] Token");
+    logger2.debug({ terminalId: this.terminalId }, "[Pocket] Terminal ID");
+    logger2.debug({
+      url: this.getMerchantUrl("v2/invoicing/generate-invoice")
     }, "[Pocket] Sending request to generate invoice");
     try {
       const response = await distribution_default.post(this.getMerchantUrl("v2/invoicing/generate-invoice"), {
@@ -338466,7 +338456,10 @@ class Pocket {
       logger2.info({ response }, "[Pocket] Generated invoice response");
       return response;
     } catch (error3) {
-      logger2.error({ error: error3 }, "[Pocket] Error generating invoice");
+      if (isHTTPError(error3)) {
+        logger2.error({ error: error3 }, "[Pocket] Error generating invoice");
+        throw status(error3.response.status, error3.message);
+      }
       throw error3;
     }
   }
@@ -338556,9 +338549,9 @@ class PocketGateway extends PaymentGateway {
   constructor() {
     super();
     this.pocket = new Pocket({
-      oauthHost: "sso-staging.invescore.mn",
+      oauthHost: "sso25-staging.invescore.mn",
       merchantHost: "service-staging.invescore.mn/merchant",
-      terminalId: 78524356044986
+      terminalId: 82760328141709
     });
   }
   async createInvoice(input) {
@@ -339243,6 +339236,10 @@ var CrmCpOrderPaymentLogic;
       if (err2 instanceof Error) {
         return status("Bad Request", err2.message);
       }
+      logger2.error({ err: err2 }, "[Pocket] Error creating invoice");
+      if (err2 instanceof status) {
+        return err2;
+      }
       return status("Internal Server Error", "\u0421\u0435\u0440\u0432\u0435\u0440 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430");
     }
   };
@@ -339257,6 +339254,19 @@ var CrmCpOrderPaymentLogic;
       return status("Internal Server Error", "\u0421\u0435\u0440\u0432\u0435\u0440 \u0430\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430");
     }
   };
+  CrmCpOrderPaymentLogic.getUbPayData = async (query) => {
+    const filter = and(eq(crmCpOrderTable.companyId, query.companyId), eq(crmCpOrderPaymentTable.state, "PAID"), eq(crmCpOrderPaymentTable.paymentChannel, "UBPAY"));
+    const [payments, total] = await Promise.all([
+      db_default.select().from(crmCpOrderPaymentTable).innerJoin(crmCpOrderTable, eq(crmCpOrderTable.id, crmCpOrderPaymentTable.cpOrderId)).where(filter),
+      db_default.select({
+        total: sum(crmCpOrderPaymentTable.amount)
+      }).from(crmCpOrderPaymentTable).innerJoin(crmCpOrderTable, eq(crmCpOrderTable.id, crmCpOrderPaymentTable.cpOrderId)).where(filter)
+    ]);
+    return {
+      payments,
+      totalAmount: total[0]?.total ?? 0
+    };
+  };
   CrmCpOrderPaymentLogic.getPocketData = async (query) => {
     const filter = and(eq(crmCpOrderTable.companyId, query.companyId).if(query.companyId), eq(crmCpOrderPaymentTable.state, "PAID"), eq(sql3`DATE(${crmCpOrderPaymentTable.createdAt})`, query.date).if(query.date), eq(crmCpOrderPaymentTable.paymentChannel, "POCKET"));
     const [payments, total] = await Promise.all([
@@ -340131,6 +340141,8 @@ var paymentRoutes2 = new Elysia({
   auth: true
 }).guard({
   userKind: "ADMIN"
+}).get("/cabpay-data", async ({ query }) => logic_default22.getUbPayData(query), {
+  query: model_default20.getPocketData
 }).get("/pocket-data", async ({ query }) => logic_default22.getPocketData(query), {
   query: model_default20.getPocketData
 }).get("/info", async () => logic_default22.selectPaymentInfo()).post("/info", async ({ body }) => logic_default22.createPaymentInfo(body), {
@@ -340165,7 +340177,7 @@ var cpOrderRoutes = new Elysia({
   body: model_default19.createSell
 }).post("/package", async ({ body, user: user2 }) => logic_default24.addPackage(body, user2), {
   body: model_default19.addPackage
-}).delete("package/:id", async ({ params: { id }, user: user2 }) => logic_default24.removePackage(id, user2), {
+}).delete("/package/:id", async ({ params: { id }, user: user2 }) => logic_default24.removePackage(id, user2), {
   params: IdSchema
 }).post("/complete", async ({ user: user2, body }) => logic_default24.complete(body, user2), {
   body: model_default19.complete

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autosync_backend2",
-  "version": "1.2.105",
+  "version": "1.2.106",
   "module": "src/index.ts",
   "type": "module",
   "main": "dist/index.js",