autosync_backend2 1.2.42 → 1.2.44

package/dist/index.d.ts

@@ -1958,6 +1958,7 @@ export declare const app: Elysia<"", {
                             totalCount: number;
                             totalPage: number;
                             result: Omit<{
+                                type: "AutoService" | "MiningFleet" | "UrbanTransportFleet" | "Long-haul/Logistics" | "Emergency/Medical/Police" | "CorporateFleet";
                                 name: string;
                                 id: string;
                                 email: string;
@@ -2003,6 +2004,7 @@ export declare const app: Elysia<"", {
             company: {
                 post: {
                     body: {
+                        type?: "AutoService" | "MiningFleet" | "UrbanTransportFleet" | "Long-haul/Logistics" | "Emergency/Medical/Police" | "CorporateFleet" | undefined;
                         oldId?: number | null | undefined;
                         isActive?: boolean | undefined;
                         province?: string | null | undefined;
@@ -2029,6 +2031,7 @@ export declare const app: Elysia<"", {
                     headers: {};
                     response: {
                         200: {
+                            type: "AutoService" | "MiningFleet" | "UrbanTransportFleet" | "Long-haul/Logistics" | "Emergency/Medical/Police" | "CorporateFleet";
                             name: string;
                             id: string;
                             email: string;
@@ -2072,6 +2075,7 @@ export declare const app: Elysia<"", {
                 ":id": {
                     put: {
                         body: {
+                            type?: "AutoService" | "MiningFleet" | "UrbanTransportFleet" | "Long-haul/Logistics" | "Emergency/Medical/Police" | "CorporateFleet" | undefined;
                             name?: string | undefined;
                             email?: string | undefined;
                             oldId?: number | null | undefined;
@@ -2100,6 +2104,7 @@ export declare const app: Elysia<"", {
                         headers: {};
                         response: {
                             200: {
+                                type: "AutoService" | "MiningFleet" | "UrbanTransportFleet" | "Long-haul/Logistics" | "Emergency/Medical/Police" | "CorporateFleet";
                                 name: string;
                                 id: string;
                                 email: string;
@@ -4272,6 +4277,7 @@ export declare const app: Elysia<"", {
                                         isNexus: boolean;
                                         isActive: boolean;
                                         branchCount: number;
+                                        type: "AutoService" | "MiningFleet" | "UrbanTransportFleet" | "Long-haul/Logistics" | "Emergency/Medical/Police" | "CorporateFleet";
                                         id: string;
                                         createdAt: string;
                                         updatedAt: string;
@@ -9057,6 +9063,7 @@ export declare const app: Elysia<"", {
                         query: unknown;
                         headers: unknown;
                         response: {
+                            200: string;
                             422: {
                                 type: "validation";
                                 on: string;
@@ -9955,6 +9962,7 @@ export declare const app: Elysia<"", {
                     body: unknown;
                     params: {};
                     query: {
+                        id?: string | undefined;
                         pagination: {
                             size: number;
                             page: number;

package/dist/index.js

@@ -142480,6 +142480,9 @@ __export(exports_schema, {
   pmPlanMachineTable: () => pmPlanMachineTable,
   permissionTable: () => permissionTable,
   permissionGroupTable: () => permissionGroupTable,
+  maintenanceServiceSchema: () => maintenanceServiceSchema,
+  maintenanceServiceRecordTable: () => maintenanceServiceRecordTable,
+  maintenanceServiceRecordProductTable: () => maintenanceServiceRecordProductTable,
   logTable: () => logTable,
   inspectionTemplateTable: () => inspectionTemplateTable,
   inspectionTemplateMachineKindTable: () => inspectionTemplateMachineKindTable,
@@ -142524,6 +142527,7 @@ __export(exports_schema, {
   crmCpOrderItemTable: () => crmCpOrderItemTable,
   crmCpOrderItemEmployeeTable: () => crmCpOrderItemEmployeeTable,
   companyWorkScheduleTable: () => companyWorkScheduleTable,
+  companyTypeEnum: () => companyTypeEnum,
   companyServiceKindTable: () => companyServiceKindTable,
   companyServiceBookingTable: () => companyServiceBookingTable,
   companySchema: () => companySchema,
@@ -142669,6 +142673,14 @@ var uomConversionTable = pgTable("uom_conversion", {
 });
 // src/lib/db/schema/company.schema.ts
 var companySchema = pgSchema("company");
+var companyTypeEnum = companySchema.enum("company_type", [
+  "AutoService",
+  "MiningFleet",
+  "UrbanTransportFleet",
+  "Long-haul/Logistics",
+  "Emergency/Medical/Police",
+  "CorporateFleet"
+]);
 var companyCompanyTable = companySchema.table("company", {
   ...base_schema_helper_default,
   name: varchar().notNull(),
@@ -142689,7 +142701,8 @@ var companyCompanyTable = companySchema.table("company", {
   isNoat: boolean4().notNull().default(false),
   isNexus: boolean4().notNull().default(false),
   isActive: boolean4().notNull().default(true),
-  branchCount: integer2().notNull().default(1)
+  branchCount: integer2().notNull().default(1),
+  type: companyTypeEnum().notNull().default("AutoService")
 });
 var companyBranchTable = companySchema.table("branch", {
   ...base_schema_helper_default,
@@ -143203,6 +143216,25 @@ var pmPlanProductTable = pmSchema.table("plan_product", {
   quantity: numeric({ mode: "number" }),
   pmQuantity: uuid5().notNull()
 });
+var maintenanceServiceSchema = pgSchema("maintenance_service");
+var maintenanceServiceRecordTable = maintenanceServiceSchema.table("record", {
+  ...base_schema_helper_default,
+  machineId: uuid5().notNull(),
+  serviceKindId: uuid5().notNull(),
+  pmPlanId: uuid5(),
+  pmPlanMachineId: uuid5(),
+  employeeTechnicianId: uuid5().notNull(),
+  state: varchar().notNull(),
+  note: text(),
+  timeCompleted: timestamp({ withTimezone: true })
+});
+var maintenanceServiceRecordProductTable = maintenanceServiceSchema.table("record_product", {
+  ...base_schema_helper_default,
+  msRecordId: uuid5().notNull(),
+  companyProductId: uuid5().notNull(),
+  uomId: uuid5().notNull(),
+  quantity: numeric({ mode: "number" })
+});
 // src/lib/db/schema/techdoc.schema.ts
 var techdocSchema = pgSchema("techdoc");
 var techdocVehicleKindEnum = pgEnum("vehicle_kind_enum", [
@@ -147317,7 +147349,7 @@ var WarehouseProductLogic;
 ((WarehouseProductLogic) => {
   WarehouseProductLogic.getFilter = (query, user2) => {
     const ilikeSearch = `%${query.search}%`;
-    return and(softDeletedFilter(warehouseProductTable), eq(warehouseProductTable.companyId, user2.companyId), or(ilike(warehouseProductTable.name, ilikeSearch), ilike(warehouseProductTable.barCode, ilikeSearch), ilike(warehouseProductTable.oen, ilikeSearch), ilike(warehouseProductTable.partNumber, ilikeSearch), ilike(warehouseProductTable.alias, ilikeSearch))?.if(!!query.search), eq(warehouseProductTable.priceSell, query.priceSell ?? 0).if(query.priceSell), eq(warehouseProductTable.productId, query.productId ?? "").if(query.productId), eq(warehouseProductTable.supplierId, query.supplierId ?? "").if(query.supplierId), eq(warehouseProductTable.id, query.id ?? "").if(query.id), inArray(warehouseProductTable.id, query.ids ?? []).if(query.ids?.length), ...query.type ? [eq(warehouseProductTable.type, query.type)] : []);
+    return and(softDeletedFilter(warehouseProductTable), eq(warehouseProductTable.companyId, user2.companyId), or(ilike(warehouseProductTable.name, `%${ilikeSearch}%`), ilike(warehouseProductTable.barCode, `%${ilikeSearch}%`), ilike(warehouseProductTable.oen, `%${ilikeSearch}%`), ilike(warehouseProductTable.partNumber, `%${ilikeSearch}%`), ilike(warehouseProductTable.alias, `%${ilikeSearch}%`))?.if(!!query.search), eq(warehouseProductTable.priceSell, query.priceSell ?? 0).if(query.priceSell), eq(warehouseProductTable.productId, query.productId ?? "").if(query.productId), eq(warehouseProductTable.supplierId, query.supplierId ?? "").if(query.supplierId), eq(warehouseProductTable.id, query.id ?? "").if(query.id), inArray(warehouseProductTable.id, query.ids ?? []).if(query.ids?.length), ...query.type ? [eq(warehouseProductTable.type, query.type)] : []);
   };
   WarehouseProductLogic.select = async (query, user2) => {
     const baseQuery = db_default.select({
@@ -154764,10 +154796,13 @@ var InspectionTemplateLogic;
     return result;
   };
   InspectionTemplateLogic.create = async (body, user2) => {
-    await db_default.insert(inspectionTemplateTable).values({
+    const [res] = await db_default.insert(inspectionTemplateTable).values({
       ...body,
       companyId: user2.kind !== "ADMIN" ? user2.companyId : body.companyId
+    }).returning({
+      id: inspectionTemplateTable.id
     });
+    return res.id;
   };
   InspectionTemplateLogic.update = async (id, body, user2) => {
     const [res] = await db_default.update(inspectionTemplateTable).set(body).where(and(eq(inspectionTemplateTable.id, id), eq(inspectionTemplateTable.companyId, user2.companyId).if(user2.kind !== "ADMIN"))).returning({
@@ -154852,7 +154887,7 @@ var inspection_default2 = inspectionRoutes2;
 var MachineLogic;
 ((MachineLogic) => {
   MachineLogic.select = async (query, user2) => {
-    const filter = and(or(isNull2(companyMachineTable.companyId), eq(companyMachineTable.companyId, user2.companyId).if(user2.kind !== "ADMIN")), softDeletedFilter(companyMachineTable));
+    const filter = and(or(isNull2(companyMachineTable.companyId), eq(companyMachineTable.companyId, user2.companyId).if(user2.kind !== "ADMIN")), eq(companyMachineTable.id, query.id).if(query.id), softDeletedFilter(companyMachineTable));
     const columns = getTableColumns(companyMachineTable);
     const baseQuery = db_default.select({
       ...columns,
@@ -154887,7 +154922,12 @@ var MachineModel;
   const updateSchema = createUpdateSchema(companyMachineTable);
   MachineModel.create = OmitBaseSchema(createSchema);
   MachineModel.update = OmitBaseSchema(updateSchema);
-  MachineModel.select = t.Composite([PaginationSchema]);
+  MachineModel.select = t.Composite([
+    PaginationSchema,
+    t.Partial(t.Object({
+      id: t.String({ format: "uuid" })
+    }))
+  ]);
 })(MachineModel ||= {});
 var model_default34 = MachineModel;
 

package/package.json

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