autosync_backend2 1.0.76 → 1.0.78

package/dist/index.d.ts

@@ -1208,10 +1208,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: {
                                 name: string;
                                 partNumber: string;
@@ -1640,6 +1642,171 @@ declare const app: Elysia<"", {
                 };
             };
         };
+    } & {
+        inventory: {
+            refund: {};
+        } & {
+            refund: {
+                get: {
+                    body: unknown;
+                    params: {};
+                    query: {
+                        date?: string | undefined;
+                        branchId?: string | undefined;
+                        inventory?: {
+                            type?: "Сэлбэг" | "Тос" | "Дугуй" | "Будаг" | "Аккумлятор" | undefined;
+                            search?: string | undefined;
+                            branchId?: string | undefined;
+                            sellPrice?: number | undefined;
+                            supplierId?: string | undefined;
+                            safetyStock?: number | undefined;
+                            alias?: string | undefined;
+                            shelfNumber?: string | undefined;
+                        } | undefined;
+                        isApproved?: boolean | undefined;
+                        pagination: {
+                            size: number;
+                            page: number;
+                        };
+                    };
+                    headers: unknown;
+                    response: {
+                        200: {
+                            totalCount: number;
+                            totalPage: number;
+                            result: {
+                                inventory: {
+                                    name: string;
+                                    partNumber: string;
+                                    quantity: number;
+                                    sellPrice: number;
+                                    buyPrice: number;
+                                    supplierId: string;
+                                    merchantId: string;
+                                    branchId: string;
+                                    type: "Сэлбэг" | "Тос" | "Дугуй" | "Будаг" | "Аккумлятор" | null;
+                                    barCode: string | null;
+                                    safetyStock: number | null;
+                                    alias: string | null;
+                                    oen: string | null;
+                                    shelfNumber: string | null;
+                                    description: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                itemId: string;
+                                quantity: number;
+                                images: string[];
+                                description: string | null;
+                                merchantId: string;
+                                branchId: string;
+                                isApproved: boolean | null;
+                                userId: string;
+                                approvedUserId: 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;
+                        };
+                    };
+                };
+            };
+        } & {
+            refund: {
+                post: {
+                    body: {
+                        description?: string | null | undefined;
+                        quantity: number;
+                        itemId: string;
+                        images: string[];
+                    };
+                    params: {};
+                    query: unknown;
+                    headers: unknown;
+                    response: {
+                        200: {
+                            id: string;
+                            createdAt: string;
+                            updatedAt: string;
+                            merchantId: string;
+                            branchId: string;
+                            userId: string;
+                            deletedAt: string | null;
+                            quantity: number;
+                            description: string | null;
+                            itemId: string;
+                            images: string[];
+                            isApproved: boolean | null;
+                            approvedUserId: string | null;
+                        };
+                        422: {
+                            type: "validation";
+                            on: string;
+                            summary?: string;
+                            message?: string;
+                            found?: unknown;
+                            property?: string;
+                            expected?: string;
+                        };
+                    };
+                };
+            };
+        } & {
+            refund: {
+                ":id": {
+                    approve: {
+                        post: {
+                            body: unknown;
+                            params: {
+                                id: string;
+                            };
+                            query: unknown;
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    itemId: string;
+                                    quantity: number;
+                                    images: string[];
+                                    description: string | null;
+                                    merchantId: string;
+                                    branchId: string;
+                                    isApproved: boolean | null;
+                                    userId: string;
+                                    approvedUserId: string | null;
+                                    id: string;
+                                    createdAt: string;
+                                    updatedAt: string;
+                                    deletedAt: string | null;
+                                };
+                                404: "Буцаалт олдсонгүй.";
+                                400: "Буцаалт зөвшөөрөгдсөн байна.";
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
     };
 } & {
     api: {

package/dist/index.js

@@ -73424,7 +73424,7 @@ var permission_default = permissionMacro;
 
 // src/lib/db/helpers/pagination.helper.ts
 function withPagination(qb, { size, page }) {
-  return qb.limit(size).offset((page - 1) * page);
+  return qb.limit(size).offset((page - 1) * size);
 }
 var pagination_helper_default = withPagination;
 
@@ -96325,20 +96325,30 @@ var InventoryItemLogic;
     const columns = getTableColumns(inventoryItemTable);
     const base = db_default.select({
       ...columns,
-      pageCount: sql`COALESCE(sum(${inventoryItemTable.quantity}), 0)`.mapWith(Number),
-      totalCount: sql`COALESCE(sum(${inventoryItemTable.quantity}) over(), 0)`.mapWith(Number),
+      pageQuantity: sql`COALESCE(sum(${inventoryItemTable.quantity}), 0)`.mapWith(Number),
+      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)
+      totalPrice: sql`sum(${inventoryItemTable.sellPrice} * ${inventoryItemTable.quantity}) over()`.mapWith(Number),
+      totalCount: sql`count(*) over()`.mapWith(Number)
     }).from(inventoryItemTable).where(InventoryItemLogic.getInventoryItemFilter(query, user2)).groupBy(inventoryItemTable.id).$dynamic();
     const inventoryItems = await pagination_helper_default(base, query.pagination);
     const content = {
-      pageCount: inventoryItems[0]?.pageCount ?? 0,
-      totalCount: inventoryItems[0]?.totalCount ?? 0,
+      pageQuantity: inventoryItems[0]?.pageQuantity ?? 0,
+      totalQuantity: inventoryItems[0]?.totalQuantity ?? 0,
       pagePrice: inventoryItems[0]?.pagePrice ?? 0,
-      totalPrice: inventoryItems[0]?.totalPrice ?? 0
+      totalPrice: inventoryItems[0]?.totalPrice ?? 0,
+      totalCount: inventoryItems[0]?.totalCount ?? 0,
+      totalPage: inventoryItems.length === 0 ? 0 : Math.ceil(inventoryItems[0].totalCount / query.pagination.size)
     };
     return {
-      result: inventoryItems.map(({ pageCount, totalCount, pagePrice, totalPrice, ...item }) => item),
+      result: inventoryItems.map(({
+        pageQuantity,
+        totalQuantity,
+        pagePrice,
+        totalPrice,
+        totalCount,
+        ...item
+      }) => item),
       ...content
     };
   };
@@ -96494,6 +96504,107 @@ var logRoutes = new Elysia({
 });
 var log_default = logRoutes;
 
+// src/routes/inventory/refund/logic.ts
+var InventoryRefundLogic;
+((InventoryRefundLogic) => {
+  InventoryRefundLogic.select = async (query, user2) => {
+    const filter = and(logic_default.getInventoryItemFilter(query.inventory ?? {}, user2), sql`date(${inventoryRefundTable.createdAt}) = ${query.date}`.if(query.date), eq(inventoryRefundTable.merchantId, user2.merchantId), eq(inventoryRefundTable.branchId, query.branchId ?? user2.branchId));
+    const columns = getTableColumns(inventoryRefundTable);
+    const baseQuery = db_default.select({
+      ...columns,
+      inventory: inventoryItemTable,
+      totalCount: sql`count(*) over()`.mapWith(Number)
+    }).from(inventoryRefundTable).where(filter).innerJoin(inventoryItemTable, eq(inventoryRefundTable.itemId, inventoryItemTable.id)).$dynamic();
+    const refunds = await pagination_helper_default(baseQuery, query.pagination);
+    const content = {
+      totalCount: refunds[0]?.totalCount ?? 0,
+      totalPage: refunds.length === 0 ? 0 : Math.ceil(refunds[0].totalCount / query.pagination.size)
+    };
+    return {
+      result: refunds.map(({ totalCount, ...item }) => item),
+      ...content
+    };
+  };
+  InventoryRefundLogic.create = async (body, user2) => {
+    const [refund] = await db_default.insert(inventoryRefundTable).values({
+      ...body,
+      merchantId: user2.merchantId,
+      branchId: user2.branchId,
+      userId: user2.id
+    }).returning();
+    return refund;
+  };
+  InventoryRefundLogic.approve = async (id, user2) => {
+    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) {
+      return status("Not Found", "\u0411\u0443\u0446\u0430\u0430\u043B\u0442 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
+    }
+    if (currentRefund[0].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) => {
+      const [refund] = await db2.update(inventoryRefundTable).set({
+        isApproved: true,
+        approvedUserId: user2.id
+      }).returning();
+      await logic_default.handleQuantityChange({
+        id: refund.itemId,
+        quantity: refund.quantity,
+        description: "\u0411\u0443\u0446\u0430\u0430\u043B\u0442\u0430\u0430\u0441 \u043D\u044D\u043C\u044D\u0433\u0434\u0441\u044D\u043D."
+      }, user2, db2);
+      return refund;
+    });
+  };
+})(InventoryRefundLogic ||= {});
+var logic_default3 = InventoryRefundLogic;
+
+// src/routes/inventory/refund/schema.ts
+var create3 = createInsertSchema(inventoryRefundTable);
+var createInventoryRefundSchema = OmitBaseSchema(t.Omit(create3, [
+  "userId",
+  "approvedUserId",
+  "isApproved",
+  "merchantId",
+  "branchId"
+]));
+var selectInventoryRefundSchema = t.Composite([
+  t.Partial(t.Object({
+    date: t.String({ format: "date" }),
+    inventory: t.Omit(selectInventoryItemSchema, ["pagination"]),
+    isApproved: t.Boolean(),
+    branchId: t.String({ format: "uuid" })
+  })),
+  PaginationSchema
+]);
+
+// src/routes/inventory/refund/index.ts
+var refundRoutes = new Elysia({
+  prefix: "/refund"
+}).use(better_auth_default).use(permission_default).guard({
+  auth: true,
+  tags: ["InventoryRefund"]
+}).get("/", async ({ user: user2, query }) => logic_default3.select(query, user2), {
+  query: selectInventoryRefundSchema,
+  permission: [
+    "INVENTORY_REFUND_SELECT_OWN",
+    "INVENTORY_REFUND_SELECT_ADMIN"
+  ],
+  beforeHandle: async ({ permissions, query }) => {
+    if (query.branchId && !permissions.includes("INVENTORY_REFUND_SELECT_ADMIN")) {
+      return status("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_default3.create(body, user2), {
+  body: createInventoryRefundSchema,
+  permission: "INVENTORY_REFUND_CREATE_OWN"
+}).post("/:id/approve", async ({ params: { id }, user: user2 }) => await logic_default3.approve(id, user2), {
+  params: IdSchema,
+  permission: "INVENTORY_REFUND_APPROVE_ADMIN"
+});
+var refund_default = refundRoutes;
+
 // src/routes/inventory/supplier/logic.ts
 var InventorySupplierLogic;
 ((InventorySupplierLogic) => {
@@ -96533,12 +96644,12 @@ var InventorySupplierLogic;
     }
   };
 })(InventorySupplierLogic ||= {});
-var logic_default3 = InventorySupplierLogic;
+var logic_default4 = InventorySupplierLogic;
 
 // src/routes/inventory/supplier/schema.ts
-var create3 = createInsertSchema(inventorySupplierTable);
+var create4 = createInsertSchema(inventorySupplierTable);
 var update2 = createInsertSchema(inventorySupplierTable);
-var createInventorySupplierSchema = OmitBaseSchema(create3);
+var createInventorySupplierSchema = OmitBaseSchema(create4);
 var updateInventorySupplierSchema = OmitBaseSchema(update2);
 
 // src/routes/inventory/supplier/index.ts
@@ -96546,21 +96657,21 @@ var supplierRoutes = new Elysia({
   prefix: "/supplier"
 }).guard({
   tags: ["InventorySupplier"]
-}).get("/", async ({ query }) => await logic_default3.select(query), {
+}).get("/", async ({ query }) => await logic_default4.select(query), {
   query: PaginationSchema
-}).post("/", async ({ body }) => await logic_default3.create(body), {
+}).post("/", async ({ body }) => await logic_default4.create(body), {
   body: createInventorySupplierSchema
 }).guard({
   params: IdSchema
-}).put("/:id", async ({ params: { id }, body }) => await logic_default3.update(id, body), {
+}).put("/:id", async ({ params: { id }, body }) => await logic_default4.update(id, body), {
   body: updateInventorySupplierSchema
-}).delete("/:id", async ({ params: { id } }) => await logic_default3.remove(id));
+}).delete("/:id", async ({ params: { id } }) => await logic_default4.remove(id));
 var supplier_default = supplierRoutes;
 
 // src/routes/inventory/index.ts
 var inventorySchemaRoutes = new Elysia({
   prefix: "/inventory"
-}).use(item_default).use(log_default).use(supplier_default);
+}).use(item_default).use(log_default).use(supplier_default).use(refund_default);
 var inventory_default = inventorySchemaRoutes;
 
 // src/lib/db/helpers/crud.helper.ts
@@ -96645,17 +96756,17 @@ var MerchantBranchLogic;
     return branch;
   };
 })(MerchantBranchLogic ||= {});
