autosync_backend2 1.2.92 → 1.2.97

package/dist/index.d.ts

@@ -683,16 +683,16 @@ export declare const app: Elysia<"", {
                         type?: "Сэлбэг" | "Тос" | "Дугуй" | "Будаг" | "Аккумлятор" | "Авто гоёл" | "Батерей" | undefined;
                         oldId?: number | null | undefined;
                         description?: string | null | undefined;
+                        oen?: string | null | undefined;
                         productId?: string | null | undefined;
                         barCode?: string | null | undefined;
-                        oen?: string | null | undefined;
                         alias?: string | null | undefined;
                         quantityUnit?: number | undefined;
                         name: string;
+                        partNumber: string;
                         supplierId: string;
                         priceSell: number;
                         priceBuy: number;
-                        partNumber: string;
                     };
                     params: {};
                     query: unknown;
@@ -708,13 +708,13 @@ export declare const app: Elysia<"", {
                             deletedAt: string | null;
                             oldId: number | null;
                             description: string | null;
+                            partNumber: string;
+                            oen: string | null;
                             supplierId: string;
                             productId: string | null;
                             priceSell: number;
                             priceBuy: number;
                             barCode: string | null;
-                            oen: string | null;
-                            partNumber: string;
                             alias: string | null;
                             quantityUnit: number;
                         };
@@ -739,16 +739,16 @@ export declare const app: Elysia<"", {
                             type?: "Сэлбэг" | "Тос" | "Дугуй" | "Будаг" | "Аккумлятор" | "Авто гоёл" | "Батерей" | undefined;
                             oldId?: number | null | undefined;
                             description?: string | null | undefined;
+                            oen?: string | null | undefined;
                             productId?: string | null | undefined;
                             barCode?: string | null | undefined;
-                            oen?: string | null | undefined;
                             alias?: string | null | undefined;
                             quantityUnit?: number | undefined;
                             name: string;
+                            partNumber: string;
                             supplierId: string;
                             priceSell: number;
                             priceBuy: number;
-                            partNumber: string;
                         }[];
                         params: {};
                         query: unknown;
@@ -816,13 +816,13 @@ export declare const app: Elysia<"", {
                             companyId?: string | undefined;
                             oldId?: number | null | undefined;
                             description?: string | null | undefined;
+                            partNumber?: string | undefined;
+                            oen?: string | null | undefined;
                             supplierId?: string | undefined;
                             productId?: string | null | undefined;
                             priceSell?: number | undefined;
                             priceBuy?: number | undefined;
                             barCode?: string | null | undefined;
-                            oen?: string | null | undefined;
-                            partNumber?: string | undefined;
                             alias?: string | null | undefined;
                             quantityUnit?: number | undefined;
                         };
