autosync_backend2 1.2.8 → 1.2.10

package/dist/index.d.ts

@@ -784,10 +784,6 @@ export declare const app: Elysia<"", {
                             productId?: string | undefined;
                             priceSell?: number | undefined;
                             ids?: string[] | undefined;
-                            pagination: {
-                                size: number;
-                                page: number;
-                            };
                         };
                         headers: unknown;
                         response: {
@@ -2195,6 +2191,7 @@ export declare const app: Elysia<"", {
                     query: {
                         search?: string | undefined;
                         companyId?: string | undefined;
+                        branchId?: string | null | undefined;
                         pagination: {
                             size: number;
                             page: number;
@@ -3059,18 +3056,6 @@ export declare const app: Elysia<"", {
                         headers: unknown;
                         response: {
                             200: ({
-                                item: {
-                                    warehouseId: string;
-                                    productId: string;
-                                    quantity: number;
-                                    safetyStock: number;
-                                    shelfNumber: string | null;
-                                    id: string;
-                                    createdAt: string;
-                                    updatedAt: string;
-                                    deletedAt: string | null;
-                                    oldId: number | null;
-                                } | null;
                                 service_kind: {
                                     serviceKindId: string | null;
                                     companyId: string;
@@ -3099,6 +3084,32 @@ export declare const app: Elysia<"", {
                                     deletedAt: string | null;
                                     oldId: number | null;
                                 } | null;
+                                sp_package: {
+                                    companyId: string;
+                                    companyBranchId: string | null;
+                                    name: string;
+                                    description: string | null;
+                                    priceTotal: number;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                    oldId: number | null;
+                                } | null;
+                                cp_order_sp_package: {
+                                    cpOrderId: string;
+                                    spPackageId: string;
+                                    quantity: number;
+                                    priceUnit: number;
+                                    priceTotal: number;
+                                    name: string;
+                                    description: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                    oldId: number | null;
+                                } | null;
                                 cp_order_item: {
                                     cpOrderId: string;
                                     companyProductId: string | null;
@@ -3509,6 +3520,35 @@ export declare const app: Elysia<"", {
                         };
                     };
                 };
+            } & {
+                payment: {
+                    ubpay: {
+                        test: {
+                            ":id": {
+                                post: {
+                                    body: unknown;
+                                    params: {
+                                        id: string;
+                                    };
+                                    query: unknown;
+                                    headers: unknown;
+                                    response: {
+                                        200: string;
+                                        422: {
+                                            type: "validation";
+                                            on: string;
+                                            summary?: string;
+                                            message?: string;
+                                            found?: unknown;
+                                            property?: string;
+                                            expected?: string;
+                                        };
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
             } & {
                 payment: {
                     ubpay: {
@@ -3855,6 +3895,7 @@ export declare const app: Elysia<"", {
                                     transmissionCode: string | null;
                                     driveTrain: string | null;
                                     km: number;
+                                    customData: unknown;
                                     companyId: string | null;
                                     id: string;
                                     createdAt: string;
@@ -3903,7 +3944,7 @@ export declare const app: Elysia<"", {
                                     deletedAt: string | null;
                                     oldId: number | null;
                                 } | null;
-                                isDeleteAble: boolean;
+                                isDeleteAble: unknown;
                             }[];
                         };
                         401: "Session not found";
@@ -3973,6 +4014,7 @@ export declare const app: Elysia<"", {
                                     transmissionCode: string | null;
                                     driveTrain: string | null;
                                     km: number;
+                                    customData: unknown;
                                     companyId: string | null;
                                     id: string;
                                     createdAt: string;
@@ -4021,7 +4063,7 @@ export declare const app: Elysia<"", {
                                     deletedAt: string | null;
                                     oldId: number | null;
                                 } | null;
-                                isDeleteAble: boolean;
+                                isDeleteAble: unknown;
                             }[];
                         };
                         400: "Машины дугаар болон VIN хоёроос нэгийг нь оруулна уу." | "Машины VIN оруулсан бол машины төрөл оруулна уу.";
@@ -5014,6 +5056,7 @@ export declare const app: Elysia<"", {
                                         transmissionCode: string | null;
                                         driveTrain: string | null;
                                         km: number;
+                                        customData: unknown;
                                         companyId: string | null;
                                         id: string;
                                         createdAt: string;
@@ -5103,6 +5146,7 @@ export declare const app: Elysia<"", {
                                 transmissionCode: string | null;
                                 driveTrain: string | null;
                                 km: number;
+                                customData: unknown;
                             };
                             400: "Машины дугаар болон VIN хоёроос нэгийг нь оруулна уу." | "Машины VIN оруулсан бол машины төрөл оруулна уу.";
                             401: "Session not found";
@@ -5151,6 +5195,7 @@ export declare const app: Elysia<"", {
                                         transmissionCode: string | null;
                                         driveTrain: string | null;
                                         km: number;
+                                        customData: unknown;
                                         companyId: string | null;
                                         id: string;
                                         createdAt: string;
@@ -5241,6 +5286,7 @@ export declare const app: Elysia<"", {
                                 transmissionCode?: string | null | undefined;
                                 driveTrain?: string | null | undefined;
                                 km?: number | undefined;
+                                customData?: import("drizzle-typebox").Json | undefined;
                             };
                             params: {
                                 id: string;
@@ -5266,6 +5312,7 @@ export declare const app: Elysia<"", {
                                     transmissionCode: string | null;
                                     driveTrain: string | null;
                                     km: number;
+                                    customData: unknown;
                                     companyId: string | null;
                                     id: string;
                                     createdAt: string;
@@ -5319,6 +5366,7 @@ export declare const app: Elysia<"", {
                                     transmissionCode: string | null;
                                     driveTrain: string | null;
                                     km: number;
+                                    customData: unknown;
                                     companyId: string | null;
                                     id: string;
                                     createdAt: string;
@@ -5401,6 +5449,7 @@ export declare const app: Elysia<"", {
                                     transmissionCode: string | null;
                                     driveTrain: string | null;
                                     km: number;
+                                    customData: unknown;
                                 }[];
                             }[];
                         };
@@ -6265,6 +6314,7 @@ export declare const app: Elysia<"", {
                                     transmissionCode: string | null;
                                     driveTrain: string | null;
                                     km: number;
+                                    customData: unknown;
                                     companyId: string | null;
                                     id: string;
                                     createdAt: string;
@@ -6496,7 +6546,7 @@ export declare const app: Elysia<"", {
                                 };
                                 400: string;
                                 401: "Session not found";
-                                404: "Үзлэг олдсонгүй.";
+                                404: "Бараа олдсонгүй." | "Үйлчилгээний төрөл олдсонгүй." | "Үзлэг олдсонгүй.";
                                 422: {
                                     type: "validation";
                                     on: string;
@@ -6588,6 +6638,7 @@ export declare const app: Elysia<"", {
                                     transmissionCode: string | null;
                                     driveTrain: string | null;
                                     km: number;
+                                    customData: unknown;
                                     companyId: string | null;
                                     id: string;
                                     createdAt: string;

package/dist/index.js

@@ -1924,8 +1924,8 @@ var import_debug, debug, syncBufferSize, ddSignatureArray, eocdSignatureBytes;
 var init_lib3 = __esm(() => {
   init_lib2();
   init_esm();
-  import_debug = __toESM(require_src(), 1);
   init_ZipToken();
+  import_debug = __toESM(require_src(), 1);
   debug = import_debug.default("tokenizer:inflate");
   syncBufferSize = 256 * 1024;
   ddSignatureArray = signatureToArray(Signature.DataDescriptor);
@@ -17019,10 +17019,12 @@ var init_infer_result = () => {};
 
 // node_modules/kysely/dist/esm/index.js
 var init_esm2 = __esm(() => {
+  init_expression_builder();
+  init_log_once();
+  init_query_id();
   init_kysely();
   init_query_creator();
   init_expression();
-  init_expression_builder();
   init_expression_wrapper();
   init_where_interface();
   init_returning_interface();
@@ -17218,8 +17220,6 @@ var init_esm2 = __esm(() => {
   init_streamable();
   init_log();
   init_infer_result();
-  init_log_once();
-  init_query_id();
 });
 
 // node_modules/better-auth/dist/chunks/bun-sqlite-dialect.mjs
@@ -142381,6 +142381,7 @@ var crmVehicleTable = crmSchema.table("vehicle", {
   transmissionCode: varchar(),
   driveTrain: varchar(),
   km: integer2().notNull().default(0),
+  customData: jsonb(),
   companyId: uuid5()
 });
 var crmVehicleRelations = relations(crmVehicleTable, ({ one }) => ({
@@ -146420,7 +146421,7 @@ var CompanyEmployeeModel;
   CompanyEmployeeModel.create = OmitBaseSchema(createSchema);
   CompanyEmployeeModel.update = OmitBaseSchema(updateSchema);
   CompanyEmployeeModel.select = t.Composite([
-    t.Partial(t.Pick(selectSchema, ["companyId"])),
+    t.Partial(t.Pick(selectSchema, ["companyId", "branchId"])),
     t.Partial(t.Object({
       search: t.String()
     })),
@@ -146453,7 +146454,7 @@ var CompanyEmployeeLogic;
   };
   CompanyEmployeeLogic.select = async (query, user2) => {
     const columns = getTableColumns(companyEmployeeTable);
-    const filter = and(eq(companyEmployeeTable.companyId, user2.companyId), or(isNull2(companyEmployeeTable.branchId), eq(companyEmployeeTable.branchId, user2.branchId))?.if(user2.kind === "CUSTOMER"), or(ilike(companyEmployeeTable.firstname, `%${query.search}%`), ilike(companyEmployeeTable.lastname, `%${query.search}%`), ilike(companyEmployeeTable.phone, `%${query.search}%`), ilike(companyEmployeeTable.regNumber, `%${query.search}%`))?.if(query.search), eq(companyEmployeeTable.companyId, query.companyId ?? "").if(query.companyId && user2.kind === "ADMIN"), softDeletedFilter(companyEmployeeTable));
+    const filter = and(eq(companyEmployeeTable.companyId, user2.companyId), eq(companyEmployeeTable.branchId, query.branchId).if(query.branchId && user2.kind !== "CUSTOMER"), or(isNull2(companyEmployeeTable.branchId), eq(companyEmployeeTable.branchId, user2.branchId))?.if(user2.kind === "CUSTOMER"), or(ilike(companyEmployeeTable.firstname, `%${query.search}%`), ilike(companyEmployeeTable.lastname, `%${query.search}%`), ilike(companyEmployeeTable.phone, `%${query.search}%`), ilike(companyEmployeeTable.regNumber, `%${query.search}%`))?.if(query.search), eq(companyEmployeeTable.companyId, query.companyId ?? "").if(query.companyId && user2.kind === "ADMIN"), softDeletedFilter(companyEmployeeTable));
     const baseQuery = db_default.select({
       ...columns,
       totalCount: totalCountSql
@@ -146551,7 +146552,7 @@ var CompanyServiceKindLogic;
   };
   CompanyServiceKindLogic.select = async (query, user2) => {
     const columns = getTableColumns(companyServiceKindTable);
-    const filter = and(eq(companyServiceKindTable.companyId, user2.companyId), eq(companyServiceKindTable.branchId, user2.branchId).if(user2.kind === "CUSTOMER"), eq(companyServiceKindTable.enabled, query.enabled ?? true), eq(companyServiceKindTable.serviceKindId, query.serviceKindId ?? "").if(query.serviceKindId), ilike(companyServiceKindTable.name, `%${query.name}%`).if(query.name), softDeletedFilter(companyServiceKindTable), eq(companyServiceKindTable.id, query.id ?? "").if(query.id), inArray(companyServiceKindTable.id, query.ids ?? []).if(query.ids?.length));
+    const filter = and(eq(companyServiceKindTable.companyId, user2.companyId), or(eq(companyServiceKindTable.branchId, user2.branchId), isNull2(companyServiceKindTable.branchId))?.if(user2.kind === "CUSTOMER"), eq(companyServiceKindTable.enabled, query.enabled ?? true), eq(companyServiceKindTable.serviceKindId, query.serviceKindId ?? "").if(query.serviceKindId), ilike(companyServiceKindTable.name, `%${query.name}%`).if(query.name), softDeletedFilter(companyServiceKindTable), eq(companyServiceKindTable.id, query.id ?? "").if(query.id), inArray(companyServiceKindTable.id, query.ids ?? []).if(query.ids?.length));
     const baseQuery = db_default.select({
       ...columns,
       totalCount: totalCountSql
@@ -146930,7 +146931,7 @@ var CrmCpOrderItemLogic;
 ((CrmCpOrderItemLogic) => {
   CrmCpOrderItemLogic.select = async ({ cpOrderId }) => {
     const filter = and(eq(crmCpOrderItemTable.cpOrderId, cpOrderId), softDeletedFilter(crmCpOrderItemTable));
-    const rows = await db_default.select().from(crmCpOrderItemTable).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).leftJoin(warehouseItemTable, eq(warehouseItemTable.productId, crmCpOrderItemTable.companyProductId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).where(filter);
+    const rows = await db_default.select().from(crmCpOrderItemTable).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmCpOrderSpPackageTable, eq(crmCpOrderSpPackageTable.cpOrderId, crmCpOrderItemTable.cpOrderId)).leftJoin(crmSpPackageTable, eq(crmSpPackageTable.id, crmCpOrderSpPackageTable.spPackageId)).where(filter);
     const result = rows.reduce((acc, row) => {
       if (!acc[row.cp_order_item.id]) {
         acc[row.cp_order_item.id] = {
@@ -147265,11 +147266,11 @@ var CrmSpPackageLogic;
     const products = rows.map((row) => row.product ? {
       ...row.product,
       name: row.productName
-    } : undefined).filter((i2) => Boolean(i2));
+    } : undefined).filter((i2) => Boolean(i2)).filter((product, index2, self2) => index2 === self2.findIndex((t2) => t2.id === product?.id));
     const services = rows.map((row) => row.service ? {
       ...row.service,
       name: row.serviceName
-    } : undefined).filter((i2) => Boolean(i2));
+    } : undefined).filter((i2) => Boolean(i2)).filter((service5, index2, self2) => index2 === self2.findIndex((t2) => t2.id === service5?.id));
     return {
       spPackage,
       products,
@@ -149965,7 +149966,9 @@ class UbPayGateway extends PaymentGateway {
     const invoice = await this.ubPay.createInvoice({
       amount: payment.amount,
       description: "Autosync",
-      customData: undefined,
+      customData: {
+        bnplProductId: 2
+      },
       callbackUrl: `${CALLBACK_URL}/ubpay/${payment.id}`
     }, this.token);
     if (invoice.data.success === false) {
@@ -150220,9 +150223,8 @@ var CrmCpOrderLogic;
       make,
       model,
       customer: crmCustomerTable,
-      isDeleteAble: sql3`
-        (select count(*) from ${crmCpOrderItemTable} where ${crmCpOrderItemTable.cpOrderId} = ${crmCpOrderTable.id} and ${crmCpOrderItemTable.deletedAt} is null)
-         = 0`.mapWith(Boolean).as("is_delete_able")
+      isDeleteAble: sql3`(
+				  select case when count(*) = 0 then TRUE else FALSE end from ${crmCpOrderItemTable} where ${crmCpOrderItemTable.cpOrderId} = ${crmCpOrderTable.id} and ${crmCpOrderItemTable.deletedAt} is null)`.as("is_delete_able")
     }).from(crmCpOrderTable).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).leftJoin(crmCustomerTable, eq(crmCustomerTable.id, crmCpOrderTable.customerId)).leftJoin(model, eq(model.id, crmVehicleTable.vehicleKindId)).leftJoin(make, eq(make.id, model.parentId)).where(filter).orderBy(desc(crmCpOrderTable.createdAt)).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
     let totalAmounts = [];
@@ -150829,8 +150831,8 @@ var itemRoutes = new Elysia({
   query: model_default8.select
 }).post("/", async ({ body, user: user2 }) => logic_default7.create(body, user2), {
   body: model_default8.create,
-  afterResponse: async ({ user: user2, response }) => {
-    const res = response;
+  afterResponse: async ({ user: user2, responseValue }) => {
+    const res = responseValue;
     if ("code" in res)
       return res;
     return await logic_default13.apply(res.cpOrderId, user2);
@@ -150839,15 +150841,15 @@ var itemRoutes = new Elysia({
   params: IdSchema
 }).put("/:id", async ({ params, body, user: user2 }) => logic_default7.update(params.id, body, user2), {
   body: model_default8.update,
-  afterResponse: async ({ user: user2, response }) => {
-    const res = response;
+  afterResponse: async ({ user: user2, responseValue }) => {
+    const res = responseValue;
     if ("code" in res)
       return;
     await logic_default13.apply(res.cpOrderId, user2);
   }
 }).delete("/:id", async ({ params, user: user2 }) => logic_default7.remove(params.id, user2), {
-  afterResponse: async ({ user: user2, response }) => {
-    const res = response;
+  afterResponse: async ({ user: user2, responseValue }) => {
+    const res = responseValue;
     if ("code" in res)
       return res;
     return await logic_default13.apply(res.cpOrderId, user2);
@@ -150987,6 +150989,9 @@ var paymentRoutes = new Elysia({
 }).post("/storepay", async ({ body, user: user2 }) => logic_default12.createStorepay(body, user2), { body: model_default10.storepay, auth: true }).get("/storepay/:id", async ({ params: { id } }) => logic_default12.checkStorePay(id)).post("/ubpay", async ({ body, user: user2 }) => logic_default12.createUbPay(body, user2), {
   body: model_default10.create,
   auth: true
+}).post("/ubpay/test/:id", async ({ params: { id } }) => {
+  app.server?.publish(`cp_order_payment:${id}`, "Testing web socket");
+  return "ok";
 }).post("/ubpay/:id", async ({ params: { id } }) => logic_default12.checkUbPay(id)).get("/qpay/:id", async ({ params: { id } }) => logic_default12.checkQpay(id)).post("/qpay", async ({ body, user: user2 }) => logic_default12.createQpay(body, user2), {
   body: model_default10.create,
   auth: true
@@ -151127,8 +151132,8 @@ var CrmDashboardLogic;
   CrmDashboardLogic.getCpOrderTotalAmountByDay = async (user2) => {
     const result = await db_default.select({
       amount: sum(crmCpOrderItemTable.priceTotal).mapWith(Number),
-      date: sql3`date_trunc('day', CURRENT_DATE)`.as("day")
-    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE) - interval '1 month'`)).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).groupBy((t2) => t2.date);
+      date: sql3`date_trunc('day', ${crmCpOrderTable.createdAt})`.as("day")
+    }).from(crmCpOrderTable).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), sql3`${crmCpOrderTable.createdAt} >= date_trunc('month', CURRENT_DATE) - interval '1 month'`)).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.cpOrderId, crmCpOrderTable.id)).groupBy((t2) => t2.date).orderBy((t2) => t2.date);
     return result;
   };
 })(CrmDashboardLogic ||= {});
@@ -151324,15 +151329,9 @@ var CrmInspectionLogic;
     if ("code" in cpOrder) {
       return cpOrder;
     }
+    let serviceKind;
     try {
-      await db_default.transaction(async (db2) => {
-        const serviceKind = await logic_default4.getInspection(user2, db2);
-        await logic_default7.create({
-          quantity: 1,
-          cpOrderId: cpOrder.id,
-          companyServiceKindId: serviceKind.id
-        }, user2);
-      });
+      serviceKind = await logic_default4.getInspection(user2);
     } catch (err2) {
       await logic_default14.hardRemove(cpOrder.id, user2);
       if (err2 instanceof Error) {
@@ -151340,6 +151339,14 @@ var CrmInspectionLogic;
       }
       return status("Internal Server Error", "\u0410\u043B\u0434\u0430\u0430 \u0433\u0430\u0440\u043B\u0430\u0430. \u0414\u0430\u0445\u0438\u043D \u043E\u0440\u043E\u043B\u0434\u043E\u043D\u043E \u0443\u0443.");
     }
+    const res = await logic_default7.create({
+      quantity: 1,
+      cpOrderId: cpOrder.id,
+      companyServiceKindId: serviceKind.id
+    }, user2);
+    if ("code" in res) {
+      return res;
+    }
     return {
       cpOrderId: cpOrder.id
     };
@@ -152957,7 +152964,7 @@ var productRoutes3 = new Elysia({
   body: model_default22.create
 }).post("/many", async ({ body, user: user2 }) => logic_default5.createMany(body, user2), {
   body: t.Array(model_default22.create)
-}).post("/download", async ({ query, user: user2 }) => logic_default5.downloadExcel(query, user2), { query: model_default22.select }).guard({
+}).post("/download", async ({ query, user: user2 }) => logic_default5.downloadExcel(query, user2), { query: t.Omit(model_default22.select, ["pagination"]) }).guard({
   params: IdSchema
 }).put("/:id", async ({ params: { id }, body, user: user2 }) => logic_default5.update(id, body, user2), { body: model_default22.update });
 var product_default3 = productRoutes3;

package/package.json

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