autosync_backend2 1.2.24 → 1.2.25

package/dist/index.d.ts

@@ -1021,6 +1021,7 @@ export declare const app: Elysia<"", {
                                     shelfNumber: string | null;
                                     description: string | null;
                                     isOrdered: boolean;
+                                    order: number;
                                     id: string;
                                     createdAt: string;
                                     updatedAt: string;
@@ -1097,6 +1098,7 @@ export declare const app: Elysia<"", {
                         quantity?: number | undefined;
                         shelfNumber?: string | null | undefined;
                         isOrdered?: boolean | undefined;
+                        order?: number | undefined;
                         productId: string;
                         warehouseId: string;
                         safetyStock: number;
@@ -1118,6 +1120,7 @@ export declare const app: Elysia<"", {
                             safetyStock: number;
                             shelfNumber: string | null;
                             isOrdered: boolean;
+                            order: number;
                         };
                         422: {
                             type: "validation";
@@ -1141,6 +1144,7 @@ export declare const app: Elysia<"", {
                             quantity?: number | undefined;
                             shelfNumber?: string | null | undefined;
                             isOrdered?: boolean | undefined;
+                            order?: number | undefined;
                             productId: string;
                             warehouseId: string;
                             safetyStock: number;
@@ -1235,6 +1239,7 @@ export declare const app: Elysia<"", {
                                         shelfNumber: string | null;
                                         description: string | null;
                                         isOrdered: boolean;
+                                        order: number;
                                         id: string;
                                         createdAt: string;
                                         updatedAt: string;
@@ -1308,6 +1313,7 @@ export declare const app: Elysia<"", {
                                 shelfNumber: string | null;
                                 description: string | null;
                                 isOrdered: boolean;
+                                order: number;
                                 id: string;
                                 createdAt: string;
                                 updatedAt: string;
@@ -1342,6 +1348,7 @@ export declare const app: Elysia<"", {
                             safetyStock?: number | undefined;
                             shelfNumber?: string | null | undefined;
                             isOrdered?: boolean | undefined;
+                            order?: number | undefined;
                         };
                         params: {
                             id: string;
@@ -1357,6 +1364,7 @@ export declare const app: Elysia<"", {
                                 shelfNumber: string | null;
                                 description: string | null;
                                 isOrdered: boolean;
+                                order: number;
                                 id: string;
                                 createdAt: string;
                                 updatedAt: string;
@@ -7142,8 +7150,12 @@ export declare const app: Elysia<"", {
                             employeeId?: string | undefined;
                             phoneNumber?: string | undefined;
                             licensePlate?: string | undefined;
+                            partNumber?: string | undefined;
+                            productName?: string | undefined;
                             startDate?: string | undefined;
                             endDate?: string | undefined;
+                            orderType?: "Service" | "ProductSell" | undefined;
+                            serviceKindName?: string | undefined;
                             pagination: {
                                 size: number;
                                 page: number;
@@ -8131,6 +8143,103 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            inspection: {};
+        } & {
+            inspection: {
+                get: {
+                    body: unknown;
+                    params: {};
+                    query: {
+                        state?: "CREATED" | "SCHEDULED" | "IN_PROGRESS" | "COMPLETED" | undefined;
+                        templateId?: string | undefined;
+                        machineId?: string | undefined;
+                        startDate?: string | undefined;
+                        endDate?: string | undefined;
+                        pagination: {
+                            size: number;
+                            page: number;
+                        };
+                    };
+                    headers: unknown;
+                    response: {
+                        200: {
+                            totalCount: number;
+                            totalPage: number;
+                            result: Omit<{
+                                inspection: {
+                                    machineId: string;
+                                    templateId: string;
+                                    employeeInspectedId: string;
+                                    userInspectedId: string;
+                                    hours: number | null;
+                                    mileageKm: number | null;
+                                    state: "CREATED" | "SCHEDULED" | "IN_PROGRESS" | "COMPLETED";
+                                    stateResult: "FAILED" | "NOT_INSPECTED" | "PASSED" | "RETURNED" | "WAIVED" | null;
+                                    timeScheduled: Date;
+                                    timeStarted: Date;
+                                    timeCompleted: Date;
+                                    note: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                    oldId: number | null;
+                                };
+                                totalCount: number;
+                                template: {
+                                    name: string;
+                                } | null;
+                            }, "totalCount">[];
+                        };
+                        401: "Session not found";
+                        422: {
+                            type: "validation";
+                            on: string;
+                            summary?: string;
+                            message?: string;
+                            found?: unknown;
+                            property?: string;
+                            expected?: string;
+                        };
+                    };
+                };
+            };
+        } & {
+            inspection: {
+                post: {
+                    body: {
+                        oldId?: number | null | undefined;
+                        state?: "CREATED" | "SCHEDULED" | "IN_PROGRESS" | "COMPLETED" | undefined;
+                        note?: string | null | undefined;
+                        hours?: number | null | undefined;
+                        mileageKm?: number | null | undefined;
+                        stateResult?: "FAILED" | "NOT_INSPECTED" | "PASSED" | "RETURNED" | "WAIVED" | null | undefined;
+                        timeCompleted: Date;
+                        templateId: string;
+                        machineId: string;
+                        employeeInspectedId: string;
+                        userInspectedId: string;
+                        timeScheduled: Date;
+                        timeStarted: Date;
+                    };
+                    params: {};
+                    query: unknown;
+                    headers: unknown;
+                    response: {
+                        401: "Session not found";
+                        422: {
+                            type: "validation";
+                            on: string;
+                            summary?: string;
+                            message?: string;
+                            found?: unknown;
+                            property?: string;
+                            expected?: string;
+                        };
+                    };
+                };
+            };
         };
     };
 }, {

package/dist/index.js

@@ -143146,7 +143146,8 @@ var warehouseItemTable = warehouseSchema.table("item", {
   safetyStock: numeric({ mode: "number" }).notNull(),
   shelfNumber: varchar(),
   description: text(),
-  isOrdered: boolean4().notNull().default(false)
+  isOrdered: boolean4().notNull().default(false),
+  order: numeric({ mode: "number" }).notNull().default(1)
 }, (t2) => [unique().on(t2.warehouseId, t2.productId)]);
 var warehouseTransactionTypeEnum = warehouseSchema.enum("transaction_type", ["IN", "OUT"]);
 var warehouseTransactionKindEnum = warehouseSchema.enum("transaction_kind", ["TRANSFER", "RETURN", "ADJUSTMENT", "REJECTION", "ORDER", "SALES"]);
@@ -151063,13 +151064,13 @@ var CrmCpOrderLogic;
       paidAmount: sql3`
           COALESCE((select sum(${crmCpOrderPaymentTable.amount}) from ${crmCpOrderPaymentTable} where ${crmCpOrderPaymentTable.cpOrderId} = ${crmCpOrderTable.id} and ${crmCpOrderPaymentTable.state} = 'PAID' and ${crmCpOrderPaymentTable.deletedAt} is null), 0)
           `.mapWith(Number).as("paid_amount")
-    }).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)).having((t2) => query.isPaid === undefined ? undefined : query.isPaid ? sql3`${t2.totalAmount} - ${t2.paidAmount} = 0` : sql3`${t2.totalAmount} - ${t2.paidAmount} != 0`).groupBy((t2) => [
+    }).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).having((t2) => query.isPaid === undefined ? undefined : query.isPaid ? sql3`${t2.totalAmount} - ${t2.paidAmount} = 0` : sql3`${t2.totalAmount} - ${t2.paidAmount} != 0`).groupBy((t2) => [
       t2.order.id,
       t2.vehicle.id,
       t2.make.id,
       t2.model.id,
       t2.customer.id
-    ]).$dynamic();
+    ]).orderBy(desc(crmCpOrderTable.createdAt), desc(crmCpOrderItemTable.createdAt)).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
     const content = {
       totalCount: result[0]?.totalCount ?? 0,
@@ -152675,7 +152676,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))).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), ilike(warehouseProductTable.partNumber, `%${query.partNumber}%`).if(query.partNumber), ilike(companyServiceKindTable.name, `%${query.serviceKindName}%`).if(query.serviceKindName), ilike(warehouseProductTable.name, `%${query.productName}%`).if(query.productName))).groupBy((t2) => [
       t2.createdAt,
       t2.orderId,
       t2.phone,
@@ -152784,7 +152785,13 @@ var CrmReportsModel;
       startDate: t.String({ format: "date" }),
       endDate: t.String({ format: "date" }),
       phoneNumber: t.String(),
-      licensePlate: t.String()
+      licensePlate: t.String(),
+      orderType: t.UnionEnum(crmCpOrderTable.type.enumValues, {
+        default: undefined
+      }),
+      partNumber: t.String(),
+      productName: t.String(),
+      serviceKindName: t.String()
     })),
     PaginationSchema
   ]);
