Sửa lỗi nhấn + để thêm thành viên của tour

main.ts

@@ -1,6 +1,6 @@
 import 'reflect-metadata';
 import { NestFactory } from '@nestjs/core';
-import { Module, Controller, Get, Post, Body, Param, Patch, Delete, ParseUUIDPipe, NotFoundException, BadRequestException, UnauthorizedException, UseGuards, Req } from '@nestjs/common';
+import { Module, Controller, Get, Post, Body, Param, Patch, Delete, ParseUUIDPipe, NotFoundException, BadRequestException, UnauthorizedException, UseGuards, Req, Query } from '@nestjs/common';
 import { PrismaService } from './prisma.service.js';
 import 'dotenv/config';
 import * as bcrypt from 'bcrypt';
@@ -355,6 +355,32 @@ class TourController {
     if (!tour) throw new NotFoundException(`Không tìm thấy Tour với ID ${id}`);
     return tour;
   }
+
+  @UseGuards(JwtAuthGuard, TourRoleGuard)
+  @Post(':tourId/members')
+  async addMember(@Param('tourId', ParseUUIDPipe) tourId: string, @Body() body: { userId: string; role?: string }, @Req() req: any) {
+    const validRoles = ['OWNER', 'MANAGER', 'MEMBER', 'MEMBER_NO_FINANCE', 'VIEWER_ONLY'] as const;
+    const role = validRoles.includes(body.role as any) ? body.role as 'OWNER' | 'MANAGER' | 'MEMBER' | 'MEMBER_NO_FINANCE' | 'VIEWER_ONLY' : 'MEMBER';
+    
+    const participation = await this.prisma.tourParticipant.findUnique({
+      where: { tourId_userId: { tourId, userId: body.userId } },
+    });
+    if (participation) {
+      return this.prisma.tourParticipant.update({
+        where: { tourId_userId: { tourId, userId: body.userId } },
+        data: { role },
+        include: { user: { select: { id: true, name: true, email: true } } },
+      });
+    }
+    return this.prisma.tourParticipant.create({
+      data: {
+        tourId,
+        userId: body.userId,
+        role,
+      },
+      include: { user: { select: { id: true, name: true, email: true } } },
+    });
+  }
 }
 
 @Controller('v1/locations')
@@ -577,9 +603,17 @@ class UserController {
   constructor(private prisma: PrismaService) {}
 
   @Get()
-  async getAllUsers() {
+  async getAllUsers(@Query('q') q?: string) {
     return this.prisma.user.findMany({
-      select: { id: true, email: true, name: true, isAdmin: true, isBlocked: true, createdAt: true }
+      where: q
+        ? {
+            OR: [
+              { name: { contains: q, mode: 'insensitive' as any } },
+              { email: { contains: q, mode: 'insensitive' as any } },
+            ],
+          }
+        : undefined,
+      select: { id: true, email: true, name: true, isAdmin: true, isBlocked: true, createdAt: true, phone: true, address: true }
     });
   }