autosync_backend2 1.0.75 → 1.0.76

package/dist/index.d.ts

@@ -1317,7 +1317,7 @@ declare const app: Elysia<"", {
                         response: {
                             200: AsyncGenerator<{
                                 percent: number;
-                                status: string;
+                                count: number;
                             }, import("elysia/dist/error").ElysiaCustomStatusResponse<"Bad Request", readonly import("@sinclair/typebox/build/cjs/errors").ValueError[], 400> | undefined, unknown>;
                             422: {
                                 type: "validation";
@@ -1508,6 +1508,138 @@ declare const app: Elysia<"", {
                 };
             };
         };
+    } & {
+        inventory: {
+            supplier: {
+                get: {
+                    body: unknown;
+                    params: {};
+                    query: {
+                        pagination: {
+                            size: number;
+                            page: number;
+                        };
+                    };
+                    headers: unknown;
+                    response: {
+                        200: {
+                            totalCount: number;
+                            totalPage: number;
+                            result: {
+                                name: string;
+                                image: string | null;
+                                id: string;
+                                createdAt: string;
+                                updatedAt: string;
+                                deletedAt: string | null;
+                            }[];
+                        };
+                        422: {
+                            type: "validation";
+                            on: string;
+                            summary?: string;
+                            message?: string;
+                            found?: unknown;
+                            property?: string;
+                            expected?: string;
+                        };
+                    };
+                };
+            };
+        } & {
+            supplier: {
+                post: {
+                    body: {
+                        image?: string | null | undefined;
+                        name: string;
+                    };
+                    params: {};
+                    query: unknown;
+                    headers: unknown;
+                    response: {
+                        200: {
+                            name: string;
+                            id: string;
+                            image: string | null;
+                            createdAt: string;
+                            updatedAt: string;
+                            deletedAt: string | null;
+                        };
+                        422: {
+                            type: "validation";
+                            on: string;
+                            summary?: string;
+                            message?: string;
+                            found?: unknown;
+                            property?: string;
+                            expected?: string;
+                        };
+                    };
+                };
+            };
+        } & {
+            supplier: {
+                ":id": {
+                    put: {
+                        body: {
+                            image?: string | null | undefined;
+                            name: string;
+                        };
+                        params: {
+                            id: string;
+                        };
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: {
+                                name: string;
+                                image: string | null;
+                                id: string;
+                                createdAt: string;
+                                updatedAt: string;
+                                deletedAt: string | null;
+                            };
+                            404: "Нийлүүлэгч олдсонгүй.";
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
+                        };
+                    };
+                };
+            };
+        } & {
+            supplier: {
+                ":id": {
+                    delete: {
+                        body: unknown;
+                        params: {
+                            id: string;
+                        };
+                        query: unknown;
+                        headers: unknown;
+                        response: {
+                            200: undefined;
+                            404: "Нийлүүлэгч олдсонгүй.";
+                            422: {
+                                type: "validation";
+                                on: string;
+                                summary?: string;
+                                message?: string;
+                                found?: unknown;
+                                property?: string;
+                                expected?: string;
+                            };
+                        };
+                    };
+                };
+            };
+        };
     };
 } & {
     api: {

package/dist/index.js

@@ -15782,6 +15782,7 @@ __export(exports_schema, {
   merchantTable: () => merchantTable,
   merchantSchema: () => merchantSchema,
   logTable: () => logTable,
+  inventorySupplierTable: () => inventorySupplierTable,
   inventorySchema: () => inventorySchema,
   inventoryRefundTable: () => inventoryRefundTable,
   inventoryLogTable: () => inventoryLogTable,
@@ -21017,6 +21018,11 @@ var inventoryRefundTable = inventorySchema.table("refund", {
   userId: uuid().notNull(),
   approvedUserId: uuid()
 });
+var inventorySupplierTable = inventorySchema.table("supplier", {
+  ...base_schema_helper_default,
+  name: varchar().notNull(),
+  image: varchar()
+});
 // src/lib/db/schema/common.schema.ts
 var logTable = pgTable("log", {
   ...base_schema_helper_default,
@@ -73202,6 +73208,10 @@ var inventoryTags = [
   {
     name: "InventoryRefund",
     description: "\u0410\u0433\u0443\u0443\u043B\u0430\u0445\u044B\u043D \u0431\u0443\u0446\u0430\u0430\u043B\u0442"
+  },
+  {
+    name: "InventorySupplier",
+    description: "\u0410\u0433\u0443\u0443\u043B\u0430\u0445\u044B\u043D \u043D\u0438\u0439\u043B\u04AF\u04AF\u043B\u044D\u0433\u0447"
   }
 ];
 var merchantTags = [
@@ -96371,32 +96381,27 @@ var InventoryItemLogic;
     const workbook = readSync(buffer, { type: "buffer" });
     const sheetName = workbook.SheetNames[0];
     const sheet = workbook.Sheets[sheetName];
-    const rows = utils.sheet_to_json(sheet, { defval: null });
+    const rows = utils.sheet_to_json(sheet);
+    const schema3 = t.Array(createInventoryItemSchema);
     let parsed = [];
-    const validator = TypeCompiler.Compile(t.Array(createInventoryItemSchema));
-    if (validator.Check(rows)) {
-      parsed = rows;
-    } else {
-      return status("Bad Request", [...validator.Errors(rows)]);
+    try {
+      parsed = exports_value2.Parse(schema3, rows);
+    } catch (err2) {
+      return status("Bad Request", [...exports_value2.Errors(schema3, parsed)]);
     }
     for (let i2 = 0;i2 < parsed.length; i2 += BATCH_SIZE) {
       const batch = parsed.slice(i2, i2 + BATCH_SIZE);
-      if (batch.length !== 0) {
-        await db_default.insert(inventoryItemTable).values(batch.map((item) => ({
-          ...item,
-          branchId: branchId ?? user2.branchId,
-          merchantId: user2.merchantId
-        })));
-        yield {
-          percent: Math.round(batch.length / parsed.length * 100),
-          status: "running"
-        };
-      }
+      await db_default.insert(inventoryItemTable).values(batch.map((item) => ({
+        ...item,
+        branchId: branchId ?? user2.branchId,
+        merchantId: user2.merchantId
+      })));
+      const percent = Math.round((i2 * BATCH_SIZE + batch.length) / parsed.length * 100);
+      yield {
+        percent: percent >= 100 ? 100 : percent,
+        count: i2
+      };
     }
-    yield {
-      percent: 100,
-      status: "completed"
-    };
   };
   InventoryItemLogic.downloadExcelTemplate = () => {
     const workbook = utils.book_new();
@@ -96451,12 +96456,9 @@ var itemRoutes = new Elysia({
 }).post("/excel", async ({ body, user: user2 }) => logic_default.importExcel(body, user2), {
   body: importInventoryItemSchema,
   permission: ["INVENTORY_ITEM_CREATE_OWN", "INVENTORY_ITEM_CREATE_ADMIN"],
-  beforeHandle: ({ permissions, body: { branchId } }) => {
+  beforeHandle: ({ permissions, body: { branchId }, status: status2 }) => {
     if (!permissions.includes("INVENTORY_ITEM_CREATE_ADMIN") && branchId) {
-      return {
-        status: "Forbidden",
-        message: "\u0417\u04E9\u0432\u0445\u04E9\u043D \u04E9\u04E9\u0440\u0438\u0439\u043D \u0441\u0430\u043B\u0431\u0430\u0440\u044B\u043D \u0431\u0430\u0440\u0430\u0430 \u043D\u044D\u043C\u044D\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439."
-      };
+      return status2("Forbidden", "\u0417\u04E9\u0432\u0445\u04E9\u043D \u04E9\u04E9\u0440\u0438\u0439\u043D \u0441\u0430\u043B\u0431\u0430\u0440\u044B\u043D \u0431\u0430\u0440\u0430\u0430 \u043D\u044D\u043C\u044D\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439.");
     }
   }
 }).get("/excel", async () => "").guard({
@@ -96492,10 +96494,73 @@ var logRoutes = new Elysia({
 });
 var log_default = logRoutes;
 
+// src/routes/inventory/supplier/logic.ts
+var InventorySupplierLogic;
+((InventorySupplierLogic) => {
+  InventorySupplierLogic.select = async (query) => {
+    const columns = getTableColumns(inventorySupplierTable);
+    const baseQuery = db_default.select({
+      ...columns,
+      totalCount: sql`count(*) over()`.mapWith(Number)
+    }).from(inventorySupplierTable).where(softDeletedFilter(inventorySupplierTable)).$dynamic();
+    const suppliers = await pagination_helper_default(baseQuery, query.pagination);
+    const content = {
+      totalCount: suppliers[0]?.totalCount ?? 0,
+      totalPage: suppliers.length === 0 ? 0 : Math.ceil(suppliers[0].totalCount / query.pagination.size)
+    };
+    return {
+      result: suppliers.map(({ totalCount, ...i2 }) => i2),
+      ...content
+    };
+  };
+  InventorySupplierLogic.create = async (body) => {
+    const [supplier] = await db_default.insert(inventorySupplierTable).values(body).returning();
+    return supplier;
+  };
+  InventorySupplierLogic.update = async (id, body) => {
+    const [supplier] = await db_default.update(inventorySupplierTable).set(body).where(eq(inventorySupplierTable.id, id)).returning();
+    if (!supplier) {
+      return status("Not Found", "\u041D\u0438\u0439\u043B\u04AF\u04AF\u043B\u044D\u0433\u0447 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+    }
+    return supplier;
+  };
+  InventorySupplierLogic.remove = async (id) => {
+    const [supplier] = await db_default.update(inventorySupplierTable).set({
+      deletedAt: sql`now()`
+    }).where(eq(inventorySupplierTable.id, id)).returning();
+    if (!supplier) {
+      return status("Not Found", "\u041D\u0438\u0439\u043B\u04AF\u04AF\u043B\u044D\u0433\u0447 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+    }
+  };
+})(InventorySupplierLogic ||= {});
+var logic_default3 = InventorySupplierLogic;
+
+// src/routes/inventory/supplier/schema.ts
+var create3 = createInsertSchema(inventorySupplierTable);
+var update2 = createInsertSchema(inventorySupplierTable);
+var createInventorySupplierSchema = OmitBaseSchema(create3);
+var updateInventorySupplierSchema = OmitBaseSchema(update2);
+
+// src/routes/inventory/supplier/index.ts
+var supplierRoutes = new Elysia({
+  prefix: "/supplier"
+}).guard({
+  tags: ["InventorySupplier"]
+}).get("/", async ({ query }) => await logic_default3.select(query), {
+  query: PaginationSchema
+}).post("/", async ({ body }) => await logic_default3.create(body), {
+  body: createInventorySupplierSchema
+}).guard({
+  params: IdSchema
+}).put("/:id", async ({ params: { id }, body }) => await logic_default3.update(id, body), {
+  body: updateInventorySupplierSchema
+}).delete("/:id", async ({ params: { id } }) => await logic_default3.remove(id));
+var supplier_default = supplierRoutes;
+
 // src/routes/inventory/index.ts
 var inventorySchemaRoutes = new Elysia({
   prefix: "/inventory"
-}).use(item_default).use(log_default);
+}).use(item_default).use(log_default).use(supplier_default);
 var inventory_default = inventorySchemaRoutes;
 
 // src/lib/db/helpers/crud.helper.ts
@@ -96580,18 +96645,18 @@ var MerchantBranchLogic;
     return branch;
   };
 })(MerchantBranchLogic ||= {});
-var logic_default3 = MerchantBranchLogic;
+var logic_default4 = MerchantBranchLogic;
 
 // src/routes/merchant/branch/schema.ts
-var create3 = createInsertSchema(branchTable, {
+var create4 = createInsertSchema(branchTable, {
   phone: (schema3) => t.RegExp(/^\d{8}$/, { ...schema3 }),
   email: (schema3) => t.String({ ...schema3, format: "email" }),
   merchantId: (schema3) => t.Optional(schema3)
 });
-var update2 = createUpdateSchema(branchTable);
+var update3 = createUpdateSchema(branchTable);
 var select2 = createSelectSchema(branchTable);
-var createBranchSchema = OmitBaseSchema(create3);
-var updateBranchSchema = OmitBaseSchema(update2);
+var createBranchSchema = OmitBaseSchema(create4);
+var updateBranchSchema = OmitBaseSchema(update3);
 var selectBranchSchema = t.Composite([
   t.Partial(select2),
   PaginationSchema
@@ -96607,7 +96672,7 @@ var branchRoutes = new Elysia({
 }).get("/", async ({ query }) => await service.get(query), {
   query: selectBranchSchema,
   permission: ["MERCHANT_BRANCH_SELECT_OWN", "MERCHANT_BRANCH_SELECT_ADMIN"]
-}).post("/", async ({ body, user: user2, permissions }) => await logic_default3.create(body, user2, permissions), {
+}).post("/", async ({ body, user: user2, permissions }) => await logic_default4.create(body, user2, permissions), {
   body: createBranchSchema,
   permission: "MERCHANT_BRANCH_CREATE"
 }).guard({
@@ -96616,14 +96681,14 @@ var branchRoutes = new Elysia({
 var branch_default = branchRoutes;
 
 // src/routes/merchant/merchant/schema.ts
-var create4 = createInsertSchema(merchantTable);
-var update3 = createUpdateSchema(merchantTable);
+var create5 = createInsertSchema(merchantTable);
+var update4 = createUpdateSchema(merchantTable);
 var select3 = createSelectSchema(merchantTable, {
   phone: t.RegExp(/^\d{8}$/),
   email: t.String({ format: "email" })
 });
-var createMerchantSchema = OmitBaseSchema(create4);
-var updateMerchantSchema = OmitBaseSchema(update3);
+var createMerchantSchema = OmitBaseSchema(create5);
+var updateMerchantSchema = OmitBaseSchema(update4);
 var selectMerchantSchema = t.Composite([
   t.Partial(t.Pick(select3, ["phone", "regNumber", "serviceName", "isActive"])),
   PaginationSchema
@@ -96661,10 +96726,10 @@ var merchantRoutes = new Elysia({
 var merchant_default = merchantRoutes;
 
 // src/routes/merchant/package/schema.ts
-var create5 = createInsertSchema(packageTable);
-var update4 = createUpdateSchema(packageTable);
-var createPackageSchema = OmitBaseSchema(create5);
-var updatePackageSchema = OmitBaseSchema(update4);
+var create6 = createInsertSchema(packageTable);
+var update5 = createUpdateSchema(packageTable);
+var createPackageSchema = OmitBaseSchema(create6);
+var updatePackageSchema = OmitBaseSchema(update5);
 
 // src/routes/merchant/package/index.ts
 var service3 = new CrudHelper(packageTable, "\u0411\u0430\u0433\u0446 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
@@ -96916,7 +96981,7 @@ var PermissionLogic;
     return permissions;
   };
 })(PermissionLogic ||= {});
-var logic_default4 = PermissionLogic;
+var logic_default5 = PermissionLogic;
 
 // src/routes/permission/schema.ts
 var addPermissionSchema = t.Object({
@@ -96943,7 +97008,7 @@ var permissionRoutes = new Elysia({
   return permissionList;
 }, {
   permission: "PERMISSION_ADD"
-}).post("/", ({ body }) => logic_default4.addPermission(body), {
+}).post("/", ({ body }) => logic_default5.addPermission(body), {
   body: addPermissionSchema,
   permission: "PERMISSION_ADD",
   beforeHandle({ status: status2, body, permissions, publicPermissions }) {
@@ -96955,7 +97020,7 @@ var permissionRoutes = new Elysia({
   }
 }).group("/group", (app) => app.guard({
   permission: "PERMISSION_GROUP_ALL"
-}).get("/", async ({ query }) => await logic_default4.selectGroups(query), {
+}).get("/", async ({ query }) => await logic_default5.selectGroups(query), {
   query: selectPermissionGroupSchema
 }).post("/", async ({ body }) => await groupService.create(body), {
   body: createPermissionGroupSchema
@@ -97093,7 +97158,7 @@ var UserLogic;
       totalCount: sql`count(*) over()`.mapWith(Number)
     }).from(user).where(filter).$dynamic();
     const users = await pagination_helper_default(baseQuery, query.pagination);
-    const userPermissions2 = await logic_default4.selectByUserId(users.map((u) => u.id));
+    const userPermissions2 = await logic_default5.selectByUserId(users.map((u) => u.id));
     const content = {
       totalCount: users[0]?.totalCount ?? 0,
       totalPage: users.length === 0 ? 0 : Math.ceil(users[0].totalCount / query.pagination.size)
@@ -97137,7 +97202,7 @@ var UserLogic;
       }
     });
     try {
-      await logic_default4.addPermission({
+      await logic_default5.addPermission({
         permissions: body.permissions,
         userId: result.user.id
       });
@@ -97152,7 +97217,7 @@ var UserLogic;
       if (!updatedUser) {
         return status("Not Found", "\u0425\u044D\u0440\u044D\u0433\u043B\u044D\u0433\u0447 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
       }
-      await logic_default4.addPermission({
+      await logic_default5.addPermission({
         permissions: body.permissions,
         userId: updatedUser.id
       }, db2);
@@ -97160,18 +97225,18 @@ var UserLogic;
     });
   };
 })(UserLogic ||= {});
-var logic_default5 = UserLogic;
+var logic_default6 = UserLogic;
 
 // src/routes/user/schema.ts
 var select4 = createSelectSchema(user);
-var create6 = createInsertSchema(user);
-var update5 = createUpdateSchema(user);
+var create7 = createInsertSchema(user);
+var update6 = createUpdateSchema(user);
 var selectUserSchema = t.Composite([
   PaginationSchema,
   t.Partial(t.Pick(select4, ["branchId"]))
 ]);
 var createUserSchema = t.Composite([
-  t.Pick(create6, ["name", "email"]),
+  t.Pick(create7, ["name", "email"]),
   t.Object({
     password: t.Optional(t.String()),
     merchantId: t.Optional(t.String({ format: "uuid" })),
@@ -97180,7 +97245,7 @@ var createUserSchema = t.Composite([
   })
 ]);
 var updateUserSchema = t.Composite([
-  t.Omit(update5, ["password"]),
+  t.Omit(update6, ["password"]),
   t.Object({
     permissions: t.Array(StringEnum(permissionList.map((permission) => permission.code)))
   })
@@ -97192,17 +97257,17 @@ var userRoutes = new Elysia({
 }).use(better_auth_default).use(permission_default).guard({
   auth: true,
   tags: ["User"]
-}).get("/", async ({ query, user: user2, permissions }) => logic_default5.select(query, user2, permissions), {
+}).get("/", async ({ query, user: user2, permissions }) => logic_default6.select(query, user2, permissions), {
   query: selectUserSchema,
   permission: [
     "USER_SELECT_BACKOFFICE",
     "USER_SELECT_ADMIN",
     "USER_SELECT_OWN"
   ]
-}).post("/", async ({ body, user: user2, permissions }) => logic_default5.registerUser(body, user2, permissions), {
+}).post("/", async ({ body, user: user2, permissions }) => logic_default6.registerUser(body, user2, permissions), {
   body: createUserSchema,
   permission: ["USER_CREATE_ADMIN", "USER_CREATE_OWN"]
-}).put("/:id", async ({ body, user: user2, permissions, params: { id } }) => logic_default5.update(id, body, user2, permissions), {
+}).put("/:id", async ({ body, user: user2, permissions, params: { id } }) => logic_default6.update(id, body, user2, permissions), {
   body: updateUserSchema,
   permission: ["USER_CREATE_ADMIN", "USER_CREATE_OWN"]
 });
@@ -97226,7 +97291,7 @@ var app = new Elysia().use(index_default({
     paths: await OpenAPI.getPaths(),
     tags: swagger_tags_default
   }
-})).use(pino_logger_default).onAfterResponse(async ({ request, response, server, status: status3, set: set2, body, headers }) => {
+})).use(pino_logger_default).onAfterResponse(async ({ request, response, server, status: status2, set: set2, body, headers }) => {
   const log = {
     userId: (await auth2.api.getSession({ headers: request.headers }))?.user.id,
     request: {
@@ -97238,7 +97303,7 @@ var app = new Elysia().use(index_default({
     method: request.method,
     path: request.url,
     statusCode: set2.status?.toString() ?? "200",
-    error: status3
+    error: status2
   };
   await db_default.insert(logTable).values(log);
 }).mount(auth2.handler).use(routes_default).listen(env_default.PORT);

package/package.json

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