autosync_backend2 1.1.52 → 1.1.53

package/dist/index.d.ts

@@ -52,11 +52,11 @@ export declare const app: Elysia<"", {
             alias: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNull]>>;
         }>;
         readonly "WarehouseProductModel.select": import("@sinclair/typebox").TObject<{
+            search: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             branchId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             ids: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
             type: import("@sinclair/typebox").TOptional<import("elysia/dist/type-system/types").TUnionEnum<["Сэлбэг", "Тос", "Дугуй", "Будаг", "Аккумлятор"]>>;
-            search: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             supplierId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             productId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             priceSell: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
@@ -108,11 +108,11 @@ export declare const app: Elysia<"", {
                 size: import("@sinclair/typebox").TInteger;
             }>;
             product: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+                search: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
                 id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
                 branchId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
                 ids: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
                 type: import("@sinclair/typebox").TOptional<import("elysia/dist/type-system/types").TUnionEnum<["Сэлбэг", "Тос", "Дугуй", "Будаг", "Аккумлятор"]>>;
-                search: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
                 supplierId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
                 productId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
                 priceSell: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
@@ -482,11 +482,11 @@ export declare const app: Elysia<"", {
                 page: import("@sinclair/typebox").TInteger;
                 size: import("@sinclair/typebox").TInteger;
             }>;
+            licensePlate: import("@sinclair/typebox").TOptional<import("elysia/dist/type-system/types").TTransform<import("@sinclair/typebox").TString, string>>;
             id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             createdAt: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             phone: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             orderId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-            licensePlate: import("@sinclair/typebox").TOptional<import("elysia/dist/type-system/types").TTransform<import("@sinclair/typebox").TString, string>>;
             vin: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             state: import("@sinclair/typebox").TOptional<import("elysia/dist/type-system/types").TUnionEnum<["CREATED", "PROGRESSING", "COMPLETE"]>>;
             timeCompleted: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -715,6 +715,20 @@ export declare const app: Elysia<"", {
             experience: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNull]>>;
             rank: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TNull]>>;
             licensePlate: import("@sinclair/typebox").TString;
