autosync_backend2 1.2.69 → 1.2.72

package/dist/index.d.ts

@@ -628,7 +628,7 @@ export declare const app: Elysia<"", {
                         200: {
                             totalCount: number;
                             totalPage: number;
-                            result: {
+                            result: Omit<{
                                 product: {
                                     supplierId: string;
                                     productId: string | null;
@@ -660,7 +660,8 @@ export declare const app: Elysia<"", {
                                     deletedAt: string | null;
                                     oldId: number | null;
                                 } | null;
-                            }[];
+                                totalCount: number;
+                            }, "totalCount">[];
                         };
                         401: "Токен олдсонгүй";
                         422: {
@@ -1053,7 +1054,7 @@ export declare const app: Elysia<"", {
                         200: {
                             totalCount: number;
                             totalPage: number;
-                            result: {
+                            result: Omit<{
                                 item: {
                                     warehouseId: string;
                                     productId: string;
@@ -1100,7 +1101,8 @@ export declare const app: Elysia<"", {
                                     deletedAt: string | null;
                                     oldId: number | null;
                                 };
-                            }[];
+                                totalCount: number;
+                            }, "totalCount">[];
                         };
                         401: "Токен олдсонгүй";
                         403: "Хандах эрхгүй байна.";
@@ -1125,9 +1127,7 @@ export declare const app: Elysia<"", {
                         query: unknown;
                         headers: unknown;
                         response: {
-                            200: {
-                                count: number;
-                            };
+                            200: number;
                             401: "Токен олдсонгүй";
                             403: "Хандах эрхгүй байна.";
                         };
@@ -1201,10 +1201,15 @@ export declare const app: Elysia<"", {
                         headers: unknown;
                         response: {
                             200: AsyncGenerator<import("elysia").ElysiaCustomStatusResponse<"Not Found", "Агуулахын бараа олдсонгүй.", 404> | import("elysia").ElysiaCustomStatusResponse<"Bad Request", "Ажилтны мэдээлэл шаардлагатай.", 400> | import("elysia").ElysiaCustomStatusResponse<"Bad Request", "Барааны үлдэгдэл хүрэлцэхгүй байна.", 400> | {
+                                type: "New Items";
+                                percent: number;
+                                count: number;
+                                total: number;
+                            } | {
+                                type: "Current Items";
                                 percent: number;
                                 count: number;
                                 total: number;
-                                type: string;
                             }, void, unknown>;
                             401: "Токен олдсонгүй";
                             403: "Хандах эрхгүй байна.";
@@ -1260,7 +1265,8 @@ export declare const app: Elysia<"", {
                             200: {
                                 totalCount: number;
                                 totalPage: number;
-                                result: {
+                                result: Omit<{
+                                    totalCount: number;
                                     product: {
                                         supplierId: string;
                                         productId: string | null;
@@ -1319,7 +1325,7 @@ export declare const app: Elysia<"", {
                                     updatedAt: string;
                                     deletedAt: string | null;
                                     oldId: number | null;
-                                }[];
+                                }, "totalCount">[];
                             };
                             401: "Токен олдсонгүй";
                             403: "Хандах эрхгүй байна.";
@@ -5191,6 +5197,22 @@ export declare const app: Elysia<"", {
                                             deletedAt: string | null;
                                             oldId: number | null;
                                         } | null;
+                                        item: {
+                                            cpOrderId: string;
+                                            companyProductId: string | null;
+                                            companyServiceKindId: string | null;
+                                            cpOrderSpPackageId: string | null;
+                                            quantity: number;
+                                            priceUnit: number;
+                                            priceTotal: number;
+                                            name: string | null;
+                                            description: string | null;
+                                            id: string;
+                                            createdAt: string;
+                                            updatedAt: string;
+                                            deletedAt: string | null;
+                                            oldId: number | null;
+                                        } | null;
                                     }[];
                                 };
                                 401: "Токен олдсонгүй";

package/dist/index.js

@@ -147984,8 +147984,15 @@ var import_exceljs = __toESM(require_excel(), 1);
 var WarehouseProductLogic;
 ((WarehouseProductLogic) => {
   WarehouseProductLogic.getFilter = (query, user2) => {
-    const ilikeSearch = `%${query.search}%`;
-    return and(softDeletedFilter(warehouseProductTable), eq(warehouseProductTable.companyId, user2.companyId), or(ilike(warehouseProductTable.name, `%${ilikeSearch}%`), ilike(warehouseProductTable.barCode, `%${ilikeSearch}%`), ilike(warehouseProductTable.oen, `%${ilikeSearch}%`), ilike(warehouseProductTable.partNumber, `%${ilikeSearch}%`), ilike(warehouseProductTable.alias, `%${ilikeSearch}%`))?.if(!!query.search), eq(warehouseProductTable.priceSell, query.priceSell ?? 0).if(query.priceSell), eq(warehouseProductTable.productId, query.productId ?? "").if(query.productId), eq(warehouseProductTable.supplierId, query.supplierId ?? "").if(query.supplierId), eq(warehouseProductTable.id, query.id ?? "").if(query.id), inArray(warehouseProductTable.id, query.ids ?? []).if(query.ids?.length), ...query.type ? [eq(warehouseProductTable.type, query.type)] : []);
+    const search = [];
+    if (query.search) {
+      const splitted = query.search.trim().split(" ").filter((i2) => i2 !== "");
+      const productKeys = ["name", "barCode", "oen", "partNumber", "alias"];
+      for (const key of productKeys) {
+        search.push(and(...splitted.map((i2) => ilike(warehouseProductTable[key], `%${i2}%`))));
+      }
+    }
+    return and(softDeletedFilter(warehouseProductTable), eq(warehouseProductTable.companyId, user2.companyId), or(...search)?.if(!!query.search), eq(warehouseProductTable.priceSell, query.priceSell ?? 0).if(query.priceSell), eq(warehouseProductTable.productId, query.productId ?? "").if(query.productId), eq(warehouseProductTable.supplierId, query.supplierId ?? "").if(query.supplierId), eq(warehouseProductTable.id, query.id ?? "").if(query.id), inArray(warehouseProductTable.id, query.ids ?? []).if(query.ids?.length), ...query.type ? [eq(warehouseProductTable.type, query.type)] : []);
   };
   WarehouseProductLogic.select = async (query, user2) => {
     const baseQuery = db_default.select({
@@ -147994,14 +148001,7 @@ var WarehouseProductLogic;
       totalCount: totalCountSql
     }).from(warehouseProductTable).leftJoin(techdocSupplierTable, eq(techdocSupplierTable.id, warehouseProductTable.supplierId)).where(WarehouseProductLogic.getFilter(query, user2)).orderBy(desc(warehouseProductTable.createdAt)).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
-    const content = {
-      totalCount: result[0]?.totalCount ?? 0,
-      totalPage: result.length === 0 ? 0 : Math.ceil(result[0].totalCount / query.pagination.size)
-    };
-    return {
-      result: result.map(({ totalCount, ...item }) => item),
-      ...content
-    };
+    return getPaginationContent(result, query.pagination.size);
   };
   WarehouseProductLogic.create = async (body, user2) => {
     const [result] = await db_default.insert(warehouseProductTable).values({
@@ -148109,10 +148109,22 @@ var WarehouseProductLogic;
 var logic_default8 = WarehouseProductLogic;
 
 // src/routes/warehouse/item/logic.ts
+var BATCH_SIZE = 1000;
+var DATA_STORE_EXPIRY_HOURS = 1;
+var TRANSACTION_DESCRIPTION_IN = "\u0411\u0430\u0440\u0430\u0430 \u043E\u0440\u043B\u043E\u0433\u0434\u043E\u0445";
+var ERRORS = {
+  EMPLOYEE_REQUIRED: "\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.",
+  ITEM_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.",
+  PRODUCT_NOT_FOUND: "\u0411\u0430\u0440\u0430\u0430\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.",
+  INSUFFICIENT_STOCK: "\u0411\u0430\u0440\u0430\u0430\u043D\u044B \u04AF\u043B\u0434\u044D\u0433\u0434\u044D\u043B \u0445\u04AF\u0440\u044D\u043B\u0446\u044D\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430."
+};
 var WarehouseItemLogic;
 ((WarehouseItemLogic) => {
+  const buildItemFilter = (query, user2) => {
+    return and(softDeletedFilter(warehouseItemTable).if(query.isActive), isNotNull(warehouseItemTable.deletedAt).if(query.isActive !== undefined && query.isActive === false), ...query.product ? [logic_default8.getFilter(query.product, user2)] : [], eq(warehouseItemTable.safetyStock, query.safetyStock ?? 0).if(query.safetyStock), lte(warehouseItemTable.quantity, warehouseItemTable.safetyStock).if(query.isSafetyStock), ilike(warehouseItemTable.shelfNumber, `%${query.shelfNumber}%`).if(query.shelfNumber), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId), eq(warehouseItemTable.isOrdered, query.isOrdered).if(query.isOrdered));
+  };
   WarehouseItemLogic.select = async (query, user2) => {
-    const filter = and(softDeletedFilter(warehouseItemTable).if(query.isActive), isNotNull(warehouseItemTable.deletedAt).if(query.isActive !== undefined && query.isActive === false), ...query.product ? [logic_default8.getFilter(query.product, user2)] : [], eq(warehouseItemTable.safetyStock, query.safetyStock ?? 0).if(query.safetyStock), lte(warehouseItemTable.quantity, warehouseItemTable.safetyStock).if(query.isSafetyStock), ilike(warehouseItemTable.shelfNumber, `%${query.shelfNumber}%`).if(query.shelfNumber), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId), eq(warehouseItemTable.isOrdered, query.isOrdered).if(query.isOrdered));
+    const filter = buildItemFilter(query, user2);
     const baseQuery = db_default.select({
       item: warehouseItemTable,
       supplier: techdocSupplierTable,
@@ -148120,21 +148132,14 @@ var WarehouseItemLogic;
       totalCount: totalCountSql
     }).from(warehouseItemTable).where(filter).innerJoin(warehouseProductTable, and(eq(warehouseItemTable.productId, warehouseProductTable.id), isNull2(warehouseProductTable.deletedAt))).leftJoin(techdocSupplierTable, eq(warehouseProductTable.supplierId, techdocSupplierTable.id)).orderBy(warehouseItemTable.order, warehouseItemTable.createdAt).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
-    const content = {
-      totalCount: result[0]?.totalCount ?? 0,
-      totalPage: result.length === 0 ? 0 : Math.ceil(result[0].totalCount / query.pagination.size)
-    };
-    return {
-      result: result.map(({ totalCount, ...item }) => item),
-      ...content
-    };
+    return getPaginationContent(result, query.pagination.size);
   };
   WarehouseItemLogic.selectSos = async (user2) => {
     const filter = and(softDeletedFilter(warehouseItemTable), lte(warehouseItemTable.quantity, warehouseItemTable.safetyStock), logic_default8.getFilter({}, user2));
     const result = await db_default.select({
       count: sql3`count(*)`.mapWith(Number)
     }).from(warehouseItemTable).innerJoin(warehouseProductTable, eq(warehouseItemTable.productId, warehouseProductTable.id)).where(filter);
-    return result[0] ?? 0;
+    return result[0]?.count ?? 0;
   };
   WarehouseItemLogic.create = async (body) => {
     const [result] = await db_default.insert(warehouseItemTable).values(body).returning();
@@ -148143,21 +148148,22 @@ var WarehouseItemLogic;
   WarehouseItemLogic.update = async (id, body) => {
     const [result] = await db_default.update(warehouseItemTable).set(body).where(eq(warehouseItemTable.id, id)).returning();
     if (!result) {
-      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.");
+      return status("Not Found", ERRORS.ITEM_NOT_FOUND);
     }
     return result;
   };
   WarehouseItemLogic.upload = async (body) => {
-    const products = await logic_default8.selectByIds(body.map((i2) => i2.productId));
+    const productIds = body.map((item) => item.productId);
+    const products = await logic_default8.selectByIds(productIds);
     if (products.length !== body.length) {
-      const notFoundProducts = body.filter((i2) => !products.some((p) => p.id === i2.productId));
+      const notFoundProductIds = body.filter((item) => !products.some((p) => p.id === item.productId)).map((item) => item.productId);
       return status("Bad Request", {
-        message: "\u0411\u0430\u0440\u0430\u0430\u043D\u044B \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.",
-        data: notFoundProducts.map((i2) => i2.productId)
+        message: ERRORS.PRODUCT_NOT_FOUND,
+        data: notFoundProductIds
       });
     }
     const result = await dataStore_logic_default.create({
-      expireDate: sql3`now() + interval '1 hour'`,
+      expireDate: sql3`now() + interval '${DATA_STORE_EXPIRY_HOURS} hour'`,
       data: {
         warehouseInId: body[0].warehouseId,
         transactionKind: "ORDER",
@@ -148166,62 +148172,76 @@ var WarehouseItemLogic;
     });
     return result;
   };
+  const createInitialTransaction = (item, userId, employeeId) => ({
+    itemId: item.id,
+    productId: item.productId,
+    transactionType: "IN",
+    transactionKind: "TRANSFER",
+    quantity: item.quantity,
+    quantityBefore: 0,
+    quantityAfter: item.quantity,
+    description: TRANSACTION_DESCRIPTION_IN,
+    employeeId,
+    userId
+  });
+  const separateNewAndExistingItems = async (body) => {
+    const productIds = body.map((item) => item.productId);
+    const currentItems = await db_default.select().from(warehouseItemTable).where(inArray(warehouseItemTable.productId, productIds));
+    const currentItemKeys = new Set(currentItems.map((item) => `${item.productId}-${item.warehouseId}`));
+    const newItems = body.filter((item) => !currentItemKeys.has(`${item.productId}-${item.warehouseId}`));
+    return { newItems, currentItems };
+  };
+  const processNewItemsBatch = async (batch, user2, employeeId) => {
+    const inserted = await db_default.insert(warehouseItemTable).values(batch).returning();
+    await db_default.insert(warehouseItemTransactionTable).values(inserted.map((item) => createInitialTransaction(item, user2.id, employeeId)));
+    return inserted;
+  };
+  const calculateProgress = (current, total) => ({
+    percent: Math.min(Math.round(current / total * 100), 100),
+    count: current,
+    total
+  });
   WarehouseItemLogic.createMany = async function* (body, user2) {
     if (!user2.employeeId) {
-      throw 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.");
+      throw status("Bad Request", ERRORS.EMPLOYEE_REQUIRED);
     }
-    const BATCH_SIZE = 1000;
-    const currentItems = await db_default.select().from(warehouseItemTable).where(inArray(warehouseItemTable.productId, body.map((item) => item.productId)));
-    const newItems = body.filter((item) => currentItems.filter((i2) => i2.productId === item.productId && i2.warehouseId === item.warehouseId).length === 0);
+    const { newItems, currentItems } = await separateNewAndExistingItems(body);
     for (let i2 = 0;i2 < newItems.length; i2 += BATCH_SIZE) {
       const batch = newItems.slice(i2, i2 + BATCH_SIZE);
-      const inserted = await db_default.insert(warehouseItemTable).values(batch).returning();
-      await db_default.insert(warehouseItemTransactionTable).values(inserted.map((i3) => ({
-        itemId: i3.id,
-        productId: i3.productId,
-        transactionType: "IN",
-        transactionKind: "TRANSFER",
-        quantity: i3.quantity,
-        quantityBefore: 0,
-        quantityAfter: i3.quantity,
-        description: "\u0411\u0430\u0440\u0430\u0430 \u043E\u0440\u043B\u043E\u0433\u0434\u043E\u0445",
-        employeeId: user2.employeeId ?? "",
-        userId: user2.id
-      })));
-      const percent = Math.round((i2 * BATCH_SIZE + batch.length) / newItems.length * 100);
+      await processNewItemsBatch(batch, user2, user2.employeeId);
       yield {
-        percent: percent >= 100 ? 100 : percent,
-        count: i2,
-        total: body.length,
+        ...calculateProgress(i2 + batch.length, newItems.length),
         type: "New Items"
       };
     }
-    for (const [index2, item] of currentItems.entries()) {
-      const bodyItem = body.find((i2) => i2.productId === item.productId);
-      const res = await WarehouseItemLogic.changeQuantity({
-        itemId: item.id,
-        quantityChange: bodyItem?.quantity ?? 0,
-        transactionDetails: {
-          transactionType: "IN",
-          transactionKind: "TRANSFER",
-          description: "\u0411\u0430\u0440\u0430\u0430 \u043E\u0440\u043B\u043E\u0433\u0434\u043E\u0445"
+    for (const [index2, currentItem] of currentItems.entries()) {
+      const matchingBodyItem = body.find((item) => item.productId === currentItem.productId && item.warehouseId === currentItem.warehouseId);
+      if (matchingBodyItem && matchingBodyItem.quantity !== undefined) {
+        const result = await WarehouseItemLogic.changeQuantity({
+          itemId: currentItem.id,
+          quantityChange: matchingBodyItem.quantity,
+          transactionDetails: {
+            transactionType: "IN",
+            transactionKind: "TRANSFER",
+            description: TRANSACTION_DESCRIPTION_IN
+          }
+        }, user2);
+        if ("code" in result) {
+          yield result;
         }
-      }, user2);
-      if ("code" in res) {
-        yield res;
       }
-      const percent = Math.round(index2 / currentItems.length * 100);
       yield {
-        percent: percent >= 100 ? 100 : percent,
-        count: index2,
-        total: currentItems.length,
+        ...calculateProgress(index2 + 1, currentItems.length),
         type: "Current Items"
       };
     }
   };
+  const buildTransactionFilter = (query, user2) => {
+    return and(softDeletedFilter(warehouseItemTransactionTable), eq(user.companyId, user2.companyId), ...query.product ? [logic_default8.getFilter(query.product, user2)] : [], eq(warehouseItemTransactionTable.transactionType, query.transactionType ?? "IN").if(query.transactionType), eq(warehouseItemTransactionTable.transactionKind, query.transactionKind ?? "TRANSFER").if(query.transactionKind), eq(warehouseItemTransactionTable.employeeId, query.employeeId ?? "").if(query.employeeId), eq(warehouseItemTransactionTable.userId, query.userId ?? "").if(query.userId), eq(warehouseItemTransactionTable.salesId, query.salesId ?? "").if(query.salesId), eq(warehouseItemTransactionTable.orderId, query.orderId ?? "").if(query.orderId), eq(warehouseItemTransactionTable.transferId, query.transferId ?? "").if(query.transferId), eq(warehouseItemTransactionTable.itemId, query.itemId ?? "").if(query.itemId), gte(warehouseItemTransactionTable.createdAt, query.dateFrom ?? "").if(query.dateFrom), lte(warehouseItemTransactionTable.createdAt, query.dateTo ?? "").if(query.dateTo), gte(warehouseItemTransactionTable.quantity, query.minQuantity ?? 0).if(query.minQuantity), lte(warehouseItemTransactionTable.quantity, query.maxQuantity ?? 0).if(query.maxQuantity), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId));
+  };
   WarehouseItemLogic.selectTransaction = async (query, user2) => {
+    const filter = buildTransactionFilter(query, user2);
     const columns = getTableColumns(warehouseItemTransactionTable);
-    const filter = and(softDeletedFilter(warehouseItemTransactionTable), eq(user.companyId, user2.companyId), ...query.product ? [logic_default8.getFilter(query.product, user2)] : [], eq(warehouseItemTransactionTable.transactionType, query.transactionType ?? "IN").if(query.transactionType), eq(warehouseItemTransactionTable.transactionKind, query.transactionKind ?? "TRANSFER").if(query.transactionKind), eq(warehouseItemTransactionTable.employeeId, query.employeeId ?? "").if(query.employeeId), eq(warehouseItemTransactionTable.userId, query.userId ?? "").if(query.userId), eq(warehouseItemTransactionTable.salesId, query.salesId ?? "").if(query.salesId), eq(warehouseItemTransactionTable.orderId, query.orderId ?? "").if(query.orderId), eq(warehouseItemTransactionTable.transferId, query.transferId ?? "").if(query.transferId), eq(warehouseItemTransactionTable.itemId, query.itemId ?? "").if(query.itemId), gte(warehouseItemTransactionTable.createdAt, query.dateFrom ?? "").if(query.dateFrom), lte(warehouseItemTransactionTable.createdAt, query.dateTo ?? "").if(query.dateTo), gte(warehouseItemTransactionTable.quantity, query.minQuantity ?? 0).if(query.minQuantity), lte(warehouseItemTransactionTable.quantity, query.maxQuantity ?? 0).if(query.maxQuantity), eq(warehouseItemTable.warehouseId, query.warehouseId).if(query.warehouseId));
     const baseQuery = db_default.select({
       ...columns,
       totalCount: totalCountSql,
@@ -148233,14 +148253,7 @@ var WarehouseItemLogic;
       }
     }).from(warehouseItemTransactionTable).where(filter).leftJoin(warehouseProductTable, eq(warehouseItemTransactionTable.productId, warehouseProductTable.id)).leftJoin(warehouseItemTable, eq(warehouseItemTransactionTable.itemId, warehouseItemTable.id)).leftJoin(user, eq(warehouseItemTransactionTable.userId, user.id)).orderBy(desc(warehouseItemTransactionTable.createdAt)).$dynamic();
     const result = await pagination_helper_default(baseQuery, query.pagination);
-    const content = {
-      totalCount: result[0]?.totalCount ?? 0,
-      totalPage: result.length === 0 ? 0 : Math.ceil(result[0].totalCount / query.pagination.size)
-    };
-    return {
-      result: result.map(({ totalCount, ...item }) => item),
-      ...content
-    };
+    return getPaginationContent(result, query.pagination.size);
   };
   WarehouseItemLogic.changeQuantity = async ({
     itemId,
@@ -148248,16 +148261,16 @@ var WarehouseItemLogic;
     transactionDetails
   }, user2, tdb = db_default) => {
     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.");
+      return status("Bad Request", ERRORS.EMPLOYEE_REQUIRED);
     }
     const [currentItem] = await tdb.select().from(warehouseItemTable).where(eq(warehouseItemTable.id, itemId)).limit(1);
     if (!currentItem) {
-      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.");
+      return status("Not Found", ERRORS.ITEM_NOT_FOUND);
     }
     const quantityBefore = currentItem.quantity;
     const quantityAfter = quantityBefore + quantityChange;
     if (transactionDetails.transactionType === "OUT" && quantityAfter < 0) {
-      return status("Bad Request", "\u0411\u0430\u0440\u0430\u0430\u043D\u044B \u04AF\u043B\u0434\u044D\u0433\u0434\u044D\u043B \u0445\u04AF\u0440\u044D\u043B\u0446\u044D\u0445\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430.");
+      return status("Bad Request", ERRORS.INSUFFICIENT_STOCK);
     }
     const [updatedItem] = await tdb.update(warehouseItemTable).set({
       quantity: quantityAfter,
@@ -152148,8 +152161,9 @@ var DiscountLogic;
   DiscountLogic.selectAppliesByCpOrderId = async (cpOrderId) => {
     const appliedDiscounts = await db_default.select({
       apply: crmDiscountApplyTable,
-      discount: crmDiscountTable
-    }).from(crmDiscountApplyTable).leftJoin(crmDiscountTable, eq(crmDiscountTable.id, crmDiscountApplyTable.discountId)).where(Array.isArray(cpOrderId) ? inArray(crmDiscountApplyTable.cpOrderId, cpOrderId) : eq(crmDiscountApplyTable.cpOrderId, cpOrderId)).orderBy(crmDiscountApplyTable.createdAt);
+      discount: crmDiscountTable,
+      item: crmCpOrderItemTable
+    }).from(crmDiscountApplyTable).leftJoin(crmDiscountTable, eq(crmDiscountTable.id, crmDiscountApplyTable.discountId)).leftJoin(crmCpOrderItemTable, eq(crmCpOrderItemTable.id, crmDiscountApplyTable.cpOrderItemId)).where(Array.isArray(cpOrderId) ? inArray(crmDiscountApplyTable.cpOrderId, cpOrderId) : eq(crmDiscountApplyTable.cpOrderId, cpOrderId)).orderBy(crmDiscountApplyTable.createdAt);
     return appliedDiscounts;
   };
   DiscountLogic.create = async (body, user2) => {
@@ -156355,7 +156369,7 @@ var WarehouseWarehouseLogic;
     return result;
   };
   WarehouseWarehouseLogic.update = async (id, body, user2) => {
-    const [result] = await db_default.update(warehouseWarehouseTable).set(body).where(and(eq(warehouseWarehouseTable.id, id), eq(warehouseWarehouseTable.companyId, user2.companyId), eq(warehouseWarehouseTable.branchId, user2.branchId))).returning();
+    const [result] = await db_default.update(warehouseWarehouseTable).set(body).where(and(eq(warehouseWarehouseTable.id, id), eq(warehouseWarehouseTable.companyId, user2.companyId), eq(warehouseWarehouseTable.branchId, user2.branchId).if(user2.kind === "CUSTOMER"))).returning();
     if (!result) {
       return status("Not Found", "\u0410\u0433\u0443\u0443\u043B\u0430\u0445 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }

package/package.json

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