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

BugFixing

Browse Source
This commit is contained in:
Andreas Knuth
2025-03-13 16:59:50 +01:00
parent 097a6cb360
commit cfddabbfe0
7 changed files with 89 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,8 @@ export class CommercialPropertyService {
if (criteria.title) {
whereConditions.push(or(ilike(schema.commercials.title, `%${criteria.title}%`), ilike(schema.commercials.description, `%${criteria.title}%`)));
}
if (!user?.roles?.includes('ADMIN')) {
whereConditions.push(or(eq(commercials.email, user?.username), ne(commercials.draft, true)));
if (user?.role !== 'admin') {
whereConditions.push(or(eq(commercials.email, user?.email), ne(commercials.draft, true)));
}
// whereConditions.push(and(eq(schema.users.customerType, 'professional')));
return whereConditions;
@@ -113,8 +113,8 @@ export class CommercialPropertyService {
// #### Find by ID ########################################
async findCommercialPropertiesById(id: string, user: JwtUser): Promise<CommercialPropertyListing> {
const conditions = [];
if (!user?.roles?.includes('ADMIN')) {
conditions.push(or(eq(commercials.email, user?.username), ne(commercials.draft, true)));
if (user?.role !== 'admin') {
conditions.push(or(eq(commercials.email, user?.email), ne(commercials.draft, true)));
}
conditions.push(sql`${commercials.id} = ${id}`);
const result = await this.conn
@@ -132,7 +132,7 @@ export class CommercialPropertyService {
async findCommercialPropertiesByEmail(email: string, user: JwtUser): Promise<CommercialPropertyListing[]> {
const conditions = [];
conditions.push(eq(commercials.email, email));
if (email !== user?.username && (!user?.roles?.includes('ADMIN'))) {
if (email !== user?.email && user?.role !== 'admin') {
conditions.push(ne(commercials.draft, true));
}
const listings = (await this.conn
@@ -146,7 +146,7 @@ export class CommercialPropertyService {
const userFavorites = await this.conn
.select()
.from(commercials)
.where(arrayContains(commercials.favoritesForUser, [user.username]));
.where(arrayContains(commercials.favoritesForUser, [user.email]));
return userFavorites;
}
// #### Find by imagePath ########################################
@@ -233,7 +233,7 @@ export class CommercialPropertyService {
await this.conn
.update(commercials)
.set({
favoritesForUser: sql`array_remove(${commercials.favoritesForUser}, ${user.username})`,
favoritesForUser: sql`array_remove(${commercials.favoritesForUser}, ${user.email})`,
})
.where(sql`${commercials.id} = ${id}`);
}