+            status: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TEnum<{
+                CREATED: "CREATED";
+                APPROVED: "APPROVED";
+                CANCELLED: "CANCELLED";
+            }>>;
+        }>;
+        readonly "CrmInspectionModel.select": import("@sinclair/typebox").TObject<{
+            search: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            licensePlate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            status: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+            pagination: import("@sinclair/typebox").TObject<{
+                page: import("@sinclair/typebox").TInteger;
+                size: import("@sinclair/typebox").TInteger;
+            }>;
         }>;
         readonly "TechdocSupplierModel.select": import("@sinclair/typebox").TObject<{
             pagination: import("@sinclair/typebox").TObject<{
@@ -3598,6 +3612,33 @@ export declare const app: Elysia<"", {
                     headers: unknown;
                     response: {
                         200: {
+                            company: Omit<{
+                                name: string;
+                                id: string;
+                                email: string;
+                                createdAt: string;
+                                updatedAt: string;
+                                deletedAt: string | null;
+                                regNumber: string;
+                                phone: string;
+                                serviceName: string;
+                                logoUrl: string;
+                                province: string | null;
+                                district: string | null;
+                                khoroo: string | null;
+                                street: string | null;
+                                socialUrls: string[] | null;
+                                ceoName: string | null;
+                                webUrl: string | null;
+                                googleMapUrl: string | null;
+                                isContract: boolean;
+                                isNoat: boolean;
+                                isNexus: boolean;
+                                isActive: boolean;
+                                branchCount: number;
+                            } & {
+                                totalCount: number;
+                            }, "totalCount">;
                             id: string;
                             name: string;
                             emailVerified: boolean;
@@ -6348,6 +6389,169 @@ export declare const app: Elysia<"", {
     } & {
         crm: {
             inspection: {};
+        } & {
+            inspection: {
+                get: {
+                    body: unknown;
+                    params: {};
+                    query: {
+                        search?: string | undefined;
+                        licensePlate?: string | undefined;
+                        status?: string | undefined;
+                        pagination: {
+                            size: number;
+                            page: number;
+                        };
+                    };
+                    headers: unknown;
+                    response: {
+                        200: {
+                            totalCount: number;
+                            totalPage: number;
+                            result: {
+                                inspection: {
+                                    companyId: string;
+                                    branchId: string;
+                                    vehicleId: string;
+                                    inspection: {
+                                        description?: string | undefined;
+                                        isApproved?: boolean | undefined;
+                                        type: string;
+                                        employeeId: string;
+                                        values: {
+                                            description?: string | undefined;
+                                            question: string;
+                                            answer: string;
+                                        };
+                                    }[] | null;
+                                    employeeId: string | null;
+                                    expireAt: Date;
+                                    experience: string | null;
+                                    rank: string | null;
+                                    licensePlate: string;
+                                    description: string | null;
+                                    status: "CREATED" | "APPROVED" | "CANCELLED";
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                vehicle: {
+                                    customerId: string | null;
+                                    vehicleKindId: string;
+                                    vin: string | null;
+                                    licensePlate: string | null;
+                                    color: string | null;
+                                    engineCc: string | null;
+                                    cylinder: string | null;
+                                    gasType: string | null;
+                                    transmissionType: string | null;
+                                    vehicleType: string | null;
+                                    yearManufacture: number | null;
+                                    yearImport: number | null;
+                                    steering: string | null;
+                                    engineCode: string | null;
+                                    transmissionCode: string | null;
+                                    driveTrain: string | null;
+                                    km: number;
+                                    companyId: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                } | null;
+                            }[];
+                        };
+                        422: {
+                            type: "validation";
+                            on: string;
+                            summary?: string;
+                            message?: string;
+                            found?: unknown;
+                            property?: string;
+                            expected?: string;
+                        };
+                    };
+                };
+            };
+        } & {
+            inspection: {
+                ":id": {
+                    get: {
+                        body: unknown;
+                        params: {
+                            id: string;
+                        };
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                inspection: {
+                                    companyId: string;
+                                    branchId: string;
+                                    vehicleId: string;
+                                    inspection: {
+                                        description?: string | undefined;
+                                        isApproved?: boolean | undefined;
+                                        type: string;
+                                        employeeId: string;
+                                        values: {
+                                            description?: string | undefined;
+                                            question: string;
+                                            answer: string;
+                                        };
+                                    }[] | null;
+                                    employeeId: string | null;
+                                    expireAt: Date;
+                                    experience: string | null;
+                                    rank: string | null;
+                                    licensePlate: string;
+                                    description: string | null;
+                                    status: "CREATED" | "APPROVED" | "CANCELLED";
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                vehicle: {
+                                    customerId: string | null;
+                                    vehicleKindId: string;
+                                    vin: string | null;
+                                    licensePlate: string | null;
+                                    color: string | null;
+                                    engineCc: string | null;
+                                    cylinder: string | null;
+                                    gasType: string | null;
+                                    transmissionType: string | null;
+                                    vehicleType: string | null;
+                                    yearManufacture: number | null;
+                                    yearImport: number | null;
+                                    steering: string | null;
+                                    engineCode: string | null;
+                                    transmissionCode: string | null;
+                                    driveTrain: string | null;
+                                    km: number;
+                                    companyId: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                } | null;
+                            };
+                            404: "Үзлэг олдсонгүй.";
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
+                        };
+                    };
+                };
+            };
         } & {
             inspection: {
                 post: {
@@ -6356,6 +6560,7 @@ export declare const app: Elysia<"", {
                         description?: string | null | undefined;
                         experience?: string | null | undefined;
                         rank?: string | null | undefined;
+                        status?: "CREATED" | "APPROVED" | "CANCELLED" | undefined;
                         inspection: {
                             description?: string | undefined;
                             isApproved?: boolean | undefined;
@@ -6398,6 +6603,7 @@ export declare const app: Elysia<"", {
                             experience: string | null;
                             rank: string | null;
                             licensePlate: string;
+                            status: "CREATED" | "APPROVED" | "CANCELLED";
                         };
                         502: string;
                         400: "Машины дугаар болон VIN хоёроос нэгийг нь оруулна уу." | "Машины VIN оруулсан бол машины төрөл оруулна уу.";

package/dist/index.js

@@ -137478,6 +137478,7 @@ __export(exports_schema, {
   crmPaymentTypeEnum: () => crmPaymentTypeEnum,
   crmPaymentTable: () => crmPaymentTable,
   crmInspectionTable: () => crmInspectionTable,
+  crmInspectionStatusEnum: () => crmInspectionStatusEnum,
   crmDiscountTypeEnum: () => crmDiscountTypeEnum,
   crmDiscountTable: () => crmDiscountTable,
   crmDiscountStateEnum: () => crmDiscountStateEnum,
@@ -137886,6 +137887,11 @@ var crmDiscountApplyTable = crmSchema.table("discount_apply", {
   authUserId: text().notNull(),
   employeeId: uuid().notNull()
 });
+var crmInspectionStatusEnum = crmSchema.enum("inspection_status", [
+  "CREATED",
+  "APPROVED",
+  "CANCELLED"
+]);
 var crmInspectionTable = crmSchema.table("inspections", {
   ...base_schema_helper_default,
   companyId: uuid().notNull(),
@@ -137897,7 +137903,8 @@ var crmInspectionTable = crmSchema.table("inspections", {
   experience: varchar(),
   rank: varchar(),
   licensePlate: varchar().notNull(),
-  description: text()
+  description: text(),
+  status: crmInspectionStatusEnum("status").notNull().default("CREATED")
 });
 // src/lib/db/schema/techdoc.schema.ts
 var techdocSchema = pgSchema("techdoc");
@@ -141815,6 +141822,20 @@ var companySchemaRoutes = new Elysia({
 }).use(company_default).use(branch_default).use(_package_default).use(serviceKind_default).use(employee_default);
 var company_default2 = companySchemaRoutes;
 
+// src/lib/utils/dataStore.logic.ts
+var DataStoreLogic;
+((DataStoreLogic) => {
+  DataStoreLogic.create = async (body) => {
+    const [result] = await db_default.insert(dataStoreTable).values(body).returning();
+    return result;
+  };
+  DataStoreLogic.selectById = async (id) => {
+    const [result] = await db_default.select().from(dataStoreTable).where(eq(dataStoreTable.id, id)).limit(1);
+    return result;
+  };
+})(DataStoreLogic ||= {});
+var dataStore_logic_default = DataStoreLogic;
+
 // src/routes/warehouse/product/logic.ts
 var import_exceljs = __toESM(require_excel(), 1);
 var WarehouseProductLogic;
@@ -141935,20 +141956,6 @@ var WarehouseProductLogic;
 })(WarehouseProductLogic ||= {});
 var logic_default3 = WarehouseProductLogic;
 
-// src/lib/utils/dataStore.logic.ts
-var DataStoreLogic;
-((DataStoreLogic) => {
-  DataStoreLogic.create = async (body) => {
-    const [result] = await db_default.insert(dataStoreTable).values(body).returning();
-    return result;
-  };
-  DataStoreLogic.selectById = async (id) => {
-    const [result] = await db_default.select().from(dataStoreTable).where(eq(dataStoreTable.id, id)).limit(1);
-    return result;
-  };
-})(DataStoreLogic ||= {});
-var dataStore_logic_default = DataStoreLogic;
-
 // src/routes/warehouse/item/logic.ts
 var WarehouseItemLogic;
 ((WarehouseItemLogic) => {
@@ -142321,36 +142328,6 @@ var CrmCpOrderItemLogic;
 })(CrmCpOrderItemLogic ||= {});
 var logic_default5 = CrmCpOrderItemLogic;
 
-// src/routes/crm/cpOrder/item/model.ts
-var CrmCpOrderItemModel;
-((CrmCpOrderItemModel) => {
-  const createSchema = createInsertSchema2(crmCpOrderItemTable);
-  const updateSchema = createUpdateSchema(crmCpOrderItemTable);
-  CrmCpOrderItemModel.create = t.Composite([
-    t.Pick(OmitBaseSchema(createSchema), [
-      "quantity",
-      "cpOrderId",
-      "companyServiceKindId",
-      "cpOrderSpPackageId",
-      "companyProductId",
-      "name"
-    ]),
-    t.Partial(t.Object({
-      priceUnit: t.Number()
-    }))
-  ]);
-  CrmCpOrderItemModel.update = t.Pick(OmitBaseSchema(updateSchema), [
-    "quantity",
-    "priceUnit",
-    "timeCompleted",
-    "state"
-  ]);
-  CrmCpOrderItemModel.select = t.Object({
-    cpOrderId: t.String({ format: "uuid" })
-  });
-})(CrmCpOrderItemModel ||= {});
-var model_default6 = CrmCpOrderItemModel;
-
 // src/routes/crm/customer/logic.ts
 var CrmCustomerLogic;
 ((CrmCustomerLogic) => {
@@ -145855,6 +145832,36 @@ var DiscountLogic;
 })(DiscountLogic ||= {});
 var logic_default11 = DiscountLogic;
 
+// src/routes/crm/cpOrder/item/model.ts
+var CrmCpOrderItemModel;
+((CrmCpOrderItemModel) => {
+  const createSchema = createInsertSchema2(crmCpOrderItemTable);
+  const updateSchema = createUpdateSchema(crmCpOrderItemTable);
+  CrmCpOrderItemModel.create = t.Composite([
+    t.Pick(OmitBaseSchema(createSchema), [
+      "quantity",
+      "cpOrderId",
+      "companyServiceKindId",
+      "cpOrderSpPackageId",
+      "companyProductId",
+      "name"
+    ]),
+    t.Partial(t.Object({
+      priceUnit: t.Number()
+    }))
+  ]);
+  CrmCpOrderItemModel.update = t.Pick(OmitBaseSchema(updateSchema), [
+    "quantity",
+    "priceUnit",
+    "timeCompleted",
+    "state"
+  ]);
+  CrmCpOrderItemModel.select = t.Object({
+    cpOrderId: t.String({ format: "uuid" })
+  });
+})(CrmCpOrderItemModel ||= {});
+var model_default6 = CrmCpOrderItemModel;
+
 // src/routes/crm/cpOrder/item/index.ts
 var itemRoutes = new Elysia({
   prefix: "/item",
@@ -146205,6 +146212,145 @@ var discountRoutes = new Elysia({
 });
 var discount_default = discountRoutes;
 
+// src/routes/crm/inspection/logic.ts
+var CrmInspectionLogic;
+((CrmInspectionLogic) => {
+  CrmInspectionLogic.getFilter = (query, user2) => {
+    const ilikeSearch = `%${query.search}%`;
+    return and(softDeletedFilter(crmInspectionTable), eq(crmInspectionTable.companyId, user2.companyId), eq(crmInspectionTable.branchId, user2.branchId).if(user2.kind === "CUSTOMER"), or(ilike(crmInspectionTable.licensePlate, ilikeSearch), ilike(crmInspectionTable.description, ilikeSearch))?.if(!!query.search), eq(crmInspectionTable.status, query.status).if(query.status), ilike(crmInspectionTable.licensePlate, `%${query.licensePlate}%`).if(query.licensePlate));
+  };
+  CrmInspectionLogic.select = async (query, user2) => {
+    const baseQuery = db_default.select({
+      inspection: crmInspectionTable,
+      vehicle: crmVehicleTable,
+      totalCount: totalCountSql
+    }).from(crmInspectionTable).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmInspectionTable.vehicleId)).where(CrmInspectionLogic.getFilter(query, user2)).orderBy(desc(crmInspectionTable.createdAt)).$dynamic();
+    const result = await pagination_helper_default(baseQuery, query.pagination);
+    const content = {
+      totalCount: result[0]?.totalCount ?? 0,
+      totalPage: result.length === 0 ? 0 : Math.ceil((result[0]?.totalCount ?? 0) / query.pagination.size)
+    };
+    return {
+      result: result.map(({ totalCount, ...item }) => item),
+      ...content
+    };
+  };
+  CrmInspectionLogic.getById = async (id, user2) => {
+    const [inspection] = await db_default.select({
+      inspection: crmInspectionTable,
+      vehicle: crmVehicleTable
+    }).from(crmInspectionTable).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmInspectionTable.vehicleId)).where(and(eq(crmInspectionTable.id, id), eq(crmInspectionTable.companyId, user2.companyId), eq(crmInspectionTable.branchId, user2.branchId).if(user2.kind === "CUSTOMER"), softDeletedFilter(crmInspectionTable)));
+    if (!inspection) {
+      return status("Not Found", "\u04AE\u0437\u043B\u044D\u0433 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+    }
+    return inspection;
+  };
+  CrmInspectionLogic.create = async (body, user2) => {
+    const vehicle = await logic_default9.findOrCreate({
+      licensePlate: body.licensePlate
+    });
+    if ("code" in vehicle) {
+      return vehicle;
+    }
+    const [res] = await db_default.insert(crmInspectionTable).values({
+      companyId: user2.companyId,
+      branchId: user2.branchId,
+      vehicleId: vehicle.id,
+      employeeId: user2.employeeId,
+      ...body
+    }).returning();
+    return res;
+  };
+  CrmInspectionLogic.createCpOrder = async (id, user2) => {
+    const [inspection] = await db_default.select().from(crmInspectionTable).where(eq(crmInspectionTable.id, id));
+    if (!inspection) {
+      return status("Not Found", "\u04AE\u0437\u043B\u044D\u0433 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+    }
+    const cpOrder = await logic_default12.create({
+      licensePlate: inspection.licensePlate
+    }, user2, db_default);
+    if ("code" in cpOrder) {
+      return cpOrder;
+    }
+    try {
+      await db_default.transaction(async (db2) => {
+        const serviceKind = await logic_default2.getInspection(user2, db2);
+        await logic_default5.create({
+          quantity: 1,
+          cpOrderId: cpOrder.id,
+          companyServiceKindId: serviceKind.id
+        }, user2);
+      });
+    } catch (err2) {
+      await logic_default12.hardRemove(cpOrder.id, user2);
+      if (err2 instanceof Error) {
+        return status("Bad Request", err2.message);
+      }
+      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.");
+    }
+    return {
+      cpOrderId: cpOrder.id
+    };
+  };
+  CrmInspectionLogic.approve = async (id, user2) => {
+    await db_default.update(crmInspectionTable).set({
+      status: "APPROVED"
+    }).where(and(eq(crmInspectionTable.id, id), eq(crmInspectionTable.companyId, user2.companyId), eq(crmInspectionTable.branchId, user2.branchId).if(user2.kind === "CUSTOMER")));
+  };
+})(CrmInspectionLogic ||= {});
+var logic_default13 = CrmInspectionLogic;
+
+// src/routes/crm/inspection/model.ts
+var CrmInspectionModel;
+((CrmInspectionModel) => {
+  const inspectionSchema = t.Object({
+    type: t.String(),
+    values: t.Object({
+      question: t.String(),
+      answer: t.String(),
+      description: t.Optional(t.String())
+    }),
+    employeeId: t.String({ format: "uuid" }),
+    description: t.Optional(t.String()),
+    isApproved: t.Optional(t.Boolean())
+  });
+  const createSchema = createInsertSchema(crmInspectionTable, {
+    inspection: t.Array(inspectionSchema, {
+      minItems: 1
+    })
+  });
+  CrmInspectionModel.create = t.Omit(OmitBaseSchema(createSchema), [
+    "expireAt",
+    "companyId",
+    "branchId",
+    "vehicleId"
+  ]);
+  CrmInspectionModel.select = t.Composite([
+    t.Partial(t.Object({
+      search: t.String(),
+      status: t.String(),
+      licensePlate: t.String()
+    })),
+    PaginationSchema
+  ]);
+})(CrmInspectionModel ||= {});
+var model_default11 = CrmInspectionModel;
+
+// src/routes/crm/inspection/index.ts
+var inspectionRoutes = new Elysia({
+  prefix: "/inspection",
+  tags: ["CrmInspection"]
+}).use(better_auth_default).guard({ auth: true }).model(prefix_model_default("CrmInspectionModel", model_default11)).get("/", async ({ query, user: user2 }) => logic_default13.select(query, user2), {
+  query: "CrmInspectionModel.select"
+}).get("/:id", async ({ params: { id }, user: user2 }) => logic_default13.getById(id, user2), {
+  params: IdSchema
+}).post("/", async ({ body, user: user2 }) => logic_default13.create(body, user2), {
+  body: "CrmInspectionModel.create"
+}).post("/:id/service-order", async ({ params: { id }, user: user2 }) => logic_default13.createCpOrder(id, user2), {
+  params: IdSchema
+});
+var inspection_default = inspectionRoutes;
+
 // src/routes/crm/spPackage/model.ts
 var CrmSpPackageModel;
 ((CrmSpPackageModel) => {
@@ -146218,7 +146364,7 @@ var CrmSpPackageModel;
     t.Partial(t.Pick(selectSchema, ["name", "priceTotal", "companyBranchId"]))
   ]);
 })(CrmSpPackageModel ||= {});
-var model_default11 = CrmSpPackageModel;
+var model_default12 = CrmSpPackageModel;
 
 // src/routes/crm/spPackage/product/logic.ts
 var CrmSpPackageProductLogic;
@@ -146264,7 +146410,7 @@ var CrmSpPackageProductLogic;
     }).where(eq(crmSpPackageProductTable.id, id));
   };
 })(CrmSpPackageProductLogic ||= {});
-var logic_default13 = CrmSpPackageProductLogic;
+var logic_default14 = CrmSpPackageProductLogic;
 
 // src/routes/crm/spPackage/product/model.ts
 var CrmSpPackageProductModel;
@@ -146276,7 +146422,7 @@ var CrmSpPackageProductModel;
   CrmSpPackageProductModel.update = OmitBaseSchema(updateSchema);
   CrmSpPackageProductModel.select = t.Pick(selectSchema, ["spPackageId"]);
 })(CrmSpPackageProductModel ||= {});
-var model_default12 = CrmSpPackageProductModel;
+var model_default13 = CrmSpPackageProductModel;
 
 // src/routes/crm/spPackage/product/index.ts
 var productRoutes = new Elysia({
@@ -146284,17 +146430,17 @@ var productRoutes = new Elysia({
   tags: ["CrmSpPackageProduct"]
 }).use(better_auth_default).guard({
   auth: true
-}).model(prefix_model_default("CrmSpPackageProductModel", model_default12)).get("/", async ({ query }) => logic_default13.select(query), {
+}).model(prefix_model_default("CrmSpPackageProductModel", model_default13)).get("/", async ({ query }) => logic_default14.select(query), {
   query: "CrmSpPackageProductModel.select"
-}).post("/", async ({ body }) => logic_default13.create(body), {
+}).post("/", async ({ body }) => logic_default14.create(body), {
   body: "CrmSpPackageProductModel.create"
-}).post("/many", async ({ body }) => logic_default13.createMany(body), {
+}).post("/many", async ({ body }) => logic_default14.createMany(body), {
   body: "CrmSpPackageProductModel.create[]"
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ params, body }) => logic_default13.update(params.id, body), {
+}).put("/:id", async ({ params, body }) => logic_default14.update(params.id, body), {
   body: "CrmSpPackageProductModel.update"
-}).delete("/:id", async ({ params }) => logic_default13.remove(params.id));
+}).delete("/:id", async ({ params }) => logic_default14.remove(params.id));
 var product_default = productRoutes;
 
 // src/routes/crm/spPackage/service/logic.ts
@@ -146337,7 +146483,7 @@ var CrmSpPackageServiceLogic;
     }).where(and(eq(crmSpPackageServiceTable.id, id)));
   };
 })(CrmSpPackageServiceLogic ||= {});