@@ -154123,6 +154130,55 @@ var fieldGroupRoutes = new Elysia({
 }).delete("/:id", async ({ params: { id } }) => logic_default26.remove(id)).get("/:id/field", async ({ params: { id } }) => logic_default25.select(id));
 var fieldGroup_default = fieldGroupRoutes;
 
+// src/routes/fleet/inspection/logic.ts
+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(inspectionTemplateTable.companyId, user2.companyId));
+    const baseQuery = db_default.select({
+      inspection: inspectionTable,
+      totalCount: totalCountSql,
+      template: {
+        name: inspectionTemplateTable.name
+      }
+    }).from(inspectionTable).leftJoin(inspectionTemplateTable, eq(inspectionTemplateTable.id, inspectionTable.templateId)).where(filter).$dynamic();
+    const result = await pagination_helper_default(baseQuery, query.pagination);
+    return getPaginationContent(result, query.pagination.size);
+  };
+  InspectionLogic.create = async (body) => {
+    await db_default.insert(inspectionTable).values(body);
+  };
+  InspectionLogic.update = async (id, body) => {
+    await db_default.update(inspectionTable).set(body).where(eq(inspectionTable.id, id));
+  };
+  InspectionLogic.remove = async (id) => {
+    await db_default.delete(inspectionTable).where(eq(inspectionTable.id, id));
+  };
+})(InspectionLogic ||= {});
+var logic_default27 = InspectionLogic;
+
+// src/routes/fleet/inspection/model.ts
+var InspectionModel;
+((InspectionModel) => {
+  const createSchema = createInsertSchema2(inspectionTable);
+  const updateSchema = createUpdateSchema(inspectionTable);
+  InspectionModel.create = OmitBaseSchema(createSchema);
+  InspectionModel.update = OmitBaseSchema(updateSchema);
+  InspectionModel.select = t.Composite([
+    PaginationSchema,
+    t.Partial(t.Object({
+      machineId: t.String({ format: "uuid" }),
+      templateId: t.String({ format: "uuid" }),
+      state: t.UnionEnum(inspectionTable.state.enumValues, {
+        default: undefined
+      }),
+      startDate: t.String({ format: "date" }),
+      endDate: t.String({ format: "date" })
+    }))
+  ]);
+})(InspectionModel ||= {});
+var model_default27 = InspectionModel;
+
 // src/routes/fleet/inspection/schedule/logic.ts
 var InspectionScheduleLogic;
 ((InspectionScheduleLogic) => {
@@ -154151,7 +154207,7 @@ var InspectionScheduleLogic;
     }).where(and(eq(inspectionScheduleTable.id, id), eq(inspectionScheduleTable.companyId, user2.companyId)));
   };
 })(InspectionScheduleLogic ||= {});
