location radius search

bizmatch-server/src/listings/commercial-property.service.ts

@@ -6,8 +6,10 @@ import { Logger } from 'winston';
 import * as schema from '../drizzle/schema.js';
 import { commercials, PG_CONNECTION } from '../drizzle/schema.js';
 import { FileService } from '../file/file.service.js';
+import { GeoService } from '../geo/geo.service.js';
 import { CommercialPropertyListing } from '../models/db.model';
 import { CommercialPropertyListingCriteria, emailToDirName, JwtUser } from '../models/main.model.js';
+import { getDistanceQuery } from '../utils.js';
 
 @Injectable()
 export class CommercialPropertyService {
@@ -15,14 +17,18 @@ export class CommercialPropertyService {
     @Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
     @Inject(PG_CONNECTION) private conn: NodePgDatabase<typeof schema>,
     private fileService: FileService,
+    private geoService: GeoService,
   ) {}
   private getWhereConditions(criteria: CommercialPropertyListingCriteria): SQL[] {
     const whereConditions: SQL[] = [];
 
-    if (criteria.city) {
+    if (criteria.city && criteria.searchType === 'exact') {
       whereConditions.push(ilike(schema.commercials.city, `%${criteria.city}%`));
     }
-
+    if (criteria.city && criteria.radius && criteria.searchType === 'radius' && criteria.radius) {
+      const cityGeo = this.geoService.getCityWithCoords(criteria.state, criteria.city);
+      whereConditions.push(sql`${getDistanceQuery(commercials, parseFloat(cityGeo.latitude), parseFloat(cityGeo.longitude))} <= ${criteria.radius}`);
+    }
     if (criteria.types && criteria.types.length > 0) {
       whereConditions.push(inArray(schema.commercials.type, criteria.types));
     }