autosync_backend2 1.0.74 → 1.0.75

package/dist/index.d.ts

@@ -1308,6 +1308,7 @@ declare const app: Elysia<"", {
                 excel: {
                     post: {
                         body: {
+                            branchId?: string | undefined;
                             file: File;
                         };
                         params: {};
@@ -1317,7 +1318,7 @@ declare const app: Elysia<"", {
                             200: AsyncGenerator<{
                                 percent: number;
                                 status: string;
-                            }, void, unknown>;
+                            }, import("elysia/dist/error").ElysiaCustomStatusResponse<"Bad Request", readonly import("@sinclair/typebox/build/cjs/errors").ValueError[], 400> | undefined, unknown>;
                             422: {
                                 type: "validation";
                                 on: string;

package/dist/index.js

@@ -95937,8 +95937,8 @@ var version2 = XLSX.version;
 // src/routes/inventory/log/logic.ts
 var InventoryLogLogic;
 ((InventoryLogLogic) => {
-  InventoryLogLogic.select = async (query) => {
-    const filter = and(eq(inventoryItemTable.supplierId, query.supplierId ?? "").if(query.supplierId), or(ilike(inventoryItemTable.name, `%${query.search}%`), ilike(inventoryItemTable.barCode, `%${query.search}%`), ilike(inventoryItemTable.oen, `%${query.search}%`), ilike(inventoryItemTable.partNumber, `%${query.search}%`))?.if(query.search), ilike(inventoryItemTable.shelfNumber, `%${query.shelfNumber}%`).if(query.shelfNumber), eq(inventoryLogTable.createdUserId, query.createdUserId ?? "").if(query.createdUserId), eq(sql`date(${inventoryLogTable.createdAt})`, query.createdAt ?? "").if(query.createdAt), eq(inventoryLogTable.sellPrice, query.sellPrice ?? 0).if(query.sellPrice));
+  InventoryLogLogic.select = async (query, user2) => {
+    const filter = and(logic_default.getInventoryItemFilter(query, user2), eq(inventoryLogTable.createdUserId, query.createdUserId ?? "").if(query.createdUserId), eq(sql`date(${inventoryLogTable.createdAt})`, query.createdAt ?? "").if(query.createdAt), eq(inventoryLogTable.sellPrice, query.sellPrice ?? 0).if(query.sellPrice));
     const columns = getTableColumns(inventoryLogTable);
     const base = db_default.select({
       ...columns,
@@ -95980,7 +95980,7 @@ var InventoryLogLogic;
     });
   };
 })(InventoryLogLogic ||= {});
-var logic_default = InventoryLogLogic;
+var logic_default2 = InventoryLogLogic;
 
 // node_modules/drizzle-typebox/index.mjs
 var CONSTANTS = {
@@ -96300,7 +96300,8 @@ var selectInventoryItemSchema = t.Composite([
   PaginationSchema
 ]);
 var importInventoryItemSchema = t.Object({
-  file: t.File()
+  file: t.File(),
+  branchId: t.Optional(t.String({ format: "uuid" }))
 });
 
 // src/routes/inventory/item/logic.ts
@@ -96339,7 +96340,7 @@ var InventoryItemLogic;
         merchantId: body.merchantId ?? user2.merchantId
       }).returning();
       if (body.quantity) {
-        await logic_default.create({
+        await logic_default2.create({
           itemId: inventoryItem.id,
           quantity: body.quantity,
           description: "\u0413\u0430\u0440\u0430\u0430\u0440 \u0431\u0430\u0440\u0430\u0430 \u043D\u044D\u043C\u0441\u044D\u043D.",
@@ -96364,21 +96365,27 @@ var InventoryItemLogic;
       throw new Error("\u0410\u0433\u0443\u0443\u043B\u0430\u0445\u044B\u043D \u0431\u0430\u0440\u0430\u0430 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }
   };
-  InventoryItemLogic.importExcel = async function* ({ file }, user2) {
+  InventoryItemLogic.importExcel = async function* ({ file, branchId }, user2) {
     const BATCH_SIZE = 1000;
     const buffer = await file.arrayBuffer();
     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 parsed = exports_value2.Parse(t.Array(createInventoryItemSchema), rows);
+    let parsed = [];
+    const validator = TypeCompiler.Compile(t.Array(createInventoryItemSchema));
+    if (validator.Check(rows)) {
+      parsed = rows;
+    } else {
+      return status("Bad Request", [...validator.Errors(rows)]);
+    }
     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: item.branchId ?? user2.branchId,
-          merchantId: item.merchantId ?? user2.merchantId
+          branchId: branchId ?? user2.branchId,
+          merchantId: user2.merchantId
         })));
         yield {
           percent: Math.round(batch.length / parsed.length * 100),
@@ -96406,7 +96413,7 @@ var InventoryItemLogic;
     if (!currentInventory) {
       return status("Not Found", "\u0410\u0433\u0443\u0443\u043B\u0430\u0445\u044B\u043D \u0431\u0430\u0440\u0430\u0430 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }
-    await logic_default.create({
+    await logic_default2.create({
       itemId: input.id,
       quantity: input.quantity,
       description: input.description,
@@ -96417,7 +96424,7 @@ var InventoryItemLogic;
     }).where(eq(inventoryItemTable.id, input.id));
   };
 })(InventoryItemLogic ||= {});
-var logic_default2 = InventoryItemLogic;
+var logic_default = InventoryItemLogic;
 
 // src/routes/inventory/item/index.ts
 var itemRoutes = new Elysia({
@@ -96425,7 +96432,7 @@ var itemRoutes = new Elysia({
 }).use(better_auth_default).use(permission_default).guard({
   auth: true,
   tags: ["InventoryItem"]
-}).get("/", async ({ query, user: user2 }) => await logic_default2.select(query, user2), {
+}).get("/", async ({ query, user: user2 }) => await logic_default.select(query, user2), {
   query: selectInventoryItemSchema,
   permission: ["INVENTORY_ITEM_SELECT_OWN", "INVENTORY_ITEM_SELECT_ADMIN"],
   beforeHandle({ status: status2, query, permissions }) {
@@ -96433,7 +96440,7 @@ var itemRoutes = new Elysia({
       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 \u0445\u0430\u0440\u0430\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439.");
     }
   }
-}).post("/", async ({ body, user: user2 }) => await logic_default2.create(body, user2), {
+}).post("/", async ({ body, user: user2 }) => await logic_default.create(body, user2), {
   body: createInventoryItemSchema,
   permission: ["INVENTORY_ITEM_CREATE_OWN", "INVENTORY_ITEM_CREATE_ADMIN"],
   beforeHandle({ status: status2, body, permissions }) {
@@ -96441,15 +96448,23 @@ var itemRoutes = new Elysia({
       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 \u04AF\u04AF\u0441\u0433\u044D\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439.");
     }
   }
-}).post("/excel", async ({ body, user: user2 }) => logic_default2.importExcel(body, user2), {
+}).post("/excel", async ({ body, user: user2 }) => logic_default.importExcel(body, user2), {
   body: importInventoryItemSchema,
-  permission: ["INVENTORY_ITEM_CREATE_OWN", "INVENTORY_ITEM_CREATE_ADMIN"]
+  permission: ["INVENTORY_ITEM_CREATE_OWN", "INVENTORY_ITEM_CREATE_ADMIN"],
+  beforeHandle: ({ permissions, body: { branchId } }) => {
+    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."
+      };
+    }
+  }
 }).get("/excel", async () => "").guard({
   params: IdSchema
-}).put("/:id", async ({ params: { id }, body, user: user2, permissions }) => await logic_default2.update(id, body, user2, permissions), {
+}).put("/:id", async ({ params: { id }, body, user: user2, permissions }) => await logic_default.update(id, body, user2, permissions), {
   body: updateInventoryItemSchema,
   permission: ["INVENTORY_ITEM_UPDATE_OWN", "INVENTORY_ITEM_UPDATE_ADMIN"]
-}).delete("/:id", async ({ params: { id }, user: user2, permissions }) => await logic_default2.remove(id, user2, permissions), {
+}).delete("/:id", async ({ params: { id }, user: user2, permissions }) => await logic_default.remove(id, user2, permissions), {
   permission: ["INVENTORY_ITEM_DELETE_OWN", "INVENTORY_ITEM_DELETE_ADMIN"]
 });
 var item_default = itemRoutes;
@@ -96466,7 +96481,7 @@ var selectInventoryLogSchema = t.Composite([
 // src/routes/inventory/log/index.ts
 var logRoutes = new Elysia({
   prefix: "/log"
-}).use(better_auth_default).use(permission_default).guard({ auth: true, tags: ["InventoryLog"] }).get("/", ({ query }) => logic_default.select(query), {
+}).use(better_auth_default).use(permission_default).guard({ auth: true, tags: ["InventoryLog"] }).get("/", ({ query, user: user2 }) => logic_default2.select(query, user2), {
   query: selectInventoryLogSchema,
   permission: ["INVENTORY_LOG_SELECT_OWN", "INVENTORY_LOG_SELECT_ADMIN"],
   beforeHandle({ status: status2, query, permissions }) {
@@ -96864,13 +96879,13 @@ var permissionList = localPermissionList;
 // src/routes/permission/logic.ts
 var PermissionLogic;
 ((PermissionLogic) => {
-  PermissionLogic.addPermission = async (body) => {
+  PermissionLogic.addPermission = async (body, tdb = db_default) => {
     const insert = body.permissions.map((permission) => ({
       userId: body.userId,
       code: permission
     }));
-    await db_default.delete(permissionTable).where(eq(permissionTable.userId, body.userId));
-    await db_default.insert(permissionTable).values(insert);
+    await tdb.delete(permissionTable).where(eq(permissionTable.userId, body.userId));
+    await tdb.insert(permissionTable).values(insert);
   };
   PermissionLogic.selectGroups = async (query) => {
     const columns = getTableColumns(permissionGroupTable);
@@ -97121,25 +97136,28 @@ var UserLogic;
         branchId
       }
     });
-    const insertPermissions = body.permissions.map((p) => ({
-      userId: result.user.id,
-      code: p
-    }));
-    if (insertPermissions.length > 0) {
-      await db_default.insert(permissionTable).values(insertPermissions);
+    try {
+      await logic_default4.addPermission({
+        permissions: body.permissions,
+        userId: result.user.id
+      });
+    } catch (err2) {
+      await db_default.delete(user).where(eq(user.id, result.user.id));
     }
     return result.user;
   };
   UserLogic.update = async (id, body, user2, permissions) => {
-    const [updatedUser] = await db_default.update(user).set(body).where(and(eq(user.id, id), eq(user.merchantId, user2.merchantId).if(!permissions.some((p) => adminPermissions.includes(p))), eq(user.branchId, user2.branchId).if(!permissions.some((p) => adminPermissions.includes(p)) || !permissions.includes("USER_CREATE_ADMIN")))).returning();
-    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({
-      permissions: body.permissions,
-      userId: updatedUser.id
+    return await db_default.transaction(async (db2) => {
+      const [updatedUser] = await db2.update(user).set(body).where(and(eq(user.id, id), eq(user.merchantId, user2.merchantId).if(!permissions.some((p) => adminPermissions.includes(p))), eq(user.branchId, user2.branchId).if(!permissions.some((p) => adminPermissions.includes(p)) || permissions.includes("USER_CREATE_ADMIN")))).returning();
+      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({
+        permissions: body.permissions,
+        userId: updatedUser.id
+      }, db2);
+      return updatedUser;
     });
-    return updatedUser;
   };
 })(UserLogic ||= {});
 var logic_default5 = UserLogic;
@@ -97208,11 +97226,7 @@ var app = new Elysia().use(index_default({
     paths: await OpenAPI.getPaths(),
     tags: swagger_tags_default
   }
-})).use(pino_logger_default).onError(({ error: error2, set: set2 }) => {
-  return status(set2.status ?? 500, {
-    error: error2
-  });
-}).onAfterResponse(async ({ request, response, server, status: status2, set: set2, body, headers }) => {
+})).use(pino_logger_default).onAfterResponse(async ({ request, response, server, status: status3, set: set2, body, headers }) => {
   const log = {
     userId: (await auth2.api.getSession({ headers: request.headers }))?.user.id,
     request: {
@@ -97224,7 +97238,7 @@ var app = new Elysia().use(index_default({
     method: request.method,
     path: request.url,
     statusCode: set2.status?.toString() ?? "200",
-    error: status2
+    error: status3
   };
   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.74",
+	"version": "1.0.75",
 	"module": "src/index.ts",
 	"type": "module",
 	"main": "dist/index.js",
@@ -13,7 +13,8 @@
 		"db:migrate": "bunx --bun drizzle-kit migrate",
 		"db:generate": "bunx --bun drizzle-kit generate",
 		"biome:check": "bunx biome check --write",
-		"email": "email dev --dir src/lib/emails"
+		"email": "email dev --dir src/lib/emails",
+		"prepare": "husky"
 	},
 	"dependencies": {
 		"@bogeychan/elysia-logger": "^0.1.8",
@@ -45,6 +46,7 @@
 		"@types/react-dom": "^19.1.5",
 		"bun-types": "latest",
 		"drizzle-kit": "^0.31.1",
+		"husky": "^9.1.7",
 		"react-email": "^4.0.15"
 	},
 	"files": [