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

Issue: #109

Browse Source
This commit is contained in:
Andreas Knuth
2024-09-10 21:30:03 +02:00
parent 17213ba4b0
commit 83307684ee
25 changed files with 799 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
bizmatch-server/src/listings/business-listing.service.ts
View File

@@ -10,7 +10,7 @@ import { FileService } from '../file/file.service';
import { GeoService } from '../geo/geo.service';
import { BusinessListing, BusinessListingSchema } from '../models/db.model';
import { BusinessListingCriteria, JwtUser } from '../models/main.model';
import { convertBusinessToDrizzleBusiness, convertDrizzleBusinessToBusiness, getDistanceQuery, splitName } from '../utils';
import { getDistanceQuery, splitName } from '../utils';
@Injectable()
export class BusinessListingService {
@@ -25,7 +25,8 @@ export class BusinessListingService {
const whereConditions: SQL[] = [];
if (criteria.city && criteria.searchType === 'exact') {
whereConditions.push(ilike(businesses.city, `%${criteria.city.name}%`));
whereConditions.push(sql`${businesses.location}->>'name' ilike ${criteria.city.name}`);
//whereConditions.push(ilike(businesses.location-->'city', `%${criteria.city.name}%`));
}
if (criteria.city && criteria.radius && criteria.searchType === 'radius' && criteria.radius) {
const cityGeo = this.geoService.getCityWithCoords(criteria.state, criteria.city.name);
@@ -36,7 +37,7 @@ export class BusinessListingService {
}
if (criteria.state) {
whereConditions.push(eq(businesses.state, criteria.state));
whereConditions.push(sql`${businesses.location}->>'state' = ${criteria.city.state}`);
}
if (criteria.minPrice) {
@@ -165,7 +166,7 @@ export class BusinessListingService {
const data = await query;
const totalCount = await this.getBusinessListingsCount(criteria, user);
const results = data.map(r => r.business).map(r => convertDrizzleBusinessToBusiness(r));
const results = data.map(r => r.business);
return {
results,
totalCount,
@@ -197,7 +198,7 @@ export class BusinessListingService {
.from(businesses)
.where(and(...conditions));
if (result.length > 0) {
return convertDrizzleBusinessToBusiness(result[0]) as BusinessListing;
return result[0] as BusinessListing;
} else {
throw new BadRequestException(`No entry available for ${id}`);
}
@@ -214,7 +215,7 @@ export class BusinessListingService {
.from(businesses)
.where(and(...conditions))) as BusinessListing[];
return listings.map(l => convertDrizzleBusinessToBusiness(l));
return listings;
}
// #### Find Favorites ########################################
async findFavoriteListings(user: JwtUser): Promise<BusinessListing[]> {
@@ -222,7 +223,7 @@ export class BusinessListingService {
.select()
.from(businesses)
.where(arrayContains(businesses.favoritesForUser, [user.username]));
return userFavorites.map(l => convertDrizzleBusinessToBusiness(l));
return userFavorites;
}
// #### CREATE ########################################
async createListing(data: BusinessListing): Promise<BusinessListing> {
@@ -230,10 +231,10 @@ export class BusinessListingService {
data.created = data.created ? (typeof data.created === 'string' ? new Date(data.created) : data.created) : new Date();
data.updated = new Date();
BusinessListingSchema.parse(data);
const convertedBusinessListing = convertBusinessToDrizzleBusiness(data);
const convertedBusinessListing = data;
delete convertedBusinessListing.id;
const [createdListing] = await this.conn.insert(businesses).values(convertedBusinessListing).returning();
return convertDrizzleBusinessToBusiness(createdListing);
return createdListing;
} catch (error) {
if (error instanceof ZodError) {
const filteredErrors = error.errors
@@ -253,9 +254,9 @@ export class BusinessListingService {
data.updated = new Date();
data.created = data.created ? (typeof data.created === 'string' ? new Date(data.created) : data.created) : new Date();
BusinessListingSchema.parse(data);
const convertedBusinessListing = convertBusinessToDrizzleBusiness(data);
const convertedBusinessListing = data;
const [updateListing] = await this.conn.update(businesses).set(convertedBusinessListing).where(eq(businesses.id, id)).returning();
return convertDrizzleBusinessToBusiness(updateListing);
return updateListing;
} catch (error) {
if (error instanceof ZodError) {
const filteredErrors = error.errors
@@ -285,11 +286,11 @@ export class BusinessListingService {
// ##############################################################
// States
// ##############################################################
async getStates(): Promise<any[]> {
return await this.conn
.select({ state: businesses.state, count: sql<number>`count(${businesses.id})`.mapWith(Number) })
.from(businesses)
.groupBy(sql`${businesses.state}`)
.orderBy(sql`count desc`);
}
// async getStates(): Promise<any[]> {
// return await this.conn
// .select({ state: businesses.state, count: sql<number>`count(${businesses.id})`.mapWith(Number) })
// .from(businesses)
// .groupBy(sql`${businesses.state}`)
// .orderBy(sql`count desc`);
// }
}