-var logic_default14 = CrmSpPackageServiceLogic;
+var logic_default15 = CrmSpPackageServiceLogic;
 
 // src/routes/crm/spPackage/service/model.ts
 var CrmSpPackageServiceModel;
@@ -146349,7 +146495,7 @@ var CrmSpPackageServiceModel;
   CrmSpPackageServiceModel.update = OmitBaseSchema(updateSchema);
   CrmSpPackageServiceModel.select = t.Pick(selectSchema, ["spPackageId"]);
 })(CrmSpPackageServiceModel ||= {});
-var model_default13 = CrmSpPackageServiceModel;
+var model_default14 = CrmSpPackageServiceModel;
 
 // src/routes/crm/spPackage/service/index.ts
 var serviceRoutes = new Elysia({
@@ -146357,17 +146503,17 @@ var serviceRoutes = new Elysia({
   tags: ["CrmSpPackageService"]
 }).use(better_auth_default).guard({
   auth: true
-}).model(prefix_model_default("CrmSpPackageServiceModel", model_default13)).get("/", async ({ query }) => logic_default14.select(query), {
+}).model(prefix_model_default("CrmSpPackageServiceModel", model_default14)).get("/", async ({ query }) => logic_default15.select(query), {
   query: "CrmSpPackageServiceModel.select"
-}).post("/", async ({ body }) => logic_default14.create(body), {
+}).post("/", async ({ body }) => logic_default15.create(body), {
   body: "CrmSpPackageServiceModel.create"
-}).post("/many", async ({ body }) => logic_default14.createMany(body), {
+}).post("/many", async ({ body }) => logic_default15.createMany(body), {
   body: "CrmSpPackageServiceModel.create[]"
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ params, body }) => logic_default14.update(params.id, body), {
+}).put("/:id", async ({ params, body }) => logic_default15.update(params.id, body), {
   body: "CrmSpPackageServiceModel.update"
-}).delete("/:id", async ({ params }) => logic_default14.remove(params.id));
+}).delete("/:id", async ({ params }) => logic_default15.remove(params.id));
 var service_default = serviceRoutes;
 
 // src/routes/crm/spPackage/index.ts
