autosync_backend2 1.1.14 → 1.1.15

package/dist/index.d.ts

@@ -456,7 +456,7 @@ declare const app: Elysia<"", {
     };
     macroFn: {
         readonly auth: {
-            readonly resolve: ({ status, request: { headers } }: {
+            readonly resolve: ({ request: { headers } }: {
                 body: unknown;
                 query: Record<string, string>;
                 params: Record<string, string>;
@@ -720,7 +720,7 @@ declare const app: Elysia<"", {
                     readonly "Not Extended": 510;
                     readonly "Network Authentication Required": 511;
                 }[Code] : Code>;
-            }) => Promise<import("elysia/dist/error").ElysiaCustomStatusResponse<401, "Нэвтэрж орно уу.", 401> | {
+            }) => Promise<import("elysia/dist/error").ElysiaCustomStatusResponse<"Unauthorized", "Unauthorized", 401> | {
                 user: {
                     id: string;
                     name: string;
@@ -1010,7 +1010,7 @@ declare const app: Elysia<"", {
                     readonly "Not Extended": 510;
                     readonly "Network Authentication Required": 511;
                 }[Code] : Code>;
-            }): Promise<import("elysia/dist/error").ElysiaCustomStatusResponse<"Unauthorized", "Unauthorized", 401> | import("elysia/dist/error").ElysiaCustomStatusResponse<"Forbidden", "Хандах эрхгүй байна.", 403> | {
+            }): Promise<import("elysia/dist/error").ElysiaCustomStatusResponse<"Unauthorized", "Unauthorized", 401> | {
                 user: {
                     id: string;
                     name: string;
@@ -1033,7 +1033,7 @@ declare const app: Elysia<"", {
                     ipAddress?: string | null | undefined | undefined;
                     userAgent?: string | null | undefined | undefined;
                 };
-            }>;
+            } | import("elysia/dist/error").ElysiaCustomStatusResponse<"Forbidden", "Хандах эрхгүй байна.", 403>>;
         };
         readonly permission: (input: import("./lib/permissions").PermissionCode | import("./lib/permissions").PermissionCode[]) => {
             resolve({ status, request: { headers } }: {
@@ -1301,6 +1301,28 @@ declare const app: Elysia<"", {
                     readonly "Network Authentication Required": 511;
                 }[Code] : Code>;
             }): Promise<import("elysia/dist/error").ElysiaCustomStatusResponse<"Unauthorized", "Unauthorized", 401> | import("elysia/dist/error").ElysiaCustomStatusResponse<"Forbidden", "Хандах эрхгүй байна.", 403> | {
+                user: {
+                    id: string;
+                    name: string;
+                    emailVerified: boolean;
+                    email: string;
+                    createdAt: Date;
+                    updatedAt: Date;
+                    image?: string | null | undefined | undefined;
+                    companyId: string;
+                    branchId: string;
+                    kind: "ADMIN" | "COMPANY_ADMIN" | "CUSTOMER";
+                };
+                session: {
+                    id: string;
+                    token: string;
+                    userId: string;
+                    expiresAt: Date;
+                    createdAt: Date;
+                    updatedAt: Date;
+                    ipAddress?: string | null | undefined | undefined;
+                    userAgent?: string | null | undefined | undefined;
+                };
                 permissions: ("INVENTORY_ITEM_SELECT_OWN" | "INVENTORY_ITEM_SELECT_ADMIN" | "INVENTORY_ITEM_CREATE_OWN" | "INVENTORY_ITEM_CREATE_ADMIN" | "INVENTORY_ITEM_UPDATE_OWN" | "INVENTORY_ITEM_UPDATE_ADMIN" | "INVENTORY_ITEM_DELETE_OWN" | "INVENTORY_ITEM_DELETE_ADMIN" | "INVENTORY_LOG_SELECT_OWN" | "INVENTORY_LOG_SELECT_ADMIN" | "INVENTORY_REFUND_SELECT_OWN" | "INVENTORY_REFUND_SELECT_ADMIN" | "INVENTORY_REFUND_CREATE_OWN" | "INVENTORY_REFUND_APPROVE_ADMIN" | "MERCHANT_BRANCH_SELECT_OWN" | "MERCHANT_BRANCH_SELECT_ADMIN" | "MERCHANT_BRANCH_CREATE" | "MERCHANT_MERCHANT_CREATE" | "MERCHANT_MERCHANT_UPDATE_OWN" | "MERCHANT_MERCHANT_UPDATE_ADMIN" | "PERMISSION_ADD" | "PERMISSION_GROUP_ALL" | "USER_CREATE_OWN" | "USER_CREATE_ADMIN" | "USER_CREATE_BACKOFFICE" | "USER_SELECT_OWN" | "USER_SELECT_ADMIN" | "USER_SELECT_BACKOFFICE" | "BACK_OFFICE_ADMIN")[];
             }>;
         };
@@ -3533,17 +3555,84 @@ declare const app: Elysia<"", {
                     headers: unknown;
                     response: {
                         200: {
-                            id: string;
-                            createdAt: string;
-                            updatedAt: string;
-                            companyId: string;
-                            deletedAt: string | null;
-                            orderId: string;
-                            state: "CREATED" | "COMPLETE" | "PROGRESSING";
-                            customerId: string | null;
-                            vehicleId: string;
-                            companyBranchId: string;
-                            timeCompleted: Date | null;
+                            totalCount: number;
+                            totalPage: number;
+                            result: {
+                                order: {
+                                    companyId: string;
+                                    companyBranchId: string;
+                                    customerId: string | null;
+                                    vehicleId: string;
+                                    orderId: string;
+                                    state: "CREATED" | "COMPLETE" | "PROGRESSING";
+                                    timeCompleted: Date | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                vehicle: {
+                                    customerId: string | null;
+                                    vehicleKindId: string;
+                                    vin: string | null;
+                                    licensePlate: string | null;
+                                    color: string | null;
+                                    engineCc: string | null;
+                                    cylinder: string | null;
+                                    gasType: string | null;
+                                    transmissionType: string | null;
+                                    vehicleType: string | null;
+                                    yearManufacture: number | null;
+                                    yearImport: number | null;
+                                    steering: string | null;
+                                    engineCode: string | null;
+                                    transmissionCode: string | null;
+                                    driveTrain: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                make: {
+                                    vehicleKindEnum: "MAKE" | "MODEL_GROUP" | "MODEL";
+                                    parentId: string | null;
+                                    name: string;
+                                    description: string | null;
+                                    yearStart: number | null;
+                                    yearEnd: number | null;
+                                    imagePath: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                } | null;
+                                model: {
+                                    vehicleKindEnum: "MAKE" | "MODEL_GROUP" | "MODEL";
+                                    parentId: string | null;
+                                    name: string;
+                                    description: string | null;
+                                    yearStart: number | null;
+                                    yearEnd: number | null;
+                                    imagePath: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                } | null;
+                                customer: {
+                                    companyId: string | null;
+                                    firstname: string | null;
+                                    lastname: string | null;
+                                    phoneNumber: string;
+                                    email: string | null;
+                                    regNum: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                } | null;
+                                isDeleteAble: unknown;
+                            }[];
                         };
                         502: string;
                         400: "Машины дугаар болон VIN хоёроос нэгийг нь оруулна уу." | "Машины VIN оруулсан бол машины төрөл оруулна уу.";
@@ -3588,6 +3677,20 @@ declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            "cp-order": {
+                ws: {
+                    subscribe: {
+                        body: unknown;
+                        params: {};
+                        query: {
+                            id: string;
+                        };
+                        headers: unknown;
+                        response: unknown;
+                    };
+                };
+            };
         } & {
             "cp-order": {
                 ":id": {

package/dist/index.js

@@ -141090,10 +141090,6 @@ var requestLogger = new Elysia({ name: "Middleware.RequestLogger" }).onRequest(a
     error: "message" in error2 ? error2.message : "Unknown error",
     stack: env_default.NODE_ENV === "development" && "stack" in error2 ? error2.stack : undefined
   });
-  console.log(error2);
-  if (code === "VALIDATION") {
-    return error2.validator.Errors(error2.value).First().message;
-  }
 }).as("global");
 
 // src/lib/db/helpers/pagination.helper.ts
@@ -141209,44 +141205,44 @@ var StringEnum = (values) => {
 };
 
 // src/middlewares/better-auth.ts
+async function getSession2(headers) {
+  const session2 = await auth2.api.getSession({ headers });
+  if (!session2)
+    return status("Unauthorized", "Unauthorized");
+  return {
+    user: session2.user,
+    session: session2.session
+  };
+}
 var betterAuthMacro = new Elysia({ name: "betterAuth" }).macro({
   auth: {
-    async resolve({ status: status2, request: { headers } }) {
-      const session2 = await auth2.api.getSession({ headers });
-      if (!session2)
-        return status2(401, "\u041D\u044D\u0432\u0442\u044D\u0440\u0436 \u043E\u0440\u043D\u043E \u0443\u0443.");
-      return {
-        user: session2.user,
-        session: session2.session
-      };
+    async resolve({ request: { headers } }) {
+      return getSession2(headers);
     }
   },
   userKind(input) {
     return {
       async resolve({ status: status2, request: { headers } }) {
-        const session2 = await auth2.api.getSession({ headers });
-        if (!session2)
-          return status2("Unauthorized", "Unauthorized");
-        const user2 = session2.user;
+        const session2 = await getSession2(headers);
+        if ("code" in session2) {
+          return session2;
+        }
         const enums = ["CUSTOMER", "COMPANY_ADMIN", "ADMIN"];
         const inputIndex = enums.indexOf(input);
-        const userIndex = enums.indexOf(user2.kind);
+        const userIndex = enums.indexOf(session2.user.kind);
         if (userIndex < inputIndex) {
           return status2("Forbidden", "\u0425\u0430\u043D\u0434\u0430\u0445 \u044D\u0440\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
         }
-        return {
-          user: session2.user,
-          session: session2.session
-        };
+        return session2;
       }
     };
   },
   permission(input) {
     return {
       async resolve({ status: status2, request: { headers } }) {
-        const session2 = await auth2.api.getSession({ headers });
-        if (!session2)
-          return status2("Unauthorized", "Unauthorized");
+        const session2 = await getSession2(headers);
+        if ("code" in session2)
+          return session2;
         const cacheKey = `permissions:${session2.user.id}`;
         const forbiddenError = status2("Forbidden", "\u0425\u0430\u043D\u0434\u0430\u0445 \u044D\u0440\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
         const inputPermissions = Array.isArray(input) ? input : [input];
@@ -141265,7 +141261,8 @@ var betterAuthMacro = new Elysia({ name: "betterAuth" }).macro({
           return forbiddenError;
         }
         return {
-          permissions
+          permissions,
+          ...session2
         };
       }
     };
@@ -143905,10 +143902,32 @@ var cpOrderRoutes = new Elysia({
   tags: ["CrmCpOrder"]
 }).use(better_auth_default).use(service_default).use(product_default).guard({ auth: true }).model(prefix_model_default("CrmCpOrderModel", model_default5)).get("/", async ({ query, user: user2 }) => logic_default10.select(query, user2), {
   query: "CrmCpOrderModel.select"
-}).post("/", async ({ body, user: user2 }) => logic_default10.create(body, user2), {
+}).post("/", async ({ body, user: user2 }) => {
+  const created = await logic_default10.create(body, user2);
+  if ("code" in created) {
+    return created;
+  }
+  const result = await logic_default10.select({
+    id: created.id,
+    pagination: {
+      page: 1,
+      size: 1
+    }
+  }, user2);
+  cpOrderRoutes.server?.publish(`cp_order:${user2.branchId}`, JSON.stringify(result.result[0]));
+  return result;
+}, {
   body: "CrmCpOrderModel.create"
 }).post("/package", async ({ body, user: user2 }) => logic_default10.addPackage(body, user2), {
   body: "CrmCpOrderModel.addPackage"
+}).ws("/ws", {
+  query: IdSchema,
+  open(ws) {
+    ws.subscribe(`cp_order:${ws.data.user.branchId}`);
+  },
+  close(ws) {
+    ws.unsubscribe(`cp_order:${ws.data.user.branchId}`);
+  }
 }).guard({
   params: IdSchema
 }).post("/:id/complete", async ({ user: user2, params: { id } }) => logic_default10.complete(id, user2)).delete("/:id", async ({ user: user2, params: { id } }) => logic_default10.remove(id, user2));

package/package.json

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