roles

src/modules/roles/controllers/roles.controller.ts

@@ -1,10 +1,9 @@
-import { Controller, Get, Post, Body, Param, Patch, Delete, Query, UseGuards } from '@nestjs/common';
+import { Controller, Get, Post, Body, Param, Patch, Delete, UseGuards } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBody, ApiResponse, ApiBearerAuth } from '@nestjs/swagger';
 import { RolesService } from '../providers/roles.service';
 import { PermissionsService } from '../providers/permissions.service';
 import { CreateRoleDto } from '../dto/create-role.dto';
 import { UpdateRoleDto } from '../dto/update-role.dto';
-import { FindRolesDto } from '../dto/find-roles.dto';
 import { AdminAuthGuard } from 'src/modules/auth/guards/adminAuth.guard';
 import { Permissions } from 'src/modules/auth/decorators/permissions.decorator';
 import { RestId } from 'src/common/decorators';
@@ -21,17 +20,17 @@ export class RolesController {
   ) {}
 
   @Get()
-  @ApiOperation({ summary: 'Get all roles with pagination and filters' })
-  @ApiResponse({ status: 200, description: 'Roles retrieved successfully' })
-  findAll(@Query() dto: FindRolesDto, @RestId() restId: string) {
-    return this.roleService.findAll(restId, dto);
+  @ApiOperation({ summary: 'Get all through restaurant roles with pagination and filters' })
+  @ApiResponse({ status: 200, description: 'Restaurant roles retrieved successfully' })
+  findAll(@RestId() restId: string) {
+    return this.roleService.findAllGeneralAndRestaurantRoles(restId);
   }
 
   @Get('permissions')
   @ApiOperation({ summary: 'Get all permissions that the admin has' })
   @ApiResponse({ status: 200, description: 'Permissions retrieved successfully' })
   async findAllPermissions(@AdminId() adminId: string, @RestId() restId: string) {
-    const adminPermissionNames = await this.permissionService.getFullAdminPermissions(adminId, restId);
+    const adminPermissionNames = await this.permissionService.getAdminFullPermissions(adminId, restId);
 
     return adminPermissionNames;
   }
@@ -42,7 +41,7 @@ export class RolesController {
   @ApiBody({ type: CreateRoleDto })
   @ApiResponse({ status: 201, description: 'Role created successfully' })
   create(@Body() dto: CreateRoleDto, @RestId() restId: string) {
-    return this.roleService.create(restId, dto);
+    return this.roleService.createRestaurantRole(dto, restId);
   }
 
   @Get(':id')

src/modules/roles/dto/find-roles.dto.ts

@@ -1,24 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsOptional, IsString, IsNumber, Min } from 'class-validator';
-import { Type } from 'class-transformer';
-
-export class FindRolesDto {
-  @ApiProperty({ description: 'Search by role name', required: false })
-  @IsOptional()
-  @IsString()
-  name?: string;
-
-  @ApiProperty({ description: 'Page number', required: false, default: 1 })
-  @IsOptional()
-  @Type(() => Number)
-  @IsNumber()
-  @Min(1)
-  page?: number;
-
-  @ApiProperty({ description: 'Items per page', required: false, default: 20 })
-  @IsOptional()
-  @Type(() => Number)
-  @IsNumber()
-  @Min(1)
-  limit?: number;
-}

src/modules/roles/providers/permissions.service.ts

@@ -75,7 +75,7 @@ export class PermissionsService {
     return permissions.flat().map(p => p.name);
   }
 
-  async getFullAdminPermissions(adminId: string, restId: string): Promise<Permission[]> {
+  async getAdminFullPermissions(adminId: string, restId: string): Promise<Permission[]> {
     const admin = await this.adminRepository.findOne(
       { id: adminId, roles: { restaurant: { id: restId } } },
       { populate: ['roles', 'roles.role', 'roles.role.permissions'] },

src/modules/roles/providers/roles.service.ts

@@ -1,13 +1,12 @@
 import { Injectable, NotFoundException, BadRequestException } from '@nestjs/common';
 import { InjectRepository } from '@mikro-orm/nestjs';
-import { EntityRepository } from '@mikro-orm/core';
+import { EntityRepository, FilterQuery } from '@mikro-orm/core';
 import { Role } from '../entities/role.entity';
 import { Permission } from '../entities/permission.entity';
 import { Restaurant } from '../../restaurants/entities/restaurant.entity';
 import { EntityManager } from '@mikro-orm/postgresql';
 import { CreateRoleDto } from '../dto/create-role.dto';
 import { UpdateRoleDto } from '../dto/update-role.dto';
-import { FindRolesDto } from '../dto/find-roles.dto';
 import { RolePermission } from '../entities/rolePermission.entity';
 
 @Injectable()
@@ -20,7 +19,7 @@ export class RolesService {
     private readonly em: EntityManager,
   ) {}
 
-  async create(restId: string, dto: CreateRoleDto) {
+  async createRestaurantRole(dto: CreateRoleDto, restId: string) {
     const { name, permissionIds } = dto;
 
     // Check if role already exists
@@ -51,7 +50,7 @@ export class RolesService {
       // Check if any permission is special
       const specialPermissions = permissions.filter(p => p.group === 'special');
       if (specialPermissions.length > 0) {
-        throw new BadRequestException('Special permissions cannot be assigned to roles');
+        throw new BadRequestException('Special permissions cannot be assigned');
       }
       permissions.forEach(p => role.permissions.add(p));
     }
@@ -60,35 +59,15 @@ export class RolesService {
     return role;
   }
 
-  async findAll(restId: string, dto: FindRolesDto) {
-    const { name, page = 1, limit = 20 } = dto;
-    const offset = (page - 1) * limit;
+  async findAllGeneralAndRestaurantRoles(restId: string) {
+    const where: FilterQuery<Role> = { $or: [{ restaurant: restId }, { restaurant: null }] };
 
-    // Build query dynamically
-    const query: Record<string, unknown> = restId ? { restaurant: { id: restId } } : {};
-
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-    const [roles, count] = await this.roleRepository.findAndCount(query as any, {
-      offset,
-      limit,
+    const roles = await this.roleRepository.find(where, {
+      orderBy: { createdAt: 'desc' },
       populate: ['permissions', 'restaurant'],
     });
 
-    // Filter by name in memory if provided
-    let filtered = roles;
-    if (name) {
-      filtered = roles.filter(
-        r => r.name.toLowerCase().includes(name.toLowerCase()),
-      );
-    }
-
-    return {
-      data: filtered,
-      total: count,
-      page,
-      limit,
-      totalPages: Math.ceil(count / limit),
-    };
+    return roles;
   }
 
   async findOne(restId: string, id: string) {