autosync_backend2 1.2.48 → 1.2.50

package/dist/index.js

@@ -142533,11 +142533,16 @@ __export(exports_schema, {
   companySchema: () => companySchema,
   companyPackageTable: () => companyPackageTable,
   companyMachineTable: () => companyMachineTable,
+  companyInvoiceTable: () => companyInvoiceTable,
+  companyInvoiceStatusEnum: () => companyInvoiceStatusEnum,
+  companyInvoicePaymentTable: () => companyInvoicePaymentTable,
   companyEmployeeTable: () => companyEmployeeTable,
   companyCompanyTable: () => companyCompanyTable,
   companyBranchWorkSchdedule: () => companyBranchWorkSchdedule,
   companyBranchWorkLogTable: () => companyBranchWorkLogTable,
   companyBranchTable: () => companyBranchTable,
+  companyBillingPlanTable: () => companyBillingPlanTable,
+  companyBillingPeriodEnum: () => companyBillingPeriodEnum,
   companyAccountTable: () => companyAccountTable,
   account: () => account
 });
@@ -142834,6 +142839,53 @@ var companyMachineTable = companySchema.table("machine", {
   km: integer2().notNull().default(0),
   customData: jsonb()
 });
+var companyBillingPeriodEnum = companySchema.enum("billing_period", [
+  "MONTHLY",
+  "ANNUAL",
+  "YEARLY"
+]);
+var companyInvoiceStatusEnum = companySchema.enum("invoice_status", [
+  "PENDING",
+  "PAID",
+  "OVERDUE",
+  "CANCELLED"
+]);
+var companyBillingPlanTable = companySchema.table("billing_plan", {
+  ...base_schema_helper_default,
+  companyId: uuid5().notNull(),
+  billingPeriod: companyBillingPeriodEnum().notNull().default("MONTHLY"),
+  basePrice: numeric({ mode: "number" }).notNull(),
+  pricePerCar: numeric({ mode: "number" }).notNull(),
+  carLimit: integer2().notNull(),
+  maxCarCount: integer2(),
+  active: boolean4().notNull().default(true),
+  note: text()
+});
+var companyInvoiceTable = companySchema.table("invoice", {
+  ...base_schema_helper_default,
+  companyId: uuid5().notNull(),
+  billingPlanId: uuid5().notNull(),
+  periodStart: date7().notNull(),
+  periodEnd: date7().notNull(),
+  carCount: integer2().notNull(),
+  basePrice: numeric({ mode: "number" }).notNull(),
+  carPrice: numeric({ mode: "number" }).notNull(),
+  totalPrice: numeric({ mode: "number" }).notNull(),
+  status: companyInvoiceStatusEnum().notNull().default("PENDING"),
+  issuedAt: timestamp({ withTimezone: true, mode: "string" }).notNull(),
+  paidAt: timestamp({ withTimezone: true, mode: "string" }),
+  dueAt: timestamp({ withTimezone: true, mode: "string" }).notNull(),
+  note: text()
+});
+var companyInvoicePaymentTable = companySchema.table("invoice_payment", {
+  ...base_schema_helper_default,
+  invoiceId: uuid5().notNull(),
+  amount: numeric({ mode: "number" }).notNull(),
+  paidAt: timestamp({ withTimezone: true, mode: "string" }).notNull(),
+  paymentType: varchar().notNull(),
+  reference: varchar(),
+  note: text()
+});
 // src/lib/db/schema/crm.schema.ts
 var crmSchema = pgSchema("crm");
 var crmCustomerTable = crmSchema.table("customer", {
@@ -146594,7 +146646,7 @@ var StringEnum = (values) => {
 async function getSession2(headers) {
   const session2 = await auth2.api.getSession({ headers });
   if (session2 === null) {
-    return status("Unauthorized", "Session not found");
+    return status("Unauthorized", "\u0422\u043E\u043A\u0435\u043D \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439");
   }
   return {
     user: session2.user,
@@ -147585,7 +147637,7 @@ var WarehouseItemLogic;
   };
   WarehouseItemLogic.selectTransaction = async (query, user2) => {
     const columns = getTableColumns(warehouseItemTransactionTable);
-    const filter = and(softDeletedFilter(warehouseItemTransactionTable), ...query.product ? [logic_default5.getFilter(query.product, user2)] : [], eq(warehouseItemTransactionTable.transactionType, query.transactionType ?? "IN").if(query.transactionType), eq(warehouseItemTransactionTable.transactionKind, query.transactionKind ?? "TRANSFER").if(query.transactionKind), eq(warehouseItemTransactionTable.employeeId, query.employeeId ?? "").if(query.employeeId), eq(warehouseItemTransactionTable.userId, query.userId ?? "").if(query.userId), eq(warehouseItemTransactionTable.salesId, query.salesId ?? "").if(query.salesId), eq(warehouseItemTransactionTable.orderId, query.orderId ?? "").if(query.orderId), eq(warehouseItemTransactionTable.transferId, query.transferId ?? "").if(query.transferId), eq(warehouseItemTransactionTable.itemId, query.itemId ?? "").if(query.itemId), gte(warehouseItemTransactionTable.createdAt, query.dateFrom ?? "").if(query.dateFrom), lte(warehouseItemTransactionTable.createdAt, query.dateTo ?? "").if(query.dateTo), gte(warehouseItemTransactionTable.quantity, query.minQuantity ?? 0).if(query.minQuantity), lte(warehouseItemTransactionTable.quantity, query.maxQuantity ?? 0).if(query.maxQuantity));
+    const filter = and(softDeletedFilter(warehouseItemTransactionTable), ...query.product ? [logic_default5.getFilter(query.product, user2)] : [], eq(warehouseItemTransactionTable.transactionType, query.transactionType ?? "IN").if(query.transactionType), eq(warehouseItemTransactionTable.transactionKind, query.transactionKind ?? "TRANSFER").if(query.transactionKind), eq(warehouseItemTransactionTable.employeeId, query.employeeId ?? "").if(query.employeeId), eq(warehouseItemTransactionTable.userId, query.userId ?? "").if(query.userId), eq(warehouseItemTransactionTable.salesId, query.salesId ?? "").if(query.salesId), eq(warehouseItemTransactionTable.orderId, query.orderId ?? "").if(query.orderId), eq(warehouseItemTransactionTable.transferId, query.transferId ?? "").if(query.transferId), eq(warehouseItemTransactionTable.itemId, query.itemId ?? "").if(query.itemId), gte(warehouseItemTransactionTable.createdAt, query.dateFrom ?? "").if(query.dateFrom), lte(warehouseItemTransactionTable.createdAt, query.dateTo ?? "").if(query.dateTo), gte(warehouseItemTransactionTable.quantity, query.minQuantity ?? 0).if(query.minQuantity), lte(warehouseItemTransactionTable.quantity, query.maxQuantity ?? 0).if(query.maxQuantity), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId));
     const baseQuery = db_default.select({
       ...columns,
       totalCount: totalCountSql,
@@ -150739,101 +150791,6 @@ var StorePay = class {
     });
   }
 };
-var UbPay = class {
-  constructor(clientId, clientSecret, saveToken, baseUrl) {
-    this.baseUrl = "https://merchant-payment-api.dev.p.ubcabtech.com";
-    this.clientId = clientId;
-    this.clientSecret = clientSecret;
-    this.baseUrl = baseUrl || this.baseUrl;
-    this.saveToken = saveToken;
-  }
-  login() {
-    return __async(this, null, function* () {
-      const req = yield fetch(`${this.baseUrl}/auth/token`, {
-        method: "POST",
-        body: JSON.stringify({
-          clientId: this.clientId,
-          clientSecret: this.clientSecret
-        })
-      });
-      const res = yield req.json();
-      if (!res.success) {
-        throw new Error(res.error.message);
-      }
-      return {
-        access_token: res.data.accessToken,
-        refresh_token: res.data.refreshToken,
-        refresh_expires_in: res.data.refreshTokenExpiresIn,
-        expires_in: res.data.accessTokenExpiresIn
-      };
-    });
-  }
-  getRefreshToken(token) {
-    return __async(this, null, function* () {
-      const req = yield fetch(`${this.baseUrl}/auth/refresh-token`, {
-        method: "POST",
-        body: JSON.stringify({
-          refreshToken: token.refresh_token
-        })
-      });
-      const res = yield req.json();
-      return __spreadProps2(__spreadValues2({}, token), {
-        access_token: res.data.accessToken,
-        expires_in: parseInt(res.data.accessTokenExpriresIn, 10)
-      });
-    });
-  }
-  checkToken(inputToken) {
-    return __async(this, null, function* () {
-      let token = inputToken;
-      if (!token || !token.refresh_expires_in) {
-        token = yield this.login();
-      }
-      if (token.refresh_expires_in && new Date(token.refresh_expires_in * 1000) <= /* @__PURE__ */ new Date) {
-        token = yield this.login();
-      } else if (new Date(token.expires_in * 1000) <= /* @__PURE__ */ new Date) {
-        token = yield this.getRefreshToken(token);
-      }
-      if (this.saveToken && JSON.stringify(inputToken) !== JSON.stringify(token)) {
-        yield this.saveToken(token);
-      }
-      return token;
-    });
-  }
-  createInvoice(input, token) {
-    return __async(this, null, function* () {
-      token = yield this.checkToken(token);
-      const req = yield fetch(`${this.baseUrl}/api/v1/invoices`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${token.access_token}`
-        },
-        body: JSON.stringify(input)
-      });
-      const res = yield req.json();
-      return {
-        data: res,
-        token
-      };
-    });
-  }
-  checkInvoice(invoiceId, token) {
-    return __async(this, null, function* () {
-      token = yield this.checkToken(token);
-      const req = yield fetch(`${this.baseUrl}/api/v1/invoices/${invoiceId}`, {
-        headers: {
-          Authorization: `Bearer ${token.access_token}`
-        }
-      });
-      const res = yield req.json();
-      return {
-        data: res,
-        token
-      };
-    });
-  }
-};
 
 // 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";
@@ -150973,6 +150930,99 @@ class StorePayGateway extends PaymentGateway {
   }
 }
 
+// src/routes/crm/cpOrder/payment/helpers/ubpay.ts
+class UbPay {
+  clientId;
+  clientSecret;
+  saveToken;
+  baseUrl = "https://merchant-payment-api.dev.p.ubcabtech.com";
+  constructor(clientId, clientSecret, saveToken, baseUrl) {
+    this.clientId = clientId;
+    this.clientSecret = clientSecret;
+    this.baseUrl = baseUrl || this.baseUrl;
+    this.saveToken = saveToken;
+  }
+  async login() {
+    console.log(this.clientId, this.clientSecret);
+    const req = await fetch(`${this.baseUrl}/auth/token`, {
+      method: "POST",
+      body: JSON.stringify({
+        clientId: this.clientId,
+        clientSecret: this.clientSecret
+      })
+    });
+    const res = await req.json();
+    console.log(res);
+    if (!res.success) {
+      throw new Error(res.error.message);
+    }
+    return {
+      access_token: res.data.accessToken,
+      refresh_token: res.data.refreshToken,
+      refresh_expires_in: res.data.refreshTokenExpiresIn,
+      expires_in: res.data.accessTokenExpiresIn
+    };
+  }
+  async getRefreshToken(token) {
+    const req = await fetch(`${this.baseUrl}/auth/refresh-token`, {
+      method: "POST",
+      body: JSON.stringify({
+        refreshToken: token.refresh_token
+      })
+    });
+    const res = await req.json();
+    return {
+      ...token,
+      access_token: res.data.accessToken,
+      expires_in: Number.parseInt(res.data.accessTokenExpriresIn, 10)
+    };
+  }
+  async checkToken(inputToken) {
+    let token = inputToken;
+    if (!token || !token.refresh_expires_in) {
+      token = await this.login();
+    }
+    if (token.refresh_expires_in && new Date(token.refresh_expires_in * 1000) <= new Date) {
+      token = await this.login();
+    } else if (new Date(token.expires_in * 1000) <= new Date) {
+      token = await this.getRefreshToken(token);
+    }
+    if (this.saveToken && JSON.stringify(inputToken) !== JSON.stringify(token)) {
+      await this.saveToken(token);
+    }
+    return token;
+  }
+  async createInvoice(input, token) {
+    token = await this.checkToken(token);
+    const req = await fetch(`${this.baseUrl}/api/v1/invoices`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token.access_token}`
+      },
+      body: JSON.stringify(input)
+    });
+    const res = await req.json();
+    return {
+      data: res,
+      token
+    };
+  }
+  async checkInvoice(invoiceId, token) {
+    token = await this.checkToken(token);
+    const req = await fetch(`${this.baseUrl}/api/v1/invoices/${invoiceId}`, {
+      headers: {
+        Authorization: `Bearer ${token.access_token}`
+      }
+    });
+    const res = await req.json();
+    return {
+      data: res,
+      token
+    };
+  }
+}
+
 // src/routes/crm/cpOrder/payment/gateways/ubpay.ts
 class UbPayGateway extends PaymentGateway {
   ubPay;
@@ -151156,6 +151206,7 @@ var CrmCpOrderPaymentLogic;
   };
   CrmCpOrderPaymentLogic.createUbPay = async (body, user2) => {
     const paymentInfo = await getPaymentInfo("UbPay", user2);
+    console.log(paymentInfo);
     if ("code" in paymentInfo) {
       return paymentInfo;
     }
@@ -151176,6 +151227,7 @@ var CrmCpOrderPaymentLogic;
       });
       return result;
     } catch (err2) {
+      console.log(err2);
       if (err2 instanceof Error) {
         return status("Bad Request", err2.message);
       }
@@ -151216,7 +151268,9 @@ var CrmCpOrderPaymentLogic;
     if (!payment) {
       return status("Not Found", "\u0422\u04E9\u043B\u0431\u04E9\u0440\u0438\u0439\u043D \u0442\u043E\u0445\u0438\u0440\u0433\u043E\u043E \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }
-    await redis_client_default.set(cacheKey, payment);
+    await redis_client_default.set(cacheKey, payment, {
+      ex: 60 * 60 * 24
+    });
     return payment;
   };
   const getPaymentInfoByPaymentId = async (id, type) => {
@@ -151238,7 +151292,7 @@ var CrmCpOrderLogic;
   CrmCpOrderLogic.select = async (query, user2) => {
     const make = alias(techdocVehicleKindTable, "make");
     const model = alias(techdocVehicleKindTable, "model");
-    const filter = and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), eq(crmCpOrderTable.state, query.state ?? "CREATED").if(query.state), eq(crmCpOrderTable.id, query.id ?? "").if(query.id), gte(sql3`date(${crmCpOrderTable.createdAt})`, query.createdAt).if(query.createdAt), lte(sql3`date(${crmCpOrderTable.createdAt})`, query.timeCompleted).if(query.timeCompleted), softDeletedFilter(crmCpOrderTable), like(crmCpOrderTable.orderId, query.orderId ?? "").if(query.orderId), eq(crmCpOrderTable.vehicleId, query.vehicleId ?? "").if(query.vehicleId), eq(crmCpOrderTable.type, query.type).if(query.type), eq(crmCpOrderTable.oldId, query.oldId).if(query.oldId), ilike(model.name, `%${query.model}%`).if(query.model), like(crmVehicleTable.licensePlate, `${query.licensePlate}%`).if(query.licensePlate), ilike(crmVehicleTable.vin, `%${query.vin}%`).if(query.vin), like(crmCustomerTable.phoneNumber, `${query.phone}%`).if(query.phone));
+    const filter = and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), eq(crmCpOrderTable.state, query.state ?? "CREATED").if(query.state), eq(crmCpOrderTable.id, query.id ?? "").if(query.id), gte(sql3`date(${crmCpOrderTable.createdAt})`, query.createdAt).if(query.createdAt), lte(sql3`date(${crmCpOrderTable.createdAt})`, query.timeCompleted).if(query.timeCompleted), softDeletedFilter(crmCpOrderTable), like(crmCpOrderTable.orderId, query.orderId ?? "").if(query.orderId), eq(crmCpOrderTable.vehicleId, query.vehicleId ?? "").if(query.vehicleId), eq(crmCpOrderTable.type, query.type).if(query.type), eq(crmCpOrderTable.oldId, query.oldId).if(query.oldId), eq(crmCpOrderTable.companyBranchId, query.branchId).if(query.branchId && user2.kind !== "CUSTOMER"), ilike(model.name, `%${query.model}%`).if(query.model), like(crmVehicleTable.licensePlate, `${query.licensePlate}%`).if(query.licensePlate), ilike(crmVehicleTable.vin, `%${query.vin}%`).if(query.vin), like(crmCustomerTable.phoneNumber, `${query.phone}%`).if(query.phone));
     const baseQuery = db_default.select({
       totalCount: totalCountSql,
       order: crmCpOrderTable,
@@ -151936,7 +151990,8 @@ var CrmCpOrderModel;
         default: "Service"
       }),
       oldId: t.Number(),
-      isPaid: t.Boolean()
+      isPaid: t.Boolean(),
+      branchId: t.String({ format: "uuid" })
     }))
   ]);
   CrmCpOrderModel.complete = t.Object({
@@ -152894,7 +152949,7 @@ var CrmReportsLogic;
       totalPrice: sql3`CASE WHEN ${crmCpOrderTable.isNoat} = FALSE THEN ${crmCpOrderItemTable.priceTotal} ELSE 0 END`.as("total_price"),
       totalPriceNoat: sql3`CASE WHEN ${crmCpOrderTable.isNoat} = TRUE THEN ${crmCpOrderItemTable.priceTotal} * 1.1 ELSE 0 END`.as("total_price_noat"),
       totalCount: totalCountSql
-    }).from(crmCpOrderItemTable).leftJoin(crmCpOrderTable, eq(crmCpOrderTable.id, crmCpOrderItemTable.cpOrderId)).leftJoin(crmCustomerTable, eq(crmCustomerTable.id, crmCpOrderTable.customerId)).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmDiscountApplyTable, eq(crmDiscountApplyTable.cpOrderItemId, crmCpOrderItemTable.id)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), isNotNull(crmCpOrderItemTable.companyProductId).if(query.type === "Product"), isNotNull(crmCpOrderItemTable.companyServiceKindId).if(query.type === "Service"), eq(crmCpOrderItemEmployeeTable.employeeId, query.employeeId).if(query.employeeId), gte(crmCpOrderTable.createdAt, query.startDate).if(query.startDate), lte(crmCpOrderTable.createdAt, query.endDate).if(query.endDate), eq(crmCustomerTable.phoneNumber, query.phoneNumber).if(query.phoneNumber), eq(crmVehicleTable.licensePlate, query.licensePlate).if(query.licensePlate), eq(crmCpOrderTable.type, query.orderType).if(query.orderType), ilike(warehouseProductTable.partNumber, `%${query.partNumber}%`).if(query.partNumber), ilike(companyServiceKindTable.name, `%${query.serviceKindName}%`).if(query.serviceKindName), ilike(warehouseProductTable.name, `%${query.productName}%`).if(query.productName))).orderBy(desc(crmCpOrderTable.createdAt), desc(crmCpOrderItemTable.createdAt)).groupBy((t2) => [
+    }).from(crmCpOrderItemTable).leftJoin(crmCpOrderTable, eq(crmCpOrderTable.id, crmCpOrderItemTable.cpOrderId)).leftJoin(crmCustomerTable, eq(crmCustomerTable.id, crmCpOrderTable.customerId)).leftJoin(crmVehicleTable, eq(crmVehicleTable.id, crmCpOrderTable.vehicleId)).leftJoin(warehouseProductTable, eq(warehouseProductTable.id, crmCpOrderItemTable.companyProductId)).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, crmCpOrderItemTable.companyServiceKindId)).leftJoin(crmCpOrderItemEmployeeTable, eq(crmCpOrderItemEmployeeTable.cpOrderItemId, crmCpOrderItemTable.id)).leftJoin(companyEmployeeTable, eq(companyEmployeeTable.id, crmCpOrderItemEmployeeTable.employeeId)).leftJoin(crmDiscountApplyTable, eq(crmDiscountApplyTable.cpOrderItemId, crmCpOrderItemTable.id)).where(and(eq(crmCpOrderTable.companyId, user2.companyId), eq(crmCpOrderTable.companyBranchId, user2.branchId).if(user2.kind === "CUSTOMER"), isNotNull(crmCpOrderItemTable.companyProductId).if(query.type === "Product"), isNotNull(crmCpOrderItemTable.companyServiceKindId).if(query.type === "Service"), eq(crmCpOrderItemEmployeeTable.employeeId, query.employeeId).if(query.employeeId), gte(crmCpOrderTable.createdAt, query.startDate).if(query.startDate), lte(crmCpOrderTable.createdAt, query.endDate).if(query.endDate), eq(crmCustomerTable.phoneNumber, query.phoneNumber).if(query.phoneNumber), eq(crmVehicleTable.licensePlate, query.licensePlate).if(query.licensePlate), eq(crmCpOrderTable.type, query.orderType).if(query.orderType), eq(crmCpOrderTable.companyBranchId, query.branchId).if(query.branchId && user2.kind !== "CUSTOMER"), ilike(warehouseProductTable.partNumber, `%${query.partNumber}%`).if(query.partNumber), ilike(companyServiceKindTable.name, `%${query.serviceKindName}%`).if(query.serviceKindName), ilike(warehouseProductTable.name, `%${query.productName}%`).if(query.productName))).orderBy(desc(crmCpOrderTable.createdAt), desc(crmCpOrderItemTable.createdAt)).groupBy((t2) => [
       t2.createdAt,
       t2.orderId,
       t2.phone,
@@ -153010,7 +153065,8 @@ var CrmReportsModel;
       }),
       partNumber: t.String(),
       productName: t.String(),
