aknuth/bizmatch-project
1
0
Fork 0
Code Issues 9 Pull Requests Packages Projects 5 Releases Wiki Activity

Fix business filtering logic and add docker sync guide

Browse Source
This commit is contained in:
knuthtimo-lab
2026-01-12 13:58:45 +01:00
parent 4f8fd77f7d
commit adeefb199c
21 changed files with 538 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
bizmatch-server/src/listings/commercial-property.service.ts
View File

@@ -10,7 +10,7 @@ import { FileService } from '../file/file.service';
import { GeoService } from '../geo/geo.service';
import { CommercialPropertyListing, CommercialPropertyListingSchema } from '../models/db.model';
import { CommercialPropertyListingCriteria, JwtUser } from '../models/main.model';
import { getDistanceQuery } from '../utils';
import { getDistanceQuery, splitName } from '../utils';
import { generateSlug, extractShortIdFromSlug, isSlug } from '../utils/slug.utils';
@Injectable()
@@ -20,7 +20,7 @@ export class CommercialPropertyService {
@Inject(PG_CONNECTION) private conn: NodePgDatabase<typeof schema>,
private fileService?: FileService,
private geoService?: GeoService,
) {}
) { }
private getWhereConditions(criteria: CommercialPropertyListingCriteria, user: JwtUser): SQL[] {
const whereConditions: SQL[] = [];
@@ -32,7 +32,10 @@ export class CommercialPropertyService {
whereConditions.push(sql`${getDistanceQuery(commercials_json, cityGeo.latitude, cityGeo.longitude)} <= ${criteria.radius}`);
}
if (criteria.types && criteria.types.length > 0) {
whereConditions.push(inArray(sql`${commercials_json.data}->>'type'`, criteria.types));
this.logger.warn('Adding commercial property type filter', { types: criteria.types });
// Use explicit SQL with IN for robust JSONB comparison
const typeValues = criteria.types.map(t => sql`${t}`);
whereConditions.push(sql`((${commercials_json.data}->>'type') IN (${sql.join(typeValues, sql`, `)}))`);
}
if (criteria.state) {
@@ -48,12 +51,32 @@ export class CommercialPropertyService {
}
if (criteria.title) {
whereConditions.push(sql`(${commercials_json.data}->>'title') ILIKE ${`%${criteria.title}%`} OR (${commercials_json.data}->>'description') ILIKE ${`%${criteria.title}%`}`);
whereConditions.push(
sql`((${commercials_json.data}->>'title') ILIKE ${`%${criteria.title}%`} OR (${commercials_json.data}->>'description') ILIKE ${`%${criteria.title}%`})`
);
}
if (criteria.brokerName) {
const { firstname, lastname } = splitName(criteria.brokerName);
if (firstname === lastname) {
// Single word: search either first OR last name
whereConditions.push(
sql`((${schema.users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} OR (${schema.users_json.data}->>'lastname') ILIKE ${`%${lastname}%`})`
);
} else {
// Multiple words: search both first AND last name
whereConditions.push(
sql`((${schema.users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} AND (${schema.users_json.data}->>'lastname') ILIKE ${`%${lastname}%`})`
);
}
}
if (user?.role !== 'admin') {
whereConditions.push(or(eq(commercials_json.email, user?.email), sql`(${commercials_json.data}->>'draft')::boolean IS NOT TRUE`));
whereConditions.push(
sql`((${commercials_json.email} = ${user?.email || null}) OR (${commercials_json.data}->>'draft')::boolean IS NOT TRUE)`
);
}
// whereConditions.push(and(eq(schema.users.customerType, 'professional')));
this.logger.warn('whereConditions count', { count: whereConditions.length });
return whereConditions;
}
// #### Find by criteria ########################################
@@ -63,9 +86,13 @@ export class CommercialPropertyService {
const query = this.conn.select({ commercial: commercials_json }).from(commercials_json).leftJoin(schema.users_json, eq(commercials_json.email, schema.users_json.email));
const whereConditions = this.getWhereConditions(criteria, user);
this.logger.warn('Filter Criteria:', { criteria: JSON.stringify(criteria) });
if (whereConditions.length > 0) {
const whereClause = and(...whereConditions);
query.where(whereClause);
const whereClause = sql.join(whereConditions, sql` AND `);
query.where(sql`(${whereClause})`);
this.logger.warn('Generated SQL:', { sql: query.toSQL().sql, params: query.toSQL().params });
}
// Sortierung
switch (criteria.sortBy) {
@@ -103,8 +130,8 @@ export class CommercialPropertyService {
const whereConditions = this.getWhereConditions(criteria, user);
if (whereConditions.length > 0) {
const whereClause = and(...whereConditions);
countQuery.where(whereClause);
const whereClause = sql.join(whereConditions, sql` AND `);
countQuery.where(sql`(${whereClause})`);
}
const [{ value: totalCount }] = await countQuery;