autosync_backend2 1.0.67 → 1.0.68

package/dist/index.d.ts

@@ -2114,16 +2114,19 @@ declare const app: Elysia<"", {
                         200: {
                             totalCount: number;
                             totalPage: number;
-                            result: Omit<{
+                            result: {
+                                permissions: {
+                                    readonly code: import("./lib/permissions").PermissionCode;
+                                    description: string;
+                                    requiresAdmin?: boolean;
+                                }[];
+                                totalCount: number;
                                 name: string;
                                 id: string;
                                 createdAt: string;
                                 updatedAt: string;
                                 deletedAt: string | null;
-                                permissions: string[];
-                            } & {
-                                totalCount: number;
-                            }, "totalCount">[];
+                            }[];
                         };
                         422: {
                             type: "validation";
@@ -2230,34 +2233,6 @@ declare const app: Elysia<"", {
                     };
                 };
             };
-        } & {
-            group: {
-                get: {
-                    body: unknown;
-                    params: {
-                        id: string;
-                    } & {};
-                    query: unknown;
-                    headers: unknown;
-                    response: {
-                        200: {
-                            readonly code: import("./lib/permissions").PermissionCode;
-                            description: string;
-                            requiresAdmin?: boolean;
-                        }[];
-                        404: "Эрхийн багц олдсонгүй.";
-                        422: {
-                            type: "validation";
-                            on: string;
-                            summary?: string;
-                            message?: string;
-                            found?: unknown;
-                            property?: string;
-                            expected?: string;
-                        };
-                    };
-                };
-            };
         };
     };
 } & {

package/dist/index.js

@@ -71760,6 +71760,7 @@ var addPermissionSchema = t.Object({
 });
 var createGroup = createInsertSchema(permissionGroupTable);
 var updateGroup = createUpdateSchema(permissionGroupTable);
+var selectPermissionGroupSchema = PaginationSchema;
 var createPermissionGroupSchema = OmitBaseSchema(createGroup);
 var updatePremissionGroupSchema = OmitBaseSchema(updateGroup);
 
@@ -71935,14 +71936,25 @@ var PermissionLogic = {
     await db_default.delete(permissionTable).where(eq(permissionTable.userId, body.userId));
     await db_default.insert(permissionTable).values(insert);
   },
-  selectByGroup: async (groupId) => {
-    const permissionGroup = await db_default.query.permissionGroupTable.findFirst({
-      where: eq(permissionGroupTable.id, groupId)
-    });
-    if (!permissionGroup) {
-      return status("Not Found", "\u042D\u0440\u0445\u0438\u0439\u043D \u0431\u0430\u0433\u0446 \u043E\u043B\u0434\u0441\u043E\u043D\u0433\u04AF\u0439.");
-    }
-    return permissionList.filter((p) => permissionGroup.permissions.includes(p.code));
+  selectGroups: async (query) => {
+    const columns = getTableColumns(permissionGroupTable);
+    const baseQuery = db_default.select({
+      ...columns,
+      totalCount: sql`count(*) over()`.mapWith(Number)
+    }).from(permissionGroupTable).where(softDeletedFilter(permissionGroupTable)).$dynamic();
+    const permissionGroups = await pagination_helper_default(baseQuery, query.pagination);
+    const content = {
+      totalCount: permissionGroups[0]?.totalCount ?? 0,
+      totalPage: permissionGroups.length === 0 ? 0 : Math.ceil(permissionGroups[0].totalCount / query.pagination.size)
+    };
+    const result = permissionGroups.map((pg2) => ({
+      ...pg2,
+      permissions: permissionList.filter((p) => pg2.permissions.includes(p.code))
+    }));
+    return {
+      result,
+      ...content
+    };
   }
 };
 var logic_default4 = PermissionLogic;
@@ -71973,15 +71985,15 @@ var permissionRoutes = new Elysia({
   }
 }).group("/group", (app) => app.guard({
   permission: "PERMISSION_GROUP_ALL"
-}).get("/", async ({ query }) => await groupService.get(query), {
-  query: PaginationSchema
+}).get("/", async ({ query }) => await logic_default4.selectGroups(query), {
+  query: selectPermissionGroupSchema
 }).post("/", async ({ body }) => await groupService.create(body), {
   body: createPermissionGroupSchema
 }).guard({
   params: IdSchema
 }).put("/:id", async ({ body, params: { id } }) => groupService.update(id, body), {
   body: updatePremissionGroupSchema
-}).delete("/:id", async ({ params: { id } }) => groupService.delete(id)).get("/", async ({ params: { id } }) => logic_default4.selectByGroup(id)));
+}).delete("/:id", async ({ params: { id } }) => groupService.delete(id)));
 var permission_default3 = permissionRoutes;
 
 // src/routes/user/schema.ts

package/package.json

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