@@ -3206,6 +3206,7 @@ export declare const app: Elysia<"", {
                 generate: {
                     post: {
                         body: {
+                            note?: string | undefined;
                             carCount?: number | undefined;
                             companyId: string;
                             billingPlanId: string;
@@ -11845,7 +11846,8 @@ export declare const app: Elysia<"", {
                         body: unknown;
                         params: {};
                         query: {
-                            workOrderId?: string | null | undefined;
+                            workOrderId?: string | undefined;
+                            isWorkOrderId?: boolean | undefined;
                             pagination: {
                                 size: number;
                                 page: number;

package/dist/index.js

@@ -197574,7 +197574,7 @@ var require_umd = __commonJS((exports, module) => {
         other = fromValue(other);
       return fromBits(this.low & other.low, this.high & other.high, this.unsigned);
     };
-    LongPrototype.or = function or2(other) {
+    LongPrototype.or = function or3(other) {
       if (!isLong(other))
         other = fromValue(other);
       return fromBits(this.low | other.low, this.high | other.high, this.unsigned);
@@ -277517,7 +277517,12 @@ var techdocSupplierTable = techdocSchema.table("supplier", {
 });
 var techdocProductTable = techdocSchema.table("product", {
   ...base_schema_helper_default,
-  name: varchar().notNull()
+  name: varchar().notNull(),
+  partNumber: varchar().notNull(),
+  oen: varchar(),
+  description: text(),
+  supplierId: uuid5().notNull(),
+  pictureList: varchar().array().notNull().default([])
 });
 var techdocProductCategoryTable = techdocSchema.table("product_category", {
   ...base_schema_helper_default,
@@ -278758,7 +278763,8 @@ var CompanyInvoiceLogic;
       carCount,
       status: "PENDING",
       issuedAt: issuedAt.toISOString(),
-      dueAt: dueAt.toISOString()
+      dueAt: dueAt.toISOString(),
+      note: body.note
     }).returning();
     return invoice;
   };
@@ -278817,7 +278823,8 @@ var CompanyInvoiceModel;
     companyId: t.String({ format: "uuid" }),
     billingPlanId: t.String({ format: "uuid" }),
     periodStart: t.String({ format: "date" }),
-    carCount: t.Optional(t.Integer({ minimum: 0 }))
+    carCount: t.Optional(t.Integer({ minimum: 0 })),
+    note: t.Optional(t.String())
   });
 })(CompanyInvoiceModel ||= {});
 var model_default6 = CompanyInvoiceModel;
@@ -282386,25 +282393,26 @@ class Pocket {
     return response;
   }
   async checkLocalToken() {
+    console.log("[Pocket] Checking local token...");
     if (this.token) {
+      console.log("[Pocket] Token is present in instance.");
       return;
     }
     const raw = await redis_client_default.get(CACHE_KEY);
+    console.log("[Pocket] Fetched raw token from redis:", raw);
     const cached4 = raw ? JSON.parse(raw) : null;
-    const isExpired = cached4 ? Date.now() >= cached4.expires_in * 1000 - 60000 : true;
+    const isExpired = cached4 ? Date.now() >= cached4.expires_in * 1000 : true;
+    console.log(`[Pocket] Token cached: ${!!cached4}, expired: ${isExpired}`);
     if (cached4 && !isExpired) {
       this.token = cached4;
+      console.log("[Pocket] Using valid cached token.");
       return;
     }
-    if (cached4 && isExpired) {
-      const refreshed = await this.getTokenByRefresh(cached4.refresh_token);
-      this.token = refreshed;
-      await redis_client_default.set(CACHE_KEY, JSON.stringify(refreshed));
-      return;
-    }
+    console.log("[Pocket] No valid token available, requesting new token.");
     const newToken = await this.getToken();
     this.token = newToken;
     await redis_client_default.set(CACHE_KEY, JSON.stringify(newToken));
+    console.log("[Pocket] Obtained new token and updated cache.");
   }
   async getToken() {
     const response = await this.makeOAuthRequest("token", {
@@ -282435,18 +282443,30 @@ class Pocket {
     return response;
   }
   async createInvoice(input) {
+    console.log("[Pocket] Creating invoice with input:", input);
     await this.checkLocalToken();
-    const response = await distribution_default.post(this.getMerchantUrl("v2/invoicing/generate-invoice"), {
-      headers: {
-        Authorization: `Bearer ${this.token?.access_token}`
-      },
-      json: {
-        ...input,
-        terminalId: this.terminalId,
-        channel: "pos"
-      }
-    }).json();
-    return response;
+    console.log("[Pocket] Sending request to generate invoice:", {
+      url: this.getMerchantUrl("v2/invoicing/generate-invoice"),
+      token: this.token?.access_token ? "[hidden]" : undefined,
+      terminalId: this.terminalId
+    });
+    try {
+      const response = await distribution_default.post(this.getMerchantUrl("v2/invoicing/generate-invoice"), {
+        headers: {
+          Authorization: `Bearer ${this.token?.access_token}`
+        },
+        json: {
+          ...input,
+          terminalId: this.terminalId,
+          channel: "pos"
+        }
+      }).json();
+      console.log("[Pocket] Generated invoice response:", response);
+      return response;
+    } catch (error3) {
+      console.error("[Pocket] Error generating invoice:", error3);
+      throw error3;
+    }
   }
   async checkInvoice(orderNumber) {
     await this.checkLocalToken();
@@ -282464,7 +282484,7 @@ class Pocket {
 }
 
 // src/routes/crm/cpOrder/payment/gateways/index.ts
-var CALLBACK_URL = env_default.NODE_ENV === "production" ? "https://v2.api.autosync.mn/api/crm/cp-order/payment" : "http://202.70.40.82:3000/api/crm/cp-order/payment";
+var CALLBACK_URL = env_default.NODE_ENV === "production" ? "https://api.autosync.mn/api/crm/cp-order/payment" : "http://202.70.40.82:3000/api/crm/cp-order/payment";
 
 class PaymentGateway {
   token = undefined;
@@ -283228,6 +283248,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.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([
+      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 ||= {});
 var getPaymentInfo = async (type, user2) => {
   const cacheKey = `crm_payment:${user2.companyId}:${type}:${user2.branchId ?? "null"}`;
@@ -284037,6 +284070,10 @@ var CrmCpOrderPaymentModel;
   CrmCpOrderPaymentModel.wsBody = t.Object({
     state: t.UnionEnum(["PENDING", "PAID", "CANCELED"])
   });
+  CrmCpOrderPaymentModel.getPocketData = t.Partial(t.Object({
+    companyId: t.String({ format: "uuid" }),
+    date: t.String({ format: "date" })
+  }));
 })(CrmCpOrderPaymentModel ||= {});
 var model_default13 = CrmCpOrderPaymentModel;
 
@@ -285579,12 +285616,12 @@ var model_default24 = InspectionFieldGroupModel;
 var fieldGroupRoutes = new Elysia({
   prefix: "/field-group",
   tags: ["InspectionFieldGroup"]
-}).use(better_auth_default).guard({
-  userKind: "ADMIN"
-}).get("/", async ({ query }) => logic_default26.select(query), {
+}).use(better_auth_default).get("/", async ({ query }) => logic_default26.select(query), {
   query: model_default24.select,
   userKind: undefined,
   auth: true
+}).guard({
+  userKind: "ADMIN"
 }).post("/", async ({ body }) => logic_default26.create(body), {
   body: model_default24.create
 }).guard({
@@ -285690,7 +285727,7 @@ var fieldResult_default = fieldResultRoutes;
 var InspectionLogic;
 ((InspectionLogic) => {
   InspectionLogic.select = async (query, user2) => {
-    const filter = and(eq(inspectionTable.machineId, query.machineId).if(query.machineId), eq(inspectionTable.templateId, query.templateId).if(query.templateId), eq(inspectionTable.state, query.state).if(query.state), eq(inspectionTable.stateResult, query.stateResult).if(query.stateResult), gte(inspectionTable.createdAt, query.startDate).if(query.startDate), lte(inspectionTable.createdAt, query.endDate).if(query.endDate), eq(inspectionTable.id, query.id).if(query.id), or(eq(inspectionTemplateTable.companyId, user2.companyId), isNull2(inspectionTemplateTable.companyId)));
+    const filter = and(eq(inspectionTable.machineId, query.machineId).if(query.machineId), eq(inspectionTable.templateId, query.templateId).if(query.templateId), eq(inspectionTable.state, query.state).if(query.state), eq(inspectionTable.stateResult, query.stateResult).if(query.stateResult), gte(inspectionTable.createdAt, query.startDate).if(query.startDate), lte(inspectionTable.createdAt, query.endDate).if(query.endDate), eq(inspectionTable.id, query.id).if(query.id), eq(companyMachineTable.companyId, user2.companyId));
     const baseQuery = db_default.select({
       inspection: inspectionTable,
       machine: companyMachineTable,
@@ -286516,8 +286553,8 @@ var pm_default = pmRoutes;
 // src/routes/fleet/work-order/logic.ts
 var WorkOrderLogic;
 ((WorkOrderLogic) => {
-  WorkOrderLogic.select = async (query) => {
-    const filter = softDeletedFilter(workOrderTable);
+  WorkOrderLogic.select = async (query, user2) => {
+    const filter = and(softDeletedFilter(workOrderTable), eq(companyMachineTable.companyId, user2.companyId));
     const baseQuery = db_default.select({
       wo: workOrderTable,
       machine: companyMachineTable,
@@ -286555,8 +286592,8 @@ var model_default37 = WorkOrderModel;
 // src/routes/fleet/work-order/task/logic.ts
 var WorkOrderTaskLogic;
 ((WorkOrderTaskLogic) => {
-  WorkOrderTaskLogic.select = async (query) => {
-    const filter = and(softDeletedFilter(workOrderTaskTable), eq(workOrderTaskTable.workOrderId, query.workOrderId).if(query.workOrderId), isNull2(workOrderTaskTable.workOrderId).if(query.workOrderId === null));
+  WorkOrderTaskLogic.select = async (query, user2) => {
+    const filter = and(softDeletedFilter(workOrderTaskTable), eq(workOrderTaskTable.workOrderId, query.workOrderId).if(query.workOrderId), isNull2(workOrderTaskTable.workOrderId).if(query.isWorkOrderId === false), isNotNull(workOrderTaskTable.workOrderId).if(query.isWorkOrderId === true), eq(companyMachineTable.companyId, user2.companyId));
     const companyServiceKind = alias(companyServiceKindTable, "companyServiceKind");
     const baseQuery = db_default.select({
       task: workOrderTaskTable,
@@ -286598,7 +286635,8 @@ var WorkOrderTaskModel;
   WorkOrderTaskModel.select = t.Composite([
     PaginationSchema,
     t.Partial(t.Object({
-      workOrderId: t.Nullable(t.String({ format: "uuid" }))
+      workOrderId: t.String({ format: "uuid" }),
+      isWorkOrderId: t.Boolean()
     }))
   ]);
 })(WorkOrderTaskModel ||= {});
@@ -286608,7 +286646,7 @@ var model_default38 = WorkOrderTaskModel;
 var workOrderTaskRoutes = new Elysia({
   prefix: "/task",
   tags: ["WorkOrderTask"]
-}).use(better_auth_default).guard({ auth: true }).get("/", async ({ query }) => logic_default40.select(query), {
+}).use(better_auth_default).guard({ auth: true }).get("/", async ({ query, user: user2 }) => logic_default40.select(query, user2), {
   query: model_default38.select
 }).post("/", async ({ body }) => logic_default40.create(body), {
   body: model_default38.create
@@ -286623,7 +286661,7 @@ var task_default = workOrderTaskRoutes;
 var workOrderRoutes = new Elysia({
   prefix: "/work-order",
   tags: ["WorkOrder"]
-}).use(better_auth_default).use(task_default).guard({ auth: true }).get("/", async ({ query }) => logic_default39.select(query), {
+}).use(better_auth_default).use(task_default).guard({ auth: true }).get("/", async ({ query, user: user2 }) => logic_default39.select(query, user2), {
   query: model_default37.select
 }).post("/", async ({ body }) => logic_default39.create(body), {
   body: model_default37.create

package/package.json

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