autosync_backend2 1.2.37 → 1.2.39

package/dist/index.d.ts

@@ -2246,6 +2246,49 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            branch: {
+                me: {
+                    get: {
+                        body: unknown;
+                        params: {};
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                totalCount: number;
+                                totalPage: number;
+                                result: Omit<{
+                                    name: string;
+                                    id: string;
+                                    email: string | null;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                    oldId: number | null;
+                                    isActive: boolean;
+                                    regNumber: string | null;
+                                    phone: string;
+                                    logoUrl: string;
+                                    province: string | null;
+                                    district: string | null;
+                                    khoroo: string | null;
+                                    street: string | null;
+                                    socialUrls: string[] | null;
+                                    ceoName: string | null;
+                                    googleMapUrl: string | null;
+                                    isNoat: boolean;
+                                    packageId: string;
+                                    merchantId: string;
+                                } & {
+                                    totalCount: number;
+                                }, "totalCount">[];
+                            };
+                            401: "Session not found";
+                        };
+                    };
+                };
+            };
         } & {
             branch: {
                 post: {
@@ -8916,6 +8959,63 @@ export declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            inspection: {
+                ":id": {
+                    put: {
+                        body: {
+                            oldId?: number | null | undefined;
+                            state?: "CREATED" | "SCHEDULED" | "IN_PROGRESS" | "COMPLETED" | undefined;
+                            timeCompleted?: Date | null | undefined;
+                            note?: string | null | undefined;
+                            templateId?: string | undefined;
+                            machineId?: string | undefined;
+                            employeeInspectedId?: string | undefined;
+                            userInspectedId?: string | undefined;
+                            hours?: number | null | undefined;
+                            mileageKm?: number | null | undefined;
+                            stateResult?: "FAILED" | "NOT_INSPECTED" | "PASSED" | "RETURNED" | "WAIVED" | null | undefined;
+                            timeScheduled?: Date | null | undefined;
+                        };
+                        params: {
+                            id: string;
+                        };
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                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 | null;
+                                timeCompleted: Date | null;
+                                note: string | null;
+                                id: string;
+                                createdAt: string;
+                                updatedAt: string;
+                                deletedAt: string | null;
+                                oldId: number | null;
+                            };
+                            401: "Session not found";
+                            404: "Хяналтын үзлэг олдсонгүй.";
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
+                        };
+                    };
+                };
+            };
         };
     } & {
         fleet: {

package/dist/index.js

@@ -146989,7 +146989,13 @@ var branchRoutes = new Elysia({
 }).get("/", async ({ query }) => await service2.get(query), {
   query: model_default2.select,
   userKind: "COMPANY_ADMIN"
-}).post("/", async ({ body, user: user2 }) => await logic_default2.create(body, user2), {
+}).get("/me", async ({ user: user2 }) => service2.get({
+  id: user2.branchId,
+  pagination: {
+    page: 1,
+    size: 1
+  }
+})).post("/", async ({ body, user: user2 }) => await logic_default2.create(body, user2), {
   body: model_default2.create,
   userKind: "COMPANY_ADMIN"
 }).guard({
@@ -151177,7 +151183,7 @@ var CrmCpOrderLogic;
       totalAmount: sql3`
       (
           (
-           COALESCE((select sum(${crmCpOrderItemTable.priceTotal}) from ${crmCpOrderItemTable} where ${crmCpOrderItemTable.cpOrderId} = ${crmCpOrderTable.id} and ${crmCpOrderItemTable.deletedAt} is null), 0)
+           COALESCE((select sum(${crmCpOrderItemTable.priceTotal}) from ${crmCpOrderItemTable} where ${crmCpOrderItemTable.cpOrderId} = ${crmCpOrderTable.id} and ${crmCpOrderItemTable.cpOrderSpPackageId} is null and ${crmCpOrderItemTable.deletedAt} is null), 0)
           +
            COALESCE((select sum(${crmCpOrderSpPackageTable.priceTotal}) from ${crmCpOrderSpPackageTable} where ${crmCpOrderSpPackageTable.cpOrderId} = ${crmCpOrderTable.id} and ${crmCpOrderSpPackageTable.deletedAt} is null), 0)
           ) * CASE WHEN ${crmCpOrderTable.isNoat} THEN 1.1 ELSE 1 END
@@ -151605,12 +151611,12 @@ var DiscountLogic;
         });
       }
     }
-    await db_default.transaction(async (db2) => {
-      await db2.delete(crmDiscountApplyTable).where(eq(crmDiscountApplyTable.cpOrderId, cpOrderId));
-      if (applies.length > 0) {
+    if (applies.length > 0) {
+      await db_default.transaction(async (db2) => {
+        await db2.delete(crmDiscountApplyTable).where(eq(crmDiscountApplyTable.cpOrderId, cpOrderId));
         await db2.insert(crmDiscountApplyTable).values(applies);
-      }
-    });
+      });
+    }
   };
   const calculateDiscountedPrice = (originalPrice, discountType, discountValue) => {
     if (discountType === "PERCENTAGE") {
@@ -154311,14 +154317,21 @@ var InspectionLogic;
     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({
+    const [res] = await db_default.insert(inspectionTable).values({
       ...body,
       employeeInspectedId: user2.employeeId,
       userInspectedId: user2.id
+    }).returning({
+      id: inspectionTable.id
     });
+    return res.id;
   };
   InspectionLogic.update = async (id, body) => {
-    await db_default.update(inspectionTable).set(body).where(eq(inspectionTable.id, id));
+    const [result] = await db_default.update(inspectionTable).set(body).where(eq(inspectionTable.id, id)).returning();
+    if (!result) {
+      return status("Not Found", "\u0425\u044F\u043D\u0430\u043B\u0442\u044B\u043D \u04AF\u0437\u043B\u044D\u0433 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+    }
+    return result;
   };
   InspectionLogic.remove = async (id) => {
     await db_default.delete(inspectionTable).where(eq(inspectionTable.id, id));
@@ -154504,6 +154517,10 @@ var inspectionRoutes2 = new Elysia({
   query: model_default27.select
 }).post("/", async ({ body, user: user2 }) => logic_default27.create(body, user2).catch((err2) => console.error(err2)), {
   body: model_default27.create
+}).guard({
+  params: IdSchema
+}).put("/:id", async ({ body, params: { id } }) => logic_default27.update(id, body), {
+  body: model_default27.update
 });
 var inspection_default2 = inspectionRoutes2;
 
@@ -154571,7 +154588,7 @@ var machine_default = machineRoutes;
 var PmTemplateLogic;
 ((PmTemplateLogic) => {
   PmTemplateLogic.select = async (query, user2) => {
-    const filter = and(or(isNull2(pmTemplateTable.companyId), eq(pmTemplateTable.companyId, user2.companyId).if(user2.kind !== "ADMIN")));
+    const filter = and(or(isNull2(pmTemplateTable.companyId), eq(pmTemplateTable.companyId, user2.companyId).if(user2.kind !== "ADMIN")), softDeletedFilter(pmTemplateTable));
     const baseQuery = db_default.select({
       template: pmTemplateTable,
       machineKind: techdocVehicleKindTable,

package/package.json

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