-var logic_default27 = InspectionScheduleLogic;
+var logic_default28 = InspectionScheduleLogic;
 
 // src/routes/fleet/inspection/schedule/model.ts
 var InspectionScheduleModel;
@@ -154162,18 +154218,18 @@ var InspectionScheduleModel;
   InspectionScheduleModel.update = OmitBaseSchema(updateSchema);
   InspectionScheduleModel.select = t.Composite([PaginationSchema]);
 })(InspectionScheduleModel ||= {});
-var model_default27 = InspectionScheduleModel;
+var model_default28 = InspectionScheduleModel;
 
 // src/routes/fleet/inspection/schedule/index.ts
 var scheduleRoutes = new Elysia({
   prefix: "/schedule"
-}).use(better_auth_default).guard({ auth: true }).get("/", async ({ query, user: user2 }) => logic_default27.select(query, user2), {
-  query: model_default27.select
-}).post("/", async ({ body, user: user2 }) => logic_default27.create(body, user2), {
-  body: model_default27.create
+}).use(better_auth_default).guard({ auth: true }).get("/", async ({ query, user: user2 }) => logic_default28.select(query, user2), {
+  query: model_default28.select
+}).post("/", async ({ body, user: user2 }) => logic_default28.create(body, user2), {
+  body: model_default28.create
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ body, params: { id }, user: user2 }) => logic_default27.update(id, body, user2), { body: model_default27.update }).delete("/:id", async ({ params: { id }, user: user2 }) => logic_default27.remove(id, user2));
+}).put("/:id", async ({ body, params: { id }, user: user2 }) => logic_default28.update(id, body, user2), { body: model_default28.update }).delete("/:id", async ({ params: { id }, user: user2 }) => logic_default28.remove(id, user2));
 var schedule_default = scheduleRoutes;
 
 // src/routes/fleet/inspection/template/logic.ts
