diff --git a/server/src/modules/user_resource_permissions/interface/group-permissions.interface.ts b/server/src/modules/user_resource_permissions/interface/group-permissions.interface.ts index 36bf097507..3542bbe82b 100644 --- a/server/src/modules/user_resource_permissions/interface/group-permissions.interface.ts +++ b/server/src/modules/user_resource_permissions/interface/group-permissions.interface.ts @@ -1,3 +1,4 @@ +import { GroupPermissions } from 'src/entities/group_permissions.entity'; import { GROUP_PERMISSIONS_TYPE, USER_ROLE } from '../constants/group-permissions.constant'; import { SearchParamItem } from '@helpers/db-utility/db-utility.interface'; @@ -26,3 +27,8 @@ export interface AddUserRoleObject { role: USER_ROLE; userId: string; } + +export interface GetUsersResponse { + groupPermissions: GroupPermissions[]; + length: number; +} diff --git a/server/src/services/group_permissions.service.v2.ts b/server/src/services/group_permissions.service.v2.ts index 2de022102a..baa82c146c 100644 --- a/server/src/services/group_permissions.service.v2.ts +++ b/server/src/services/group_permissions.service.v2.ts @@ -10,7 +10,10 @@ import { } from '@module/user_resource_permissions/constants/group-permissions.constant'; import { dbTransactionWrap, catchDbException } from 'src/helpers/utils.helper'; import { EntityManager, getManager } from 'typeorm'; -import { CreateDefaultGroupObject } from '@module/user_resource_permissions/interface/group-permissions.interface'; +import { + CreateDefaultGroupObject, + GetUsersResponse, +} from '@module/user_resource_permissions/interface/group-permissions.interface'; import { GroupUsers } from 'src/entities/group_users.entity'; import { GranularPermissionsService } from './granular_permissions.service'; import { @@ -50,12 +53,17 @@ export class GroupPermissionsServiceV2 { }, manager); } - async getAllGroup(organizationId: string) { + async getAllGroup(organizationId: string): Promise { const manager: EntityManager = getManager(); - return await manager.findAndCount(GroupPermissions, { + const result = await manager.findAndCount(GroupPermissions, { where: { organizationId }, order: { type: 'DESC' }, }); + const response: GetUsersResponse = { + groupPermissions: result[0], + length: result[1], + }; + return response; } async getGroup(id: string, manager?: EntityManager): Promise {