autosync_backend2 1.2.67 → 1.2.69

package/dist/index.d.ts

@@ -11262,18 +11262,34 @@ export declare const app: Elysia<"", {
                                 totalCount: number;
                                 totalPage: number;
                                 result: Omit<{
+                                    task: {
+                                        workOrderId: string;
+                                        templateId: string | null;
+                                        serviceKindId: string;
+                                        description: string | null;
+                                        manHour: number | null;
+                                        state: "IN_PROGRESS" | "COMPLETED" | "OPEN" | "CLOSED";
+                                        id: string;
+                                        createdAt: string;
+                                        updatedAt: string;
+                                        deletedAt: string | null;
+                                        oldId: number | null;
+                                    };
+                                    serviceKind: {
+                                        serviceKindId: string | null;
+                                        companyId: string;
+                                        branchId: string | null;
+                                        name: string;
+                                        description: string | null;
+                                        enabled: boolean;
+                                        price: number;
+                                        id: string;
+                                        createdAt: string;
+                                        updatedAt: string;
+                                        deletedAt: string | null;
+                                        oldId: number | null;
+                                    } | null;
                                     totalCount: number;
-                                    workOrderId: string;
-                                    templateId: string;
-                                    serviceKindId: string;
-                                    description: string | null;
-                                    manHour: number | null;
-                                    state: "IN_PROGRESS" | "COMPLETED" | "OPEN" | "CLOSED";
-                                    id: string;
-                                    createdAt: string;
-                                    updatedAt: string;
-                                    deletedAt: string | null;
-                                    oldId: number | null;
                                 }, "totalCount">[];
                             };
                             401: "Токен олдсонгүй";
@@ -11293,11 +11309,12 @@ export declare const app: Elysia<"", {
                 task: {
                     post: {
                         body: {
-                            description?: string | undefined;
+                            oldId?: number | null | undefined;
+                            description?: string | null | undefined;
                             state?: "IN_PROGRESS" | "COMPLETED" | "OPEN" | "CLOSED" | undefined;
-                            manHour?: number | undefined;
+                            templateId?: string | null | undefined;
+                            manHour?: number | null | undefined;
                             serviceKindId: string;
-                            templateId: string;
                             workOrderId: string;
                         };
                         params: {};
@@ -11313,7 +11330,7 @@ export declare const app: Elysia<"", {
                                 description: string | null;
                                 serviceKindId: string;
                                 state: "IN_PROGRESS" | "COMPLETED" | "OPEN" | "CLOSED";
-                                templateId: string;
+                                templateId: string | null;
                                 workOrderId: string;
                                 manHour: number | null;
                             };
@@ -11339,7 +11356,7 @@ export declare const app: Elysia<"", {
                                 description?: string | null | undefined;
                                 serviceKindId?: string | undefined;
                                 state?: "IN_PROGRESS" | "COMPLETED" | "OPEN" | "CLOSED" | undefined;
-                                templateId?: string | undefined;
+                                templateId?: string | null | undefined;
                                 workOrderId?: string | undefined;
                                 manHour?: number | null | undefined;
                             };

package/dist/index.js

@@ -143504,7 +143504,7 @@ var workOrderTable = workOrderSchema.table("order", {
 var workOrderTaskTable = workOrderSchema.table("task", {
   ...base_schema_helper_default,
   workOrderId: uuid5().notNull(),
-  templateId: uuid5().notNull(),
+  templateId: uuid5(),
   serviceKindId: uuid5().notNull(),
   description: text(),
   manHour: numeric({ mode: "number" }),
@@ -148221,7 +148221,7 @@ var WarehouseItemLogic;
   };
   WarehouseItemLogic.selectTransaction = async (query, user2) => {
     const columns = getTableColumns(warehouseItemTransactionTable);
-    const filter = and(softDeletedFilter(warehouseItemTransactionTable), ...query.product ? [logic_default8.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 filter = and(softDeletedFilter(warehouseItemTransactionTable), eq(user.companyId, user2.companyId), ...query.product ? [logic_default8.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,
@@ -155021,11 +155021,11 @@ var WorkOrderTaskLogic;
 ((WorkOrderTaskLogic) => {
   WorkOrderTaskLogic.select = async (query) => {
     const filter = and(softDeletedFilter(workOrderTaskTable), eq(workOrderTaskTable.workOrderId, query.workOrderId).if(query.workOrderId));
-    const columns = getTableColumns(workOrderTaskTable);
     const baseQuery = db_default.select({
-      ...columns,
+      task: workOrderTaskTable,
+      serviceKind: companyServiceKindTable,
       totalCount: totalCountSql
-    }).from(workOrderTaskTable).where(filter).$dynamic();
+    }).from(workOrderTaskTable).leftJoin(companyServiceKindTable, eq(companyServiceKindTable.id, workOrderTaskTable.serviceKindId)).where(filter).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
     return getPaginationContent(result, query.pagination.size);
   };
@@ -155052,15 +155052,9 @@ var logic_default39 = WorkOrderTaskLogic;
 // src/routes/fleet/work-order/task/model.ts
 var WorkOrderTaskModel;
 ((WorkOrderTaskModel) => {
+  const createSchema = createInsertSchema2(workOrderTaskTable);
   const updateSchema = createUpdateSchema(workOrderTaskTable);
-  WorkOrderTaskModel.create = t.Object({
-    workOrderId: t.String({ format: "uuid" }),
-    templateId: t.String({ format: "uuid" }),
-    serviceKindId: t.String({ format: "uuid" }),
-    description: t.Optional(t.String()),
-    manHour: t.Optional(t.Number()),
-    state: t.Optional(StringEnum(["OPEN", "IN_PROGRESS", "COMPLETED", "CLOSED"]))
-  });
+  WorkOrderTaskModel.create = OmitBaseSchema(createSchema);
   WorkOrderTaskModel.update = OmitBaseSchema(updateSchema);
   WorkOrderTaskModel.select = t.Composite([
     PaginationSchema,

package/package.json

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