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`);
// }
}

8
bizmatch-server/src/listings/business-listings.controller.ts
View File

@@ -55,10 +55,10 @@ export class BusinessListingsController {
deleteById(@Param('id') id: string) {
this.listingsService.deleteListing(id);
}
@Get('states/all')
getStates(): any {
return this.listingsService.getStates();
}
// @Get('states/all')
// getStates(): any {
// return this.listingsService.getStates();
// }
@UseGuards(JwtAuthGuard)
@Delete('favorites/:id')
deleteFavorite(@Request() req, @Param('id') id: string) {

8
bizmatch-server/src/listings/commercial-property-listings.controller.ts
View File

@@ -41,10 +41,10 @@ export class CommercialPropertyListingsController {
findTotal(@Request() req, @Body() criteria: CommercialPropertyListingCriteria): Promise<number> {
return this.listingsService.getCommercialPropertiesCount(criteria, req.user as JwtUser);
}
@Get('states/all')
getStates(): any {
return this.listingsService.getStates();
}
// @Get('states/all')
// getStates(): any {
// return this.listingsService.getStates();
// }
@Post()
async create(@Body() listing: any) {
this.logger.info(`Save Listing`);

38
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 { convertCommercialToDrizzleCommercial, convertDrizzleBusinessToBusiness, convertDrizzleCommercialToCommercial, getDistanceQuery } from '../utils';
import { getDistanceQuery } from '../utils';
@Injectable()
export class CommercialPropertyService {
@@ -24,7 +24,7 @@ export class CommercialPropertyService {
const whereConditions: SQL[] = [];
if (criteria.city && criteria.searchType === 'exact') {
whereConditions.push(ilike(schema.commercials.city, `%${criteria.city.name}%`));
whereConditions.push(sql`${commercials.location}->>'name' ilike ${criteria.city.name}`);
}
if (criteria.city && criteria.radius && criteria.searchType === 'radius' && criteria.radius) {
const cityGeo = this.geoService.getCityWithCoords(criteria.state, criteria.city.name);
@@ -35,7 +35,7 @@ export class CommercialPropertyService {
}
if (criteria.state) {
whereConditions.push(eq(schema.commercials.state, criteria.state));
whereConditions.push(sql`${schema.commercials.location}->>'state' = ${criteria.city.state}`);
}
if (criteria.minPrice) {
@@ -89,7 +89,7 @@ export class CommercialPropertyService {
query.limit(length).offset(start);
const data = await query;
const results = data.map(r => r.commercial).map(r => convertDrizzleCommercialToCommercial(r));
const results = data.map(r => r.commercial);
const totalCount = await this.getCommercialPropertiesCount(criteria, user);
return {
@@ -122,7 +122,7 @@ export class CommercialPropertyService {
.from(commercials)
.where(and(...conditions));
if (result.length > 0) {
return convertDrizzleCommercialToCommercial(result[0]) as CommercialPropertyListing;
return result[0] as CommercialPropertyListing;
} else {
throw new BadRequestException(`No entry available for ${id}`);
}
@@ -139,7 +139,7 @@ export class CommercialPropertyService {
.select()
.from(commercials)
.where(and(...conditions))) as CommercialPropertyListing[];
return listings.map(l => convertDrizzleCommercialToCommercial(l)) as CommercialPropertyListing[];
return listings as CommercialPropertyListing[];
}
// #### Find Favorites ########################################
async findFavoriteListings(user: JwtUser): Promise<CommercialPropertyListing[]> {
@@ -147,7 +147,7 @@ export class CommercialPropertyService {
.select()
.from(commercials)
.where(arrayContains(commercials.favoritesForUser, [user.username]));
return userFavorites.map(l => convertDrizzleBusinessToBusiness(l));
return userFavorites;
}
// #### Find by imagePath ########################################
async findByImagePath(imagePath: string, serial: string): Promise<CommercialPropertyListing> {
@@ -155,7 +155,7 @@ export class CommercialPropertyService {
.select()
.from(commercials)
.where(and(sql`${commercials.imagePath} = ${imagePath}`, sql`${commercials.serialId} = ${serial}`));
return convertDrizzleCommercialToCommercial(result[0]) as CommercialPropertyListing;
return result[0] as CommercialPropertyListing;
}
// #### CREATE ########################################
async createListing(data: CommercialPropertyListing): Promise<CommercialPropertyListing> {
@@ -163,10 +163,10 @@ export class CommercialPropertyService {
data.created = data.created ? (typeof data.created === 'string' ? new Date(data.created) : data.created) : new Date();
data.updated = new Date();
CommercialPropertyListingSchema.parse(data);
const convertedCommercialPropertyListing = convertCommercialToDrizzleCommercial(data);
const convertedCommercialPropertyListing = data;
delete convertedCommercialPropertyListing.id;
const [createdListing] = await this.conn.insert(commercials).values(convertedCommercialPropertyListing).returning();
return convertDrizzleCommercialToCommercial(createdListing);
return createdListing;
} catch (error) {
if (error instanceof ZodError) {
const filteredErrors = error.errors
@@ -192,9 +192,9 @@ export class CommercialPropertyService {
this.logger.warn(`changes between image directory and imageOrder in listing ${data.serialId}: ${difference.join(',')}`);
data.imageOrder = imageOrder;
}
const convertedCommercialPropertyListing = convertCommercialToDrizzleCommercial(data);
const convertedCommercialPropertyListing = data;
const [updateListing] = await this.conn.update(commercials).set(convertedCommercialPropertyListing).where(eq(commercials.id, id)).returning();
return convertDrizzleCommercialToCommercial(updateListing);
return updateListing;
} catch (error) {
if (error instanceof ZodError) {
const filteredErrors = error.errors
@@ -240,11 +240,11 @@ export class CommercialPropertyService {
// ##############################################################
// States
// ##############################################################
async getStates(): Promise<any[]> {
return await this.conn
.select({ state: commercials.state, count: sql<number>`count(${commercials.id})`.mapWith(Number) })
.from(commercials)
.groupBy(sql`${commercials.state}`)
.orderBy(sql`count desc`);
}
// async getStates(): Promise<any[]> {
// return await this.conn
// .select({ state: commercials.state, count: sql<number>`count(${commercials.id})`.mapWith(Number) })
// .from(commercials)
// .groupBy(sql`${commercials.state}`)
// .orderBy(sql`count desc`);
// }
}