BugFixing

This commit is contained in:
2025-03-13 16:59:50 +01:00
parent 097a6cb360
commit cfddabbfe0
7 changed files with 89 additions and 59 deletions

View File

@@ -52,10 +52,10 @@ export class UserService {
if (criteria.state) {
whereConditions.push(sql`EXISTS (SELECT 1 FROM jsonb_array_elements(${schema.users.areasServed}) AS area WHERE area->>'state' = ${criteria.state})`);
}
//never show user which denied
whereConditions.push(eq(schema.users.showInDirectory, true))
whereConditions.push(eq(schema.users.showInDirectory, true));
return whereConditions;
}
async searchUserListings(criteria: UserListingCriteria): Promise<{ results: User[]; totalCount: number }> {
@@ -63,7 +63,7 @@ export class UserService {
const length = criteria.length ? criteria.length : 12;
const query = this.conn.select().from(schema.users);
const whereConditions = this.getWhereConditions(criteria);
if (whereConditions.length > 0) {
const whereClause = and(...whereConditions);
query.where(whereClause);
@@ -110,7 +110,7 @@ export class UserService {
.from(schema.users)
.where(sql`email = ${email}`)) as User[];
if (users.length === 0) {
const user: User = { id: undefined, customerType: 'professional', ...createDefaultUser(email, jwtuser.firstname ? jwtuser.firstname : '', jwtuser.lastname ? jwtuser.lastname : '', null) };
const user: User = { id: undefined, customerType: 'professional', ...createDefaultUser(email, '', '', null) };
const u = await this.saveUser(user, false);
return u;
} else {