refactor: update MCP server search functionality with advanced filters and category handling

Author: Lasim

services/backend/src/routes/mcp/servers/search.ts

@@ -79,19 +79,19 @@ export default async function searchServers(server: FastifyInstance) {
       security: [{ cookieAuth: [] }],
       // Plain JSON Schema for Fastify validation
       querystring: {
-        type: 'object',
-        properties: {
-          q: { type: 'string', minLength: 1, maxLength: 255 },
-          category: { type: 'string' },
-          language: { type: 'string' },
-          runtime: { type: 'string' },
-          status: { type: 'string', enum: ['active', 'deprecated', 'maintenance'] },
-          featured: { type: 'string', enum: ['true', 'false'] },
-          limit: { type: 'string', pattern: '^\\d+$' },
-          offset: { type: 'string', pattern: '^\\d+$' }
-        },
-        required: ['q'],
-        additionalProperties: false
+      type: 'object',
+      properties: {
+      q: { type: 'string', minLength: 1, maxLength: 255 },
+      category_id: { type: 'string' },
+      language: { type: 'string' },
+      runtime: { type: 'string' },
+      status: { type: 'string', enum: ['active', 'deprecated', 'maintenance'] },
+      featured: { type: 'string', enum: ['true', 'false'] },
+      limit: { type: 'string', pattern: '^\\d+$' },
+      offset: { type: 'string', pattern: '^\\d+$' }
+      },
+      required: ['q'],
+      additionalProperties: false
       },
       response: {
         200: createSchema(searchServersResponseSchema),
@@ -104,7 +104,7 @@ export default async function searchServers(server: FastifyInstance) {
   }, async (request, reply) => {
     const queryParams = request.query as {
       q?: string;
-      category?: string;
+      category_id?: string;
       language?: string;
       runtime?: string;
       status?: string;
@@ -118,7 +118,7 @@ export default async function searchServers(server: FastifyInstance) {
       userId: request.user?.id,
       query: queryParams.q,
       filters: {
-        category: queryParams.category,
+        category_id: queryParams.category_id,
         language: queryParams.language,
         runtime: queryParams.runtime,
         status: queryParams.status,
@@ -162,7 +162,7 @@ export default async function searchServers(server: FastifyInstance) {
       // Build filters object
       const filters = {
         search: queryParams.q,
-        category_id: queryParams.category,
+        category_id: queryParams.category_id,
         language: queryParams.language,
         runtime: queryParams.runtime,
         status: status,
@@ -238,7 +238,7 @@ export default async function searchServers(server: FastifyInstance) {
           },
           filters: {
             query: queryParams.q,
-            category: queryParams.category || null,
+            category: queryParams.category_id || null,
             language: queryParams.language || null,
             runtime: queryParams.runtime || null,
             status: queryParams.status || null,

services/backend/src/services/mcpCatalogService.ts

@@ -167,15 +167,16 @@ export class McpCatalogService {
       filters
     }, 'Getting MCP servers for user');
 
-    let query = this.db.select().from(mcpServers);
+    // Build all WHERE conditions in an array
+    const whereConditions: any[] = [];
 
     // Apply visibility filters based on user role
     if (userRole === 'global_admin') {
-      // Global admin sees ALL servers
+      // Global admin sees ALL servers - no visibility restrictions
       this.logger.debug('Global admin - showing all servers');
     } else {
       // Regular users see global servers + their team servers
-      query = query.where(
+      whereConditions.push(
         or(
           eq(mcpServers.visibility, 'global'),
           and(
@@ -189,23 +190,23 @@ export class McpCatalogService {
     // Apply additional filters
     if (filters) {
       if (filters.category_id) {
-        query = query.where(eq(mcpServers.category_id, filters.category_id));
+        whereConditions.push(eq(mcpServers.category_id, filters.category_id));
       }
       if (filters.language) {
-        query = query.where(eq(mcpServers.language, filters.language));
+        whereConditions.push(eq(mcpServers.language, filters.language));
       }
       if (filters.runtime) {
-        query = query.where(eq(mcpServers.runtime, filters.runtime));
+        whereConditions.push(eq(mcpServers.runtime, filters.runtime));
       }
       if (filters.status) {
-        query = query.where(eq(mcpServers.status, filters.status));
+        whereConditions.push(eq(mcpServers.status, filters.status));
       }
       if (filters.featured !== undefined) {
-        query = query.where(eq(mcpServers.featured, filters.featured));
+        whereConditions.push(eq(mcpServers.featured, filters.featured));
       }
       if (filters.search) {
         const searchTerm = `%${filters.search}%`;
-        query = query.where(
+        whereConditions.push(
           or(
             like(mcpServers.name, searchTerm),
             like(mcpServers.description, searchTerm),
@@ -215,6 +216,12 @@ export class McpCatalogService {
       }
     }
 
+    // Build the query with all conditions combined
+    let query = this.db.select().from(mcpServers);
+    if (whereConditions.length > 0) {
+      query = query.where(and(...whereConditions));
+    }
+    
     // Order by featured first, then by name
     query = query.orderBy(desc(mcpServers.featured), asc(mcpServers.name));
 
@@ -224,7 +231,9 @@ export class McpCatalogService {
       operation: 'get_servers_for_user',
       userId,
       userRole,
-      serversFound: servers.length
+      serversFound: servers.length,
+      appliedFilters: filters,
+      whereConditionsCount: whereConditions.length
     }, 'Retrieved MCP servers for user');
 
     // Parse JSON fields for all servers

services/backend/tests/unit/routes/mcp/servers/search.test.ts

@@ -308,7 +308,7 @@ describe('MCP Servers - Search Servers', () => {
         ...mockRequest,
         query: {
           q: 'test',
-          category: 'web',
+          category_id: 'web', // Changed from 'category' to 'category_id' to match the route schema
           language: 'javascript',
           runtime: 'node',
           status: 'active',