autosync_backend2 1.0.78 → 1.0.79

package/dist/index.d.ts

@@ -1458,10 +1458,12 @@ declare const app: Elysia<"", {
                     headers: unknown;
                     response: {
                         200: {
-                            pageCount: number;
-                            totalCount: number;
+                            pageQuantity: number;
+                            totalQuantity: number;
                             pagePrice: number;
                             totalPrice: number;
+                            totalCount: number;
+                            totalPage: number;
                             result: {
                                 inventory: {
                                     name: string;

package/dist/index.js

@@ -15775,6 +15775,7 @@ __export(exports_schema, {
   verification: () => verification,
   userRoleEnum: () => userRoleEnum,
   user: () => user,
+  statusEnum: () => statusEnum,
   session: () => session,
   permissionTable: () => permissionTable,
   permissionGroupTable: () => permissionGroupTable,
@@ -15782,6 +15783,10 @@ __export(exports_schema, {
   merchantTable: () => merchantTable,
   merchantSchema: () => merchantSchema,
   logTable: () => logTable,
+  inventoryTransferRequestTable: () => inventoryTransferRequestTable,
+  inventoryTransferRequestRelations: () => inventoryTransferRequestRelations,
+  inventoryTransferRequestItemTable: () => inventoryTransferRequestItemTable,
+  inventoryTransferRequestItemRelations: () => inventoryTransferRequestItemRelations,
   inventorySupplierTable: () => inventorySupplierTable,
   inventorySchema: () => inventorySchema,
   inventoryRefundTable: () => inventoryRefundTable,
@@ -18802,6 +18807,12 @@ function extractTablesRelationalConfig(schema, configHelpers) {
   }
   return { tables: tablesConfig, tableNamesMap };
 }
+function relations(table, relations2) {
+  return new Relations(table, (helpers) => Object.fromEntries(Object.entries(relations2(helpers)).map(([key, value]) => [
+    key,
+    value.withFieldName(key)
+  ])));
+}
 function createOne(sourceTable) {
   return function one(table, config) {
     return new One(sourceTable, table, config, config?.fields.reduce((res, f) => res && f.notNull, true) ?? false);
@@ -21015,14 +21026,46 @@ var inventoryRefundTable = inventorySchema.table("refund", {
   merchantId: uuid().notNull(),
   branchId: uuid().notNull(),
   isApproved: boolean().default(false),
-  userId: uuid().notNull(),
-  approvedUserId: uuid()
+  userId: text().notNull(),
+  approvedUserId: text()
 });
 var inventorySupplierTable = inventorySchema.table("supplier", {
   ...base_schema_helper_default,
   name: varchar().notNull(),
   image: varchar()
 });
+var statusEnum = inventorySchema.enum("status", [
+  "\u0417\u04E9\u0432\u0448\u04E9\u04E9\u0440\u04E9\u0433\u0434\u0441\u04E9\u043D",
+  "\u0426\u0443\u0446\u043B\u0430\u0433\u0434\u0441\u0430\u043D",
+  "\u0425\u04AF\u043B\u044D\u044D\u0433\u0434\u044D\u0436 \u0431\u0443\u0439"
+]);
+var inventoryTransferRequestTable = inventorySchema.table("transfer_request", {
+  ...base_schema_helper_default,
+  status: statusEnum().notNull().default("\u0425\u04AF\u043B\u044D\u044D\u0433\u0434\u044D\u0436 \u0431\u0443\u0439"),
+  createdUserId: text().notNull(),
+  branchId: uuid().notNull(),
+  merchantId: uuid().notNull(),
+  to: uuid().notNull()
+});
+var inventoryTransferRequestRelations = relations(inventoryTransferRequestTable, ({ many }) => ({
+  items: many(inventoryTransferRequestItemTable)
+}));
+var inventoryTransferRequestItemTable = inventorySchema.table("transfer_request_item", {
+  ...base_schema_helper_default,
+  itemId: uuid().notNull(),
+  quantity: numeric({ mode: "number" }).notNull(),
+  requestId: uuid().notNull()
+});
+var inventoryTransferRequestItemRelations = relations(inventoryTransferRequestItemTable, ({ one }) => ({
+  request: one(inventoryTransferRequestTable, {
+    fields: [inventoryTransferRequestItemTable.requestId],
+    references: [inventoryTransferRequestTable.id]
+  }),
+  item: one(inventoryItemTable, {
+    fields: [inventoryTransferRequestItemTable.itemId],
+    references: [inventoryItemTable.id]
+  })
+}));
 // src/lib/db/schema/common.schema.ts
 var logTable = pgTable("log", {
   ...base_schema_helper_default,
@@ -73426,6 +73469,7 @@ var permission_default = permissionMacro;
 function withPagination(qb, { size, page }) {
   return qb.limit(size).offset((page - 1) * size);
 }
+var totalCountSql = sql`count(*) over()`.mapWith(Number);
 var pagination_helper_default = withPagination;
 
 // src/lib/db/helpers/soft-delete.helper.ts
@@ -95953,20 +95997,30 @@ var InventoryLogLogic;
     const base = db_default.select({
       ...columns,
       inventory: inventoryItemTable,
-      pageCount: sql`COALESCE(sum(${inventoryLogTable.quantity}), 0)`.mapWith(Number),
-      totalCount: sql`COALESCE(sum(${inventoryLogTable.quantity}) over(), 0)`.mapWith(Number),
+      pageQuantity: sql`COALESCE(sum(${inventoryLogTable.quantity}), 0)`.mapWith(Number),
+      totalQuantity: sql`COALESCE(sum(${inventoryLogTable.quantity}) over(), 0)`.mapWith(Number),
       pagePrice: sql`sum(${inventoryLogTable.sellPrice} * ${inventoryLogTable.quantity})`.mapWith(Number),
-      totalPrice: sql`sum(${inventoryLogTable.sellPrice} * ${inventoryLogTable.quantity}) over()`.mapWith(Number)
-    }).from(inventoryLogTable).innerJoin(inventoryItemTable, eq(inventoryLogTable.itemId, inventoryItemTable.id)).where(filter).groupBy(inventoryLogTable.id).$dynamic();
+      totalPrice: sql`sum(${inventoryLogTable.sellPrice} * ${inventoryLogTable.quantity}) over()`.mapWith(Number),
+      totalCount: totalCountSql
+    }).from(inventoryLogTable).innerJoin(inventoryItemTable, eq(inventoryLogTable.itemId, inventoryItemTable.id)).where(filter).groupBy(inventoryLogTable.id, inventoryItemTable.id).$dynamic();
     const inventoryLogs = await pagination_helper_default(base, query.pagination);
     const content = {
-      pageCount: inventoryLogs[0]?.pageCount ?? 0,
-      totalCount: inventoryLogs[0]?.totalCount ?? 0,
+      pageQuantity: inventoryLogs[0]?.pageQuantity ?? 0,
+      totalQuantity: inventoryLogs[0]?.totalQuantity ?? 0,
       pagePrice: inventoryLogs[0]?.pagePrice ?? 0,
-      totalPrice: inventoryLogs[0]?.totalPrice ?? 0
+      totalPrice: inventoryLogs[0]?.totalPrice ?? 0,
+      totalCount: inventoryLogs[0]?.totalCount ?? 0,
+      totalPage: inventoryLogs.length === 0 ? 0 : Math.ceil(inventoryLogs[0].totalCount / query.pagination.size)
     };
     return {
-      result: inventoryLogs.map(({ pageCount, totalCount, pagePrice, totalPrice, ...item }) => item),
+      result: inventoryLogs.map(({
+        pageQuantity,
+        totalQuantity,
+        pagePrice,
+        totalPrice,
+        totalCount,
+        ...item
+      }) => item),
       ...content
     };
   };
@@ -96329,7 +96383,7 @@ var InventoryItemLogic;
       totalQuantity: sql`COALESCE(sum(${inventoryItemTable.quantity}) over(), 0)`.mapWith(Number),
       pagePrice: sql`sum(${inventoryItemTable.sellPrice} * ${inventoryItemTable.quantity})`.mapWith(Number),
       totalPrice: sql`sum(${inventoryItemTable.sellPrice} * ${inventoryItemTable.quantity}) over()`.mapWith(Number),
-      totalCount: sql`count(*) over()`.mapWith(Number)
+      totalCount: totalCountSql
     }).from(inventoryItemTable).where(InventoryItemLogic.getInventoryItemFilter(query, user2)).groupBy(inventoryItemTable.id).$dynamic();
     const inventoryItems = await pagination_helper_default(base, query.pagination);
     const content = {
@@ -96352,8 +96406,8 @@ var InventoryItemLogic;
       ...content
     };
   };
-  InventoryItemLogic.create = async (body, user2) => {
-    return await db_default.transaction(async (db2) => {
+  InventoryItemLogic.create = async (body, user2, desc2, tdb = db_default) => {
+    return await tdb.transaction(async (db2) => {
       const [inventoryItem] = await db2.insert(inventoryItemTable).values({
         ...body,
         branchId: body.branchId ?? user2.branchId,
@@ -96363,7 +96417,7 @@ var InventoryItemLogic;
         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.",
+          description: desc2 ?? "\u0413\u0430\u0440\u0430\u0430\u0440 \u0431\u0430\u0440\u0430\u0430 \u043D\u044D\u043C\u0441\u044D\u043D.",
           userId: user2.id
         }, db2);
       }
@@ -96513,7 +96567,7 @@ var InventoryRefundLogic;
     const baseQuery = db_default.select({
       ...columns,
       inventory: inventoryItemTable,
-      totalCount: sql`count(*) over()`.mapWith(Number)
+      totalCount: totalCountSql
     }).from(inventoryRefundTable).where(filter).innerJoin(inventoryItemTable, eq(inventoryRefundTable.itemId, inventoryItemTable.id)).$dynamic();
     const refunds = await pagination_helper_default(baseQuery, query.pagination);
     const content = {
@@ -96535,20 +96589,20 @@ var InventoryRefundLogic;
     return refund;
   };
   InventoryRefundLogic.approve = async (id, user2) => {
-    const currentRefund = await db_default.select({
+    const [currentRefund] = await db_default.select({
       isApproved: inventoryRefundTable.isApproved
     }).from(inventoryRefundTable).where(and(eq(inventoryRefundTable.id, id), eq(inventoryRefundTable.merchantId, user2.merchantId)));
-    if (currentRefund.length === 0) {
+    if (!currentRefund) {
       return status("Not Found", "\u0411\u0443\u0446\u0430\u0430\u043B\u0442 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
     }
-    if (currentRefund[0].isApproved) {
+    if (currentRefund.isApproved) {
       return status("Bad Request", "\u0411\u0443\u0446\u0430\u0430\u043B\u0442 \u0437\u04E9\u0432\u0448\u04E9\u04E9\u0440\u04E9\u0433\u0434\u0441\u04E9\u043D \u0431\u0430\u0439\u043D\u0430.");
     }
-    return await db_default.transaction(async (db2) => {
+    return db_default.transaction(async (db2) => {
       const [refund] = await db2.update(inventoryRefundTable).set({
         isApproved: true,
         approvedUserId: user2.id
-      }).returning();
+      }).where(eq(inventoryRefundTable.id, id)).returning();
       await logic_default.handleQuantityChange({
         id: refund.itemId,
         quantity: refund.quantity,
@@ -96612,7 +96666,7 @@ var InventorySupplierLogic;
     const columns = getTableColumns(inventorySupplierTable);
     const baseQuery = db_default.select({
       ...columns,
-      totalCount: sql`count(*) over()`.mapWith(Number)
+      totalCount: totalCountSql
     }).from(inventorySupplierTable).where(softDeletedFilter(inventorySupplierTable)).$dynamic();
     const suppliers = await pagination_helper_default(baseQuery, query.pagination);
     const content = {
@@ -96684,7 +96738,6 @@ class CrudHelper {
   }
   async get(input, filter) {
     const wheres = [softDeletedFilter(this.table)];
-    console.log(input);
     if (!filter) {
       const tableKeys = Object.keys(this.table);
       for (const key of Object.keys(input)) {
@@ -96706,7 +96759,7 @@ class CrudHelper {
     const columns = getTableColumns(this.table);
     const baseQuery = db_default.select({
       ...columns,
-      totalCount: sql`count(*) over()`.mapWith(Number)
+      totalCount: totalCountSql
     }).from(this.table).where(filter ?? and(...wheres)).$dynamic();
     const result = await pagination_helper_default(baseQuery, input.pagination);
     const content = {
@@ -97067,7 +97120,7 @@ var PermissionLogic;
     const columns = getTableColumns(permissionGroupTable);
     const baseQuery = db_default.select({
       ...columns,
-      totalCount: sql`count(*) over()`.mapWith(Number)
+      totalCount: totalCountSql
     }).from(permissionGroupTable).where(softDeletedFilter(permissionGroupTable)).$dynamic();
     const permissionGroups = await pagination_helper_default(baseQuery, query.pagination);
     const content = {
@@ -97266,7 +97319,7 @@ var UserLogic;
     const columns = getTableColumns(user);
     const baseQuery = db_default.select({
       ...columns,
-      totalCount: sql`count(*) over()`.mapWith(Number)
+      totalCount: totalCountSql
     }).from(user).where(filter).$dynamic();
     const users = await pagination_helper_default(baseQuery, query.pagination);
     const userPermissions2 = await logic_default6.selectByUserId(users.map((u) => u.id));

package/package.json

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