@@ -154232,7 +154288,7 @@ var InspectionTemplateLogic;
     }).where(eq(inspectionTemplateFieldTable.id, id));
   };
 })(InspectionTemplateLogic ||= {});
-var logic_default28 = InspectionTemplateLogic;
+var logic_default29 = InspectionTemplateLogic;
 
 // src/routes/fleet/inspection/template/model.ts
 var InspectionTemplateModel;
@@ -154247,7 +154303,7 @@ var InspectionTemplateModel;
     "templateId"
   ]);
 })(InspectionTemplateModel ||= {});
-var model_default28 = InspectionTemplateModel;
+var model_default29 = InspectionTemplateModel;
 
 // src/routes/fleet/inspection/template/index.ts
 var templateRoutes = new Elysia({
@@ -154255,23 +154311,27 @@ var templateRoutes = new Elysia({
   tags: ["InspectionTemplate"]
 }).use(better_auth_default).guard({
   userKind: "COMPANY_ADMIN"
-}).get("/", async ({ query, user: user2 }) => logic_default28.select(query, user2), {
-  query: model_default28.select
-}).post("/", async ({ body, user: user2 }) => logic_default28.create(body, user2), {
-  body: model_default28.create
+}).get("/", async ({ query, user: user2 }) => logic_default29.select(query, user2), {
+  query: model_default29.select
+}).post("/", async ({ body, user: user2 }) => logic_default29.create(body, user2), {
+  body: model_default29.create
 }).guard({
   params: IdSchema
-}).get("/:id", async ({ params: { id }, user: user2 }) => logic_default28.selectById(id, user2)).put("/:id", async ({ body, params: { id }, user: user2 }) => logic_default28.update(id, body, user2), {
-  body: model_default28.update
-}).delete("/:id", async ({ params: { id }, user: user2 }) => logic_default28.remove(id, user2)).get("/:id/field", async ({ params: { id } }) => logic_default28.selectField(id)).post("/:id/field", async ({ body, params: { id } }) => logic_default28.addField(id, body), {
-  body: model_default28.createField
-}).delete("/field/:id", async ({ params: { id } }) => logic_default28.removeField(id));
+}).get("/:id", async ({ params: { id }, user: user2 }) => logic_default29.selectById(id, user2)).put("/:id", async ({ body, params: { id }, user: user2 }) => logic_default29.update(id, body, user2), {
+  body: model_default29.update
+}).delete("/:id", async ({ params: { id }, user: user2 }) => logic_default29.remove(id, user2)).get("/:id/field", async ({ params: { id } }) => logic_default29.selectField(id)).post("/:id/field", async ({ body, params: { id } }) => logic_default29.addField(id, body), {
+  body: model_default29.createField
+}).delete("/field/:id", async ({ params: { id } }) => logic_default29.removeField(id));
 var template_default = templateRoutes;
 
 // src/routes/fleet/inspection/index.ts
 var inspectionRoutes2 = new Elysia({
   prefix: "/inspection"
-}).use(fieldGroup_default).use(field_default).use(template_default).use(schedule_default);
+}).use(fieldGroup_default).use(field_default).use(template_default).use(schedule_default).use(better_auth_default).guard({ auth: true }).get("/", async ({ query, user: user2 }) => logic_default27.select(query, user2), {
+  query: model_default27.select
+}).post("/", async ({ body }) => logic_default27.create(body), {
+  body: model_default27.create
+});
 var inspection_default2 = inspectionRoutes2;
 
 // src/routes/fleet/index.ts

package/package.json

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