@@ -146376,7 +146522,7 @@ var spPackageRoutes = new Elysia({
   tags: ["CrmSpPackage"]
 }).use(better_auth_default).use(service_default).use(product_default).guard({
   auth: true
-}).model(prefix_model_default("CrmSpPackageModel", model_default11)).get("/", async ({ query, user: user2 }) => logic_default7.select(query, user2), {
+}).model(prefix_model_default("CrmSpPackageModel", model_default12)).get("/", async ({ query, user: user2 }) => logic_default7.select(query, user2), {
   query: "CrmSpPackageModel.select"
 }).post("/", async ({ body, user: user2 }) => logic_default7.create(body, user2), {
   body: "CrmSpPackageModel.create"
@@ -146401,7 +146547,7 @@ var CrmVehicleModel;
     }))
   ]);
 })(CrmVehicleModel ||= {});
-var model_default14 = CrmVehicleModel;
+var model_default15 = CrmVehicleModel;
 
 // src/routes/crm/vehicle/index.ts
 var vehicleRoutes = new Elysia({
@@ -146414,108 +146560,16 @@ var vehicleRoutes = new Elysia({
   auth: true,
   tags: ["Vehicle"]
 }).get("/", async ({ query, user: user2 }) => logic_default9.select(query, user2), {
-  query: model_default14.select
+  query: model_default15.select
 }).post("/", async ({ body, user: user2 }) => logic_default9.create(body, user2), {
-  body: model_default14.create
+  body: model_default15.create
 }).guard({
   params: IdSchema
 }).get("/:id", async ({ params, user: user2 }) => logic_default9.selectById(params.id, user2)).put("/:id", async ({ params, body, user: user2 }) => logic_default9.update(params.id, body, user2), {
-  body: model_default14.update
+  body: model_default15.update
 }).delete("/:id", async ({ params, user: user2 }) => logic_default9.remove(params.id, user2)));
 var vehicle_default = vehicleRoutes;
 
-// src/routes/crm/inspection/logic.ts
-var CrmInspectionLogic;
-((CrmInspectionLogic) => {
-  CrmInspectionLogic.create = async (body, user2) => {
-    const vehicle = await logic_default9.findOrCreate({
-      licensePlate: body.licensePlate
-    });
-    if ("code" in vehicle) {
-      return vehicle;
-    }
-    const [res] = await db_default.insert(crmInspectionTable).values({
-      companyId: user2.companyId,
-      branchId: user2.branchId,
-      vehicleId: vehicle.id,
-      employeeId: user2.employeeId,
-      ...body
-    }).returning();
-    return res;
-  };
-  CrmInspectionLogic.createCpOrder = async (id, user2) => {
-    const [inspection] = await db_default.select().from(crmInspectionTable).where(eq(crmInspectionTable.id, id));
-    if (!inspection) {
-      return status("Not Found", "\u04AE\u0437\u043B\u044D\u0433 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
-    }
-    const cpOrder = await logic_default12.create({
-      licensePlate: inspection.licensePlate
-    }, user2, db_default);
-    if ("code" in cpOrder) {
-      return cpOrder;
-    }
-    try {
-      await db_default.transaction(async (db2) => {
-        const serviceKind = await logic_default2.getInspection(user2, db2);
-        await logic_default5.create({
-          quantity: 1,
-          cpOrderId: cpOrder.id,
-          companyServiceKindId: serviceKind.id
-        }, user2);
-      });
-    } catch (err2) {
-      await logic_default12.hardRemove(cpOrder.id, user2);
-      if (err2 instanceof Error) {
-        return status("Bad Request", err2.message);
-      }
-      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.");
-    }
-    return {
-      cpOrderId: cpOrder.id
-    };
-  };
-})(CrmInspectionLogic ||= {});
-var logic_default15 = CrmInspectionLogic;
-
-// src/routes/crm/inspection/model.ts
-var CrmInspectionModel;
-((CrmInspectionModel) => {
-  const inspectionSchema = t.Object({
-    type: t.String(),
-    values: t.Object({
-      question: t.String(),
-      answer: t.String(),
-      description: t.Optional(t.String())
-    }),
-    employeeId: t.String({ format: "uuid" }),
-    description: t.Optional(t.String()),
-    isApproved: t.Optional(t.Boolean())
-  });
-  const createSchema = createInsertSchema(crmInspectionTable, {
-    inspection: t.Array(inspectionSchema, {
-      minItems: 1
-    })
-  });
-  CrmInspectionModel.create = t.Omit(OmitBaseSchema(createSchema), [
-    "expireAt",
-    "companyId",
-    "branchId",
-    "vehicleId"
-  ]);
-})(CrmInspectionModel ||= {});
-var model_default15 = CrmInspectionModel;
-
-// src/routes/crm/inspection/index.ts
-var inspectionRoutes = new Elysia({
-  prefix: "/inspection",
-  tags: ["CrmInspection"]
-}).use(better_auth_default).guard({ auth: true }).model(prefix_model_default("CrmInspectionModel", model_default15)).post("/", async ({ body, user: user2 }) => logic_default15.create(body, user2), {
-  body: "CrmInspectionModel.create"
-}).post("/:id/service-order", async ({ params: { id }, user: user2 }) => logic_default15.createCpOrder(id, user2), {
-  params: IdSchema
-});
-var inspection_default = inspectionRoutes;
-
 // src/routes/crm/index.ts
 var crmSchemaRoutes = new Elysia({
   prefix: "/crm"
@@ -147060,8 +147114,7 @@ var $generate = function(options) {
 var UserLogic;
 ((UserLogic) => {
   UserLogic.select = async (query, user2) => {
-    const isAdmin = user2.kind === "ADMIN";
-    const filter = and(eq(user.branchId, query.branchId ?? "").if(query.branchId && isAdmin), eq(user.branchId, user2.branchId).if(!isAdmin), eq(user.companyId, user2.companyId).if(!isAdmin));
+    const filter = and(eq(user.branchId, query.branchId ?? "").if(query.branchId && user2.kind !== "CUSTOMER"), eq(user.branchId, user2.branchId).if(user2.kind === "CUSTOMER"), eq(user.companyId, user2.companyId).if(user2.kind !== "ADMIN"));
     const columns = getTableColumns(user);
     const baseQuery = db_default.select({
       ...columns,
@@ -147088,13 +147141,11 @@ var UserLogic;
     let branchId = user2.branchId;
     let companyId = user2.companyId;
     const isAdmin = user2.kind === "ADMIN";
-    if (isAdmin) {
-      if (body.merchantId) {
-        companyId = body.merchantId;
-      }
-      if (body.branchId) {
-        branchId = body.branchId;
-      }
+    if (isAdmin && body.merchantId) {
+      companyId = body.merchantId;
+    }
+    if ((isAdmin || user2.kind === "COMPANY_ADMIN") && body.branchId) {
+      branchId = body.branchId;
     }
     try {
       const result = await auth2.api.signUpEmail({
@@ -147164,7 +147215,16 @@ var userRoutes = new Elysia({
 }).get("/", async ({ query, user: user2 }) => logic_default18.select(query, user2), {
   query: selectUserSchema,
   userKind: "COMPANY_ADMIN"
-}).get("/me", async ({ user: user2 }) => user2).post("/", async ({ body, user: user2 }) => logic_default18.registerUser(body, user2), {
+}).get("/me", async ({ user: user2 }) => {
+  const company2 = await service2.get({
+    id: user2.companyId,
+    pagination: { size: 1, page: 1 }
+  });
+  return {
+    ...user2,
+    company: company2.result[0]
+  };
+}).post("/", async ({ body, user: user2 }) => logic_default18.registerUser(body, user2), {
   body: createUserSchema,
   userKind: "COMPANY_ADMIN"
 }).put("/:id", async ({ body, user: user2, params: { id } }) => logic_default18.update(id, body, user2), {

package/package.json

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