autosync_backend2 1.2.32 → 1.2.34

package/dist/index.d.ts

@@ -8785,6 +8785,7 @@ export declare const app: Elysia<"", {
                     body: unknown;
                     params: {};
                     query: {
+                        id?: string | undefined;
                         state?: "CREATED" | "SCHEDULED" | "IN_PROGRESS" | "COMPLETED" | undefined;
                         templateId?: string | undefined;
                         machineId?: string | undefined;
@@ -8810,9 +8811,8 @@ export declare const app: Elysia<"", {
                                     mileageKm: number | null;
                                     state: "CREATED" | "SCHEDULED" | "IN_PROGRESS" | "COMPLETED";
                                     stateResult: "FAILED" | "NOT_INSPECTED" | "PASSED" | "RETURNED" | "WAIVED" | null;
-                                    timeScheduled: Date;
-                                    timeStarted: Date;
-                                    timeCompleted: Date;
+                                    timeScheduled: Date | null;
+                                    timeCompleted: Date | null;
                                     note: string | null;
                                     id: string;
                                     createdAt: string;
@@ -8845,22 +8845,20 @@ export declare const app: Elysia<"", {
                     body: {
                         oldId?: number | null | undefined;
                         state?: "CREATED" | "SCHEDULED" | "IN_PROGRESS" | "COMPLETED" | undefined;
+                        timeCompleted?: Date | null | undefined;
                         note?: string | null | undefined;
                         hours?: number | null | undefined;
                         mileageKm?: number | null | undefined;
                         stateResult?: "FAILED" | "NOT_INSPECTED" | "PASSED" | "RETURNED" | "WAIVED" | null | undefined;
-                        timeCompleted: Date;
+                        timeScheduled?: Date | null | undefined;
                         templateId: string;
                         machineId: string;
-                        employeeInspectedId: string;
-                        userInspectedId: string;
-                        timeScheduled: Date;
-                        timeStarted: Date;
                     };
                     params: {};
                     query: unknown;
                     headers: unknown;
                     response: {
+                        400: "Ажилтны мэдээлэл шаардлагатай.";
                         401: "Session not found";
                         422: {
                             type: "validation";

package/dist/index.js

@@ -143119,16 +143119,15 @@ var inspectionTable = inspectionSchema.table("inspection", {
   machineId: uuid5().notNull(),
   templateId: uuid5().notNull(),
   employeeInspectedId: uuid5().notNull(),
-  userInspectedId: uuid5().notNull(),
+  userInspectedId: text().notNull(),
   hours: numeric({ mode: "number" }),
   mileageKm: numeric({ mode: "number" }),
   state: inspectionStateEnum().notNull().default("CREATED"),
   stateResult: inspectionStateResultEnum(),
   timeScheduled: timestamp({
     withTimezone: true
-  }).notNull(),
-  timeStarted: timestamp({ withTimezone: true }).notNull(),
-  timeCompleted: timestamp({ withTimezone: true }).notNull(),
+  }),
+  timeCompleted: timestamp({ withTimezone: true }),
   note: text()
 });
 var inspectionFieldResult = inspectionSchema.table("field_result", {
@@ -154296,7 +154295,7 @@ var fieldGroup_default = fieldGroupRoutes;
 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 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 baseQuery = db_default.select({
       inspection: inspectionTable,
       totalCount: totalCountSql,
@@ -154307,8 +154306,15 @@ var InspectionLogic;
     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.create = async (body, user2) => {
+    if (!user2.employeeId) {
+      return status("Bad Request", "\u0410\u0436\u0438\u043B\u0442\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0448\u0430\u0430\u0440\u0434\u043B\u0430\u0433\u0430\u0442\u0430\u0439.");
+    }
+    await db_default.insert(inspectionTable).values({
+      ...body,
+      employeeInspectedId: user2.employeeId,
+      userInspectedId: user2.id
+    });
   };
   InspectionLogic.update = async (id, body) => {
     await db_default.update(inspectionTable).set(body).where(eq(inspectionTable.id, id));
@@ -154324,7 +154330,10 @@ var InspectionModel;
 ((InspectionModel) => {
   const createSchema = createInsertSchema2(inspectionTable);
   const updateSchema = createUpdateSchema(inspectionTable);
-  InspectionModel.create = OmitBaseSchema(createSchema);
+  InspectionModel.create = t.Omit(OmitBaseSchema(createSchema), [
+    "employeeInspectedId",
+    "userInspectedId"
+  ]);
   InspectionModel.update = OmitBaseSchema(updateSchema);
   InspectionModel.select = t.Composite([
     PaginationSchema,
@@ -154335,7 +154344,8 @@ var InspectionModel;
         default: undefined
       }),
       startDate: t.String({ format: "date" }),
-      endDate: t.String({ format: "date" })
+      endDate: t.String({ format: "date" }),
+      id: t.String({ format: "uuid" })
     }))
   ]);
 })(InspectionModel ||= {});
@@ -154491,7 +154501,7 @@ var inspectionRoutes2 = new Elysia({
   prefix: "/inspection"
 }).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), {
+}).post("/", async ({ body, user: user2 }) => logic_default27.create(body, user2).catch((err2) => console.error(err2)), {
   body: model_default27.create
 });
 var inspection_default2 = inspectionRoutes2;

package/package.json

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