-      serviceKindName: t.String()
+      serviceKindName: t.String(),
+      branchId: t.String({ format: "uuid" })
     })),
     PaginationSchema
   ]);
@@ -154291,7 +154347,8 @@ var WarehouseItemModel;
       dateFrom: t.String({ format: "date-time", default: undefined }),
       dateTo: t.String({ format: "date-time", default: undefined }),
       minQuantity: t.Number({ minimum: 0 }),
-      maxQuantity: t.Number({ minimum: 0 })
+      maxQuantity: t.Number({ minimum: 0 }),
+      warehouseId: t.String({ format: "uuid" })
     }))
   ]);
   const createTransactionSchema = createInsertSchema2(warehouseItemTransactionTable);
@@ -154657,7 +154714,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), 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), or(eq(inspectionTemplateTable.companyId, user2.companyId), isNull2(inspectionTemplateTable.companyId)));
     const baseQuery = db_default.select({
       inspection: inspectionTable,
       machine: companyMachineTable,
@@ -154713,6 +154770,9 @@ var InspectionModel;
       state: t.UnionEnum(inspectionTable.state.enumValues, {
         default: undefined
       }),
+      stateResult: t.UnionEnum(inspectionTable.stateResult.enumValues, {
+        default: undefined
+      }),
       startDate: t.String({ format: "date" }),
       endDate: t.String({ format: "date" }),
       id: t.String({ format: "uuid" })
@@ -154778,7 +154838,7 @@ var schedule_default = scheduleRoutes;
 var InspectionTemplateLogic;
 ((InspectionTemplateLogic) => {
   InspectionTemplateLogic.select = async (query, user2) => {
-    const filter = or(eq(inspectionTemplateTable.companyId, user2.companyId).if(user2.kind !== "ADMIN"), isNull2(inspectionTemplateTable.companyId));
+    const filter = and(softDeletedFilter(inspectionTemplateTable), or(eq(inspectionTemplateTable.companyId, user2.companyId).if(user2.kind !== "ADMIN"), isNull2(inspectionTemplateTable.companyId)));
     const columns = getTableColumns(inspectionTemplateTable);
     const baseQuery = db_default.select({
       ...columns,

package/package.json

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