Ai Search finished, some makeup changes, guards, brokerSearch

bizmatch-server/src/app.controller.ts

@@ -14,6 +14,5 @@ export class AppController {
   @Get()
   getHello(@Request() req): string {
     return req.user;
-    //return 'dfgdf';
   }
 }

bizmatch-server/src/auth/auth.controller.ts

@@ -1,24 +1,30 @@
-import { Controller, Get, Param } from '@nestjs/common';
+import { Controller, Get, Param, UseGuards } from '@nestjs/common';
+import { AdminAuthGuard } from '../jwt-auth/admin-auth.guard.js';
 import { AuthService } from './auth.service.js';
 
 @Controller('auth')
 export class AuthController {
   constructor(private readonly authService: AuthService) {}
 
+  @UseGuards(AdminAuthGuard)
   @Get()
   getAccessToken(): any {
     return this.authService.getAccessToken();
   }
 
+  @UseGuards(AdminAuthGuard)
   @Get('users')
   getUsers(): any {
     return this.authService.getUsers();
   }
+
+  @UseGuards(AdminAuthGuard)
   @Get('user/:userid')
   getUser(@Param('userid') userId: string): any {
     return this.authService.getUser(userId);
   }
 
+  @UseGuards(AdminAuthGuard)
   @Get('user/:userid/lastlogin') //e0811669-c7eb-4e5e-a699-e8334d5c5b01 -> aknuth
   getLastLogin(@Param('userid') userId: string): any {
     return this.authService.getLastLogin(userId);

bizmatch-server/src/jwt-auth/admin-auth.guard.ts

@@ -0,0 +1,18 @@
+import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+
+@Injectable()
+export class AdminAuthGuard extends AuthGuard('jwt') implements CanActivate {
+  canActivate(context: ExecutionContext) {
+    // Add your custom authentication logic here
+    // for example, call super.logIn(request) to establish a session.
+    return super.canActivate(context);
+  }
+  handleRequest(err, user, info) {
+    // You can throw an exception based on either "info" or "err" arguments
+    if (err || !user || !user.roles.includes('ADMIN')) {
+      throw err || new UnauthorizedException(info);
+    }
+    return user;
+  }
+}

bizmatch-server/src/listings/business-listing.service.ts

@@ -10,7 +10,7 @@ import { FileService } from '../file/file.service.js';
 import { GeoService } from '../geo/geo.service.js';
 import { BusinessListing, BusinessListingSchema } from '../models/db.model.js';
 import { BusinessListingCriteria, emailToDirName, JwtUser } from '../models/main.model.js';
-import { convertBusinessToDrizzleBusiness, convertDrizzleBusinessToBusiness, getDistanceQuery } from '../utils.js';
+import { convertBusinessToDrizzleBusiness, convertDrizzleBusinessToBusiness, getDistanceQuery, splitName } from '../utils.js';
 
 @Injectable()
 export class BusinessListingService {
@@ -94,10 +94,17 @@ export class BusinessListingService {
     if (criteria.title) {
       whereConditions.push(or(ilike(businesses.title, `%${criteria.title}%`), ilike(businesses.description, `%${criteria.title}%`)));
     }
-
     if (criteria.brokerName) {
-      whereConditions.push(or(ilike(schema.users.firstname, `%${criteria.brokerName}%`), ilike(schema.users.lastname, `%${criteria.brokerName}%`)));
+      const { firstname, lastname } = splitName(criteria.brokerName);
+      if (firstname === lastname) {
+        whereConditions.push(or(ilike(schema.users.firstname, `%${firstname}%`), ilike(schema.users.lastname, `%${lastname}%`)));
+      } else {
+        whereConditions.push(and(ilike(schema.users.firstname, `%${firstname}%`), ilike(schema.users.lastname, `%${lastname}%`)));
+      }
     }
+    // if (criteria.brokerName) {
+    //   whereConditions.push(or(ilike(schema.users.firstname, `%${criteria.brokerName}%`), ilike(schema.users.lastname, `%${criteria.brokerName}%`)));
+    // }
     if (!user?.roles?.includes('ADMIN') ?? false) {
       whereConditions.push(or(eq(businesses.email, user?.username), ne(businesses.draft, true)));
     }

bizmatch-server/src/user/user.controller.ts

@@ -3,6 +3,7 @@ import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
 import { ZodError } from 'zod';
 import { FileService } from '../file/file.service.js';
+import { JwtAuthGuard } from '../jwt-auth/jwt-auth.guard.js';
 import { OptionalJwtAuthGuard } from '../jwt-auth/optional-jwt-auth.guard.js';
 import { User } from '../models/db.model';
 import { JwtUser, Subscription, UserListingCriteria } from '../models/main.model.js';
@@ -77,6 +78,7 @@ export class UserController {
     return result;
   }
 
+  @UseGuards(JwtAuthGuard)
   @Get('subscriptions/:id')
   async findSubscriptionsById(@Param('id') id: string): Promise<Subscription[]> {
     const subscriptions = this.fileService.getSubscriptions();