server: refactor pagination

* fix transaction usgae in repos
* other bug fixes

apps/server/src/core/auth/services/signup.service.ts

@@ -67,24 +67,6 @@ export class SignupService {
     );
   }
 
-  async createWorkspace(
-    user: User,
-    workspaceName: string,
-    trx?: KyselyTransaction,
-  ) {
-    return await executeTx(
-      this.db,
-      async (trx) => {
-        const workspaceData: CreateWorkspaceDto = {
-          name: workspaceName,
-        };
-
-        return await this.workspaceService.create(user, workspaceData, trx);
-      },
-      trx,
-    );
-  }
-
   async initialSetup(
     createAdminUserDto: CreateAdminUserDto,
     trx?: KyselyTransaction,
@@ -94,9 +76,15 @@ export class SignupService {
       async (trx) => {
         // create user
         const user = await this.userRepo.insertUser(createAdminUserDto, trx);
-        const workspace = await this.createWorkspace(
+
+        // create workspace with full setup
+        const workspaceData: CreateWorkspaceDto = {
+          name: createAdminUserDto.workspaceName,
+        };
+
+        const workspace = await this.workspaceService.create(
           user,
-          createAdminUserDto.workspaceName,
+          workspaceData,
           trx,
         );
 

apps/server/src/core/comment/comment.controller.ts

@@ -13,7 +13,7 @@ import { CommentsInput, SingleCommentInput } from './dto/comments.input';
 import { AuthUser } from '../../decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
-import { PaginationOptions } from 'src/helpers/pagination/pagination-options';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 
 @UseGuards(JwtAuthGuard)

apps/server/src/core/comment/comment.service.ts

@@ -4,9 +4,8 @@ import { UpdateCommentDto } from './dto/update-comment.dto';
 import { PageService } from '../page/services/page.service';
 import { CommentRepo } from '@docmost/db/repos/comment/comment.repo';
 import { Comment } from '@docmost/db/types/entity.types';
-import { PaginationOptions } from 'src/helpers/pagination/pagination-options';
-import { PaginatedResult } from 'src/helpers/pagination/paginated-result';
-import { PaginationMetaDto } from 'src/helpers/pagination/pagination-meta-dto';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class CommentService {
@@ -63,15 +62,14 @@ export class CommentService {
 
   async findByPageId(
     pageId: string,
-    paginationOptions: PaginationOptions,
-  ): Promise<PaginatedResult<Comment>> {
-    const { comments, count } = await this.commentRepo.findPageComments(
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Comment>> {
+    const pageComments = await this.commentRepo.findPageComments(
       pageId,
-      paginationOptions,
+      pagination,
     );
 
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-    return new PaginatedResult(comments, paginationMeta);
+    return pageComments;
   }
 
   async update(

apps/server/src/core/group/group.controller.ts

@@ -12,7 +12,7 @@ import { AuthUser } from '../../decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
 import { GroupUserService } from './services/group-user.service';
 import { GroupIdDto } from './dto/group-id.dto';
-import { PaginationOptions } from '../../helpers/pagination/pagination-options';
+import { PaginationOptions } from '../../kysely/pagination/pagination-options';
 import { AddGroupUserDto } from './dto/add-group-user.dto';
 import { RemoveGroupUserDto } from './dto/remove-group-user.dto';
 import { UpdateGroupDto } from './dto/update-group.dto';

apps/server/src/core/group/services/group-user.service.ts

@@ -1,14 +1,16 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
-import { PaginationOptions } from '../../../helpers/pagination/pagination-options';
-import { PaginationMetaDto } from '../../../helpers/pagination/pagination-meta-dto';
-import { PaginatedResult } from '../../../helpers/pagination/paginated-result';
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { PaginationOptions } from '../../../kysely/pagination/pagination-options';
 import { GroupService } from './group.service';
 import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { executeTx } from '@docmost/db/utils';
 import { InjectKysely } from 'nestjs-kysely';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
 import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo';
-import { User } from '@docmost/db/types/entity.types';
+import { UserRepo } from '@docmost/db/repos/user/user.repo';
 
 @Injectable()
 export class GroupUserService {
@@ -16,24 +18,23 @@ export class GroupUserService {
     private groupRepo: GroupRepo,
     private groupUserRepo: GroupUserRepo,
     private groupService: GroupService,
+    private userRepo: UserRepo,
     @InjectKysely() private readonly db: KyselyDB,
   ) {}
 
   async getGroupUsers(
     groupId: string,
     workspaceId: string,
-    paginationOptions: PaginationOptions,
-  ): Promise<PaginatedResult<User>> {
+    pagination: PaginationOptions,
+  ) {
     await this.groupService.findAndValidateGroup(groupId, workspaceId);
 
-    const { users, count } = await this.groupUserRepo.getGroupUsersPaginated(
+    const groupUsers = await this.groupUserRepo.getGroupUsersPaginated(
       groupId,
-      paginationOptions,
+      pagination,
     );
 
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-
-    return new PaginatedResult(users, paginationMeta);
+    return groupUsers;
   }
 
   async addUserToDefaultGroup(
@@ -63,7 +64,18 @@ export class GroupUserService {
     await executeTx(
       this.db,
       async (trx) => {
-        // await this.groupService.findAndValidateGroup(groupId, workspaceId);
+        await this.groupService.findAndValidateGroup(groupId, workspaceId);
+        const user = await this.userRepo.findById(
+          userId,
+          workspaceId,
+          false,
+          trx,
+        );
+
+        if (!user) {
+          throw new NotFoundException('User not found');
+        }
+
         const groupUserExists = await this.groupUserRepo.getGroupUserById(
           userId,
           groupId,
@@ -98,6 +110,12 @@ export class GroupUserService {
       workspaceId,
     );
 
+    const user = await this.userRepo.findById(userId, workspaceId);
+
+    if (!user) {
+      throw new NotFoundException('User not found');
+    }
+
     if (group.isDefault) {
       throw new BadRequestException(
         'You cannot remove users from a default group',

apps/server/src/core/group/services/group.service.ts

@@ -4,13 +4,12 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { CreateGroupDto, DefaultGroup } from '../dto/create-group.dto';
-import { PaginationMetaDto } from '../../../helpers/pagination/pagination-meta-dto';
-import { PaginatedResult } from '../../../helpers/pagination/paginated-result';
-import { PaginationOptions } from '../../../helpers/pagination/pagination-options';
+import { PaginationOptions } from '../../../kysely/pagination/pagination-options';
 import { UpdateGroupDto } from '../dto/update-group.dto';
 import { KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
 import { Group, InsertableGroup, User } from '@docmost/db/types/entity.types';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class GroupService {
@@ -71,15 +70,16 @@ export class GroupService {
       throw new BadRequestException('You cannot update a default group');
     }
 
-    const groupExists = await this.groupRepo.findByName(
-      updateGroupDto.name,
-      workspaceId,
-    );
-    if (groupExists) {
-      throw new BadRequestException('Group name already exists');
-    }
-
     if (updateGroupDto.name) {
+      const existingGroup = await this.groupRepo.findByName(
+        updateGroupDto.name,
+        workspaceId,
+      );
+
+      if (existingGroup && group.name !== existingGroup.name) {
+        throw new BadRequestException('Group name already exists');
+      }
+
       group.name = updateGroupDto.name;
     }
 
@@ -100,7 +100,6 @@ export class GroupService {
   }
 
   async getGroupInfo(groupId: string, workspaceId: string): Promise<Group> {
-    // todo: add member count
     const group = await this.groupRepo.findById(groupId, workspaceId);
 
     if (!group) {
@@ -113,15 +112,12 @@ export class GroupService {
   async getWorkspaceGroups(
     workspaceId: string,
     paginationOptions: PaginationOptions,
-  ): Promise<PaginatedResult<Group>> {
-    const { groups, count } = await this.groupRepo.getGroupsPaginated(
+  ): Promise<PaginationResult<Group>> {
+    const groups = await this.groupRepo.getGroupsPaginated(
       workspaceId,
       paginationOptions,
     );
-
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-
-    return new PaginatedResult(groups, paginationMeta);
+    return groups;
   }
 
   async deleteGroup(groupId: string, workspaceId: string): Promise<void> {

apps/server/src/core/page/dto/create-page.dto.ts

@@ -14,9 +14,9 @@ export class CreatePageDto {
   icon?: string;
 
   @IsOptional()
-  @IsString()
+  @IsUUID()
   parentPageId?: string;
 
-  @IsString()
+  @IsUUID()
   spaceId: string;
 }

apps/server/src/core/page/dto/delete-page.dto.ts

@@ -1,6 +0,0 @@
-import { IsUUID } from 'class-validator';
-
-export class DeletePageDto {
-  @IsUUID()
-  pageId: string;
-}

apps/server/src/core/page/dto/history-details.dto.ts

@@ -1,6 +0,0 @@
-import { IsUUID } from 'class-validator';
-
-export class HistoryDetailsDto {
-  @IsUUID()
-  historyId: string;
-}

apps/server/src/core/page/dto/page-details.dto.ts

@@ -1,6 +0,0 @@
-import { IsUUID } from 'class-validator';
-
-export class PageDetailsDto {
-  @IsUUID()
-  pageId: string;
-}

apps/server/src/core/page/dto/page-history.dto.ts

@@ -1,6 +0,0 @@
-import { IsUUID } from 'class-validator';
-
-export class PageHistoryDto {
-  @IsUUID()
-  pageId: string;
-}

apps/server/src/core/page/dto/page.dto.ts

@@ -0,0 +1,16 @@
+import { IsUUID } from 'class-validator';
+
+export class PageIdDto {
+  @IsUUID()
+  pageId: string;
+}
+
+export class SpaceIdDto {
+  @IsUUID()
+  spaceId: string;
+}
+
+export class PageHistoryIdDto {
+  @IsUUID()
+  historyId: string;
+}

apps/server/src/core/page/page.controller.ts

@@ -10,16 +10,13 @@ import { PageService } from './services/page.service';
 import { CreatePageDto } from './dto/create-page.dto';
 import { UpdatePageDto } from './dto/update-page.dto';
 import { MovePageDto } from './dto/move-page.dto';
-import { PageDetailsDto } from './dto/page-details.dto';
-import { DeletePageDto } from './dto/delete-page.dto';
+import { PageHistoryIdDto, PageIdDto, SpaceIdDto } from './dto/page.dto';
 import { PageOrderingService } from './services/page-ordering.service';
 import { PageHistoryService } from './services/page-history.service';
-import { HistoryDetailsDto } from './dto/history-details.dto';
-import { PageHistoryDto } from './dto/page-history.dto';
 import { AuthUser } from '../../decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
-import { PaginationOptions } from 'src/helpers/pagination/pagination-options';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 
 @UseGuards(JwtAuthGuard)
@@ -33,8 +30,8 @@ export class PageController {
 
   @HttpCode(HttpStatus.OK)
   @Post('/info')
-  async getPage(@Body() input: PageDetailsDto) {
-    return this.pageService.findById(input.pageId);
+  async getPage(@Body() pageIdDto: PageIdDto) {
+    return this.pageService.findById(pageIdDto.pageId);
   }
 
   @HttpCode(HttpStatus.CREATED)
@@ -59,13 +56,13 @@ export class PageController {
 
   @HttpCode(HttpStatus.OK)
   @Post('delete')
-  async delete(@Body() deletePageDto: DeletePageDto) {
-    await this.pageService.forceDelete(deletePageDto.pageId);
+  async delete(@Body() pageIdDto: PageIdDto) {
+    await this.pageService.forceDelete(pageIdDto.pageId);
   }
 
   @HttpCode(HttpStatus.OK)
   @Post('restore')
-  async restore(@Body() deletePageDto: DeletePageDto) {
+  async restore(@Body() pageIdDto: PageIdDto) {
     //  await this.pageService.restore(deletePageDto.id);
   }
 
@@ -78,10 +75,10 @@ export class PageController {
   @HttpCode(HttpStatus.OK)
   @Post('recent')
   async getRecentSpacePages(
-    @Body() { spaceId },
+    @Body() spaceIdDto: SpaceIdDto,
     @Body() pagination: PaginationOptions,
   ) {
-    return this.pageService.getRecentSpacePages(spaceId, pagination);
+    return this.pageService.getRecentSpacePages(spaceIdDto.spaceId, pagination);
   }
 
   @HttpCode(HttpStatus.OK)
@@ -106,7 +103,7 @@ export class PageController {
   @HttpCode(HttpStatus.OK)
   @Post('/history')
   async getPageHistory(
-    @Body() dto: PageHistoryDto,
+    @Body() dto: PageIdDto,
     @Body() pagination: PaginationOptions,
   ) {
     return this.pageHistoryService.findHistoryByPageId(dto.pageId, pagination);
@@ -114,7 +111,7 @@ export class PageController {
 
   @HttpCode(HttpStatus.OK)
   @Post('/history/details')
-  async get(@Body() dto: HistoryDetailsDto) {
+  async get(@Body() dto: PageHistoryIdDto) {
     return this.pageHistoryService.findById(dto.historyId);
   }
 }

apps/server/src/core/page/services/page-history.service.ts

@@ -1,9 +1,8 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { PageHistoryRepo } from '@docmost/db/repos/page/page-history.repo';
 import { Page, PageHistory } from '@docmost/db/types/entity.types';
-import { PaginationOptions } from 'src/helpers/pagination/pagination-options';
-import { PaginatedResult } from 'src/helpers/pagination/paginated-result';
-import { PaginationMetaDto } from 'src/helpers/pagination/pagination-meta-dto';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class PageHistoryService {
@@ -35,14 +34,12 @@ export class PageHistoryService {
   async findHistoryByPageId(
     pageId: string,
     paginationOptions: PaginationOptions,
-  ) {
-    const { pageHistory, count } =
-      await this.pageHistoryRepo.findPageHistoryByPageId(
-        pageId,
-        paginationOptions,
-      );
+  ): Promise<PaginationResult<any>> {
+    const pageHistory = await this.pageHistoryRepo.findPageHistoryByPageId(
+      pageId,
+      paginationOptions,
+    );
 
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-    return new PaginatedResult(pageHistory, paginationMeta);
+    return pageHistory;
   }
 }

apps/server/src/core/page/services/page.service.ts

@@ -11,9 +11,8 @@ import { PageWithOrderingDto } from '../dto/page-with-ordering.dto';
 import { transformPageResult } from '../page.util';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { Page } from '@docmost/db/types/entity.types';
-import { PaginationOptions } from 'src/helpers/pagination/pagination-options';
-import { PaginationMetaDto } from 'src/helpers/pagination/pagination-meta-dto';
-import { PaginatedResult } from 'src/helpers/pagination/paginated-result';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class PageService {
@@ -96,6 +95,30 @@ export class PageService {
     );
   }
 
+  async getSidebarPagesBySpaceId(
+    spaceId: string,
+    limit = 200,
+  ): Promise<PageWithOrderingDto[]> {
+    const pages = await this.pageRepo.getSpaceSidebarPages(spaceId, limit);
+    return transformPageResult(pages);
+  }
+
+  async getRecentSpacePages(
+    spaceId: string,
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Page>> {
+    const pages = await this.pageRepo.getRecentPagesInSpace(
+      spaceId,
+      pagination,
+    );
+
+    return pages;
+  }
+
+  async forceDelete(pageId: string): Promise<void> {
+    await this.pageRepo.deletePage(pageId);
+  }
+
   /*
   // TODO: page deletion and restoration
   async delete(pageId: string): Promise<void> {
@@ -186,29 +209,4 @@ export class PageService {
     }
   }
 */
-  async forceDelete(pageId: string): Promise<void> {
-    await this.pageRepo.deletePage(pageId);
-  }
-
-  async getSidebarPagesBySpaceId(
-    spaceId: string,
-    limit = 200,
-  ): Promise<PageWithOrderingDto[]> {
-    const pages = await this.pageRepo.getSpaceSidebarPages(spaceId, limit);
-    return transformPageResult(pages);
-  }
-
-  async getRecentSpacePages(
-    spaceId: string,
-    paginationOptions: PaginationOptions,
-  ): Promise<PaginatedResult<Page>> {
-    const { pages, count } = await this.pageRepo.getRecentPagesInSpace(
-      spaceId,
-      paginationOptions,
-    );
-
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-
-    return new PaginatedResult(pages, paginationMeta);
-  }
 }

apps/server/src/core/space/services/space-member.service.ts

@@ -1,7 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { PaginationOptions } from '../../../helpers/pagination/pagination-options';
-import { PaginationMetaDto } from '../../../helpers/pagination/pagination-meta-dto';
-import { PaginatedResult } from '../../../helpers/pagination/paginated-result';
+import { PaginationOptions } from '../../../kysely/pagination/pagination-options';
 import { KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 import { SpaceMember } from '@docmost/db/types/entity.types';
@@ -53,10 +51,29 @@ export class SpaceMemberService {
   }
 
   /*
-   * get spaces a user is a member of
-   * either by direct membership or via groups
+   * get members of a space.
+   * can be a group or user
    */
-  /*
+  async getSpaceMembers(
+    spaceId: string,
+    workspaceId: string,
+    pagination: PaginationOptions,
+  ) {
+    //todo: validate the space is inside the workspace
+    const members = await this.spaceMemberRepo.getSpaceMembersPaginated(
+      spaceId,
+      pagination,
+    );
+
+    return members;
+  }
+}
+
+/*
+ * get spaces a user is a member of
+ * either by direct membership or via groups
+ */
+/*
   async getUserSpaces(
     userId: string,
     workspaceId: string,
@@ -82,25 +99,3 @@ export class SpaceMemberService {
     return new PaginatedResult(spaces, paginationMeta);
   }
 */
-
-  /*
-   * get members of a space.
-   * can be a group or user
-   */
-  async getSpaceMembers(
-    spaceId: string,
-    workspaceId: string,
-    paginationOptions: PaginationOptions,
-  ) {
-    //todo: validate the space is inside the workspace
-    const { members, count } =
-      await this.spaceMemberRepo.getSpaceMembersPaginated(
-        spaceId,
-        paginationOptions,
-      );
-
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-    return new PaginatedResult(members, paginationMeta);
-  }
-}
-// 231 lines

apps/server/src/core/space/services/space.service.ts

@@ -4,13 +4,12 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { CreateSpaceDto } from '../dto/create-space.dto';
-import { PaginationOptions } from '../../../helpers/pagination/pagination-options';
-import { PaginationMetaDto } from '../../../helpers/pagination/pagination-meta-dto';
-import { PaginatedResult } from '../../../helpers/pagination/paginated-result';
+import { PaginationOptions } from '../../../kysely/pagination/pagination-options';
 import slugify from 'slugify';
 import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 import { KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { Space } from '@docmost/db/types/entity.types';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class SpaceService {
@@ -46,7 +45,6 @@ export class SpaceService {
   }
 
   async getSpaceInfo(spaceId: string, workspaceId: string): Promise<Space> {
-    // TODO: add memberCount
     const space = await this.spaceRepo.findById(spaceId, workspaceId);
     if (!space) {
       throw new NotFoundException('Space not found');
@@ -57,15 +55,13 @@ export class SpaceService {
 
   async getWorkspaceSpaces(
     workspaceId: string,
-    paginationOptions: PaginationOptions,
-  ): Promise<PaginatedResult<Space>> {
-    const { spaces, count } = await this.spaceRepo.getSpacesInWorkspace(
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<Space>> {
+    const spaces = await this.spaceRepo.getSpacesInWorkspace(
       workspaceId,
-      paginationOptions,
+      pagination,
     );
 
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-
-    return new PaginatedResult(spaces, paginationMeta);
+    return spaces;
   }
 }

apps/server/src/core/space/space.controller.ts

@@ -11,7 +11,7 @@ import { AuthUser } from '../../decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../guards/jwt-auth.guard';
 import { SpaceIdDto } from './dto/space-id.dto';
-import { PaginationOptions } from '../../helpers/pagination/pagination-options';
+import { PaginationOptions } from '../../kysely/pagination/pagination-options';
 import { SpaceMemberService } from './services/space-member.service';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 

apps/server/src/core/workspace/controllers/workspace.controller.ts

@@ -12,7 +12,7 @@ import { DeleteWorkspaceDto } from '../dto/delete-workspace.dto';
 import { UpdateWorkspaceUserRoleDto } from '../dto/update-workspace-user-role.dto';
 import { AuthUser } from '../../../decorators/auth-user.decorator';
 import { AuthWorkspace } from '../../../decorators/auth-workspace.decorator';
-import { PaginationOptions } from '../../../helpers/pagination/pagination-options';
+import { PaginationOptions } from '../../../kysely/pagination/pagination-options';
 import { WorkspaceInvitationService } from '../services/workspace-invitation.service';
 import { Public } from '../../../decorators/public.decorator';
 import {

apps/server/src/core/workspace/services/workspace-user.service.ts

@@ -1,11 +1,10 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { UpdateWorkspaceUserRoleDto } from '../dto/update-workspace-user-role.dto';
-import { PaginationOptions } from '../../../helpers/pagination/pagination-options';
-import { PaginationMetaDto } from '../../../helpers/pagination/pagination-meta-dto';
-import { PaginatedResult } from '../../../helpers/pagination/paginated-result';
+import { PaginationOptions } from '../../../kysely/pagination/pagination-options';
 import { UserRole } from '../../../helpers/types/permission';
 import { UserRepo } from '@docmost/db/repos/user/user.repo';
 import { User } from '@docmost/db/types/entity.types';
+import { PaginationResult } from '@docmost/db/pagination/pagination';
 
 @Injectable()
 export class WorkspaceUserService {
@@ -13,15 +12,14 @@ export class WorkspaceUserService {
 
   async getWorkspaceUsers(
     workspaceId: string,
-    paginationOptions: PaginationOptions,
-  ): Promise<PaginatedResult<any>> {
-    const { users, count } = await this.userRepo.getUsersPaginated(
+    pagination: PaginationOptions,
+  ): Promise<PaginationResult<User>> {
+    const users = await this.userRepo.getUsersPaginated(
       workspaceId,
-      paginationOptions,
+      pagination,
     );
 
-    const paginationMeta = new PaginationMetaDto({ count, paginationOptions });
-    return new PaginatedResult(users, paginationMeta);
+    return users;
   }
 
   async updateWorkspaceUserRole(