-var logic_default4 = MerchantBranchLogic;
+var logic_default5 = MerchantBranchLogic;
 
 // src/routes/merchant/branch/schema.ts
-var create4 = createInsertSchema(branchTable, {
+var create5 = createInsertSchema(branchTable, {
   phone: (schema3) => t.RegExp(/^\d{8}$/, { ...schema3 }),
   email: (schema3) => t.String({ ...schema3, format: "email" }),
   merchantId: (schema3) => t.Optional(schema3)
 });
 var update3 = createUpdateSchema(branchTable);
 var select2 = createSelectSchema(branchTable);
-var createBranchSchema = OmitBaseSchema(create4);
+var createBranchSchema = OmitBaseSchema(create5);
 var updateBranchSchema = OmitBaseSchema(update3);
 var selectBranchSchema = t.Composite([
   t.Partial(select2),
@@ -96672,7 +96783,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_default4.create(body, user2, permissions), {
+}).post("/", async ({ body, user: user2, permissions }) => await logic_default5.create(body, user2, permissions), {
   body: createBranchSchema,
   permission: "MERCHANT_BRANCH_CREATE"
 }).guard({
@@ -96681,13 +96792,13 @@ var branchRoutes = new Elysia({
 var branch_default = branchRoutes;
 
 // src/routes/merchant/merchant/schema.ts
-var create5 = createInsertSchema(merchantTable);
+var create6 = createInsertSchema(merchantTable);
 var update4 = createUpdateSchema(merchantTable);
 var select3 = createSelectSchema(merchantTable, {
   phone: t.RegExp(/^\d{8}$/),
   email: t.String({ format: "email" })
 });
-var createMerchantSchema = OmitBaseSchema(create5);
+var createMerchantSchema = OmitBaseSchema(create6);
 var updateMerchantSchema = OmitBaseSchema(update4);
 var selectMerchantSchema = t.Composite([
   t.Partial(t.Pick(select3, ["phone", "regNumber", "serviceName", "isActive"])),
@@ -96726,9 +96837,9 @@ var merchantRoutes = new Elysia({
 var merchant_default = merchantRoutes;
 
 // src/routes/merchant/package/schema.ts
-var create6 = createInsertSchema(packageTable);
+var create7 = createInsertSchema(packageTable);
 var update5 = createUpdateSchema(packageTable);
-var createPackageSchema = OmitBaseSchema(create6);
+var createPackageSchema = OmitBaseSchema(create7);
 var updatePackageSchema = OmitBaseSchema(update5);
 
 // src/routes/merchant/package/index.ts
@@ -96826,13 +96937,13 @@ var inventoryRefundPermissions = [
     description: "\u0421\u0430\u043B\u0431\u0430\u0440 \u0441\u043E\u043D\u0433\u043E\u0436 \u0430\u0433\u0443\u0443\u043B\u0430\u0445\u044B\u043D \u0431\u0443\u0446\u0430\u0430\u043B\u0442 \u0431\u0430\u0442\u043B\u0430\u0445"
   }
 ];
-var refund_default = inventoryRefundPermissions;
+var refund_default2 = inventoryRefundPermissions;
 
 // src/lib/permissions/inventory/index.ts
 var inventoryPermissionList = [
   ...item_default2,
   ...log_default2,
-  ...refund_default
+  ...refund_default2
 ];
 var inventory_default2 = inventoryPermissionList;
 
@@ -96981,7 +97092,7 @@ var PermissionLogic;
     return permissions;
   };
 })(PermissionLogic ||= {});
-var logic_default5 = PermissionLogic;
+var logic_default6 = PermissionLogic;
 
 // src/routes/permission/schema.ts
 var addPermissionSchema = t.Object({
@@ -97008,7 +97119,7 @@ var permissionRoutes = new Elysia({
   return permissionList;
 }, {
   permission: "PERMISSION_ADD"
-}).post("/", ({ body }) => logic_default5.addPermission(body), {
+}).post("/", ({ body }) => logic_default6.addPermission(body), {
   body: addPermissionSchema,
   permission: "PERMISSION_ADD",
   beforeHandle({ status: status2, body, permissions, publicPermissions }) {
@@ -97020,7 +97131,7 @@ var permissionRoutes = new Elysia({
   }
 }).group("/group", (app) => app.guard({
   permission: "PERMISSION_GROUP_ALL"
-}).get("/", async ({ query }) => await logic_default5.selectGroups(query), {
+}).get("/", async ({ query }) => await logic_default6.selectGroups(query), {
   query: selectPermissionGroupSchema
 }).post("/", async ({ body }) => await groupService.create(body), {
   body: createPermissionGroupSchema
@@ -97158,7 +97269,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_default5.selectByUserId(users.map((u) => u.id));
+    const userPermissions2 = await logic_default6.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)
@@ -97202,7 +97313,7 @@ var UserLogic;
       }
     });
     try {
-      await logic_default5.addPermission({
+      await logic_default6.addPermission({
         permissions: body.permissions,
         userId: result.user.id
       });
@@ -97217,7 +97328,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_default5.addPermission({
+      await logic_default6.addPermission({
         permissions: body.permissions,
         userId: updatedUser.id
       }, db2);
@@ -97225,18 +97336,18 @@ var UserLogic;
     });
   };
 })(UserLogic ||= {});
-var logic_default6 = UserLogic;
+var logic_default7 = UserLogic;
 
 // src/routes/user/schema.ts
 var select4 = createSelectSchema(user);
-var create7 = createInsertSchema(user);
+var create8 = createInsertSchema(user);
 var update6 = createUpdateSchema(user);
 var selectUserSchema = t.Composite([
   PaginationSchema,
   t.Partial(t.Pick(select4, ["branchId"]))
 ]);
 var createUserSchema = t.Composite([
-  t.Pick(create7, ["name", "email"]),
+  t.Pick(create8, ["name", "email"]),
   t.Object({
     password: t.Optional(t.String()),
     merchantId: t.Optional(t.String({ format: "uuid" })),
@@ -97257,17 +97368,17 @@ var userRoutes = new Elysia({
 }).use(better_auth_default).use(permission_default).guard({
   auth: true,
   tags: ["User"]
-}).get("/", async ({ query, user: user2, permissions }) => logic_default6.select(query, user2, permissions), {
+}).get("/", async ({ query, user: user2, permissions }) => logic_default7.select(query, user2, permissions), {
   query: selectUserSchema,
   permission: [
     "USER_SELECT_BACKOFFICE",
     "USER_SELECT_ADMIN",
     "USER_SELECT_OWN"
   ]
-}).post("/", async ({ body, user: user2, permissions }) => logic_default6.registerUser(body, user2, permissions), {
+}).post("/", async ({ body, user: user2, permissions }) => logic_default7.registerUser(body, user2, permissions), {
   body: createUserSchema,
   permission: ["USER_CREATE_ADMIN", "USER_CREATE_OWN"]
-}).put("/:id", async ({ body, user: user2, permissions, params: { id } }) => logic_default6.update(id, body, user2, permissions), {
+}).put("/:id", async ({ body, user: user2, permissions, params: { id } }) => logic_default7.update(id, body, user2, permissions), {
   body: updateUserSchema,
   permission: ["USER_CREATE_ADMIN", "USER_CREATE_OWN"]
 });
@@ -97287,8 +97398,6 @@ var app = new Elysia().use(index_default({
   allowedHeaders: ["Content-Type", "Authorization"]
 })).use(index_default2({
   documentation: {
-    components: await OpenAPI.components,
-    paths: await OpenAPI.getPaths(),
     tags: swagger_tags_default
   }
 })).use(pino_logger_default).onAfterResponse(async ({ request, response, server, status: status2, set: set2, body, headers }) => {

package/package.json

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