location eingebaut, back buttons angeglichen, paging & criteria korrigiert

bizmatch-server/src/user/user.service.ts

@@ -72,7 +72,8 @@ export class UserService {
     // Paginierung
     query.limit(length).offset(start);
 
-    const results = await query;
+    const data = await query;
+    const results = data.map(r => convertDrizzleUserToUser(r));
     const totalCount = await this.getUserListingsCount(criteria);
 
     return {
@@ -117,7 +118,7 @@ export class UserService {
     const user = users[0];
     user.hasCompanyLogo = this.fileService.hasCompanyLogo(emailToDirName(user.email));
     user.hasProfile = this.fileService.hasProfile(emailToDirName(user.email));
-    return user;
+    return convertDrizzleUserToUser(user);
   }
   async saveUser(user: User): Promise<User> {
     try {
@@ -131,7 +132,7 @@ export class UserService {
       const drizzleUser = convertUserToDrizzleUser(validatedUser);
       if (user.id) {
         const [updateUser] = await this.conn.update(schema.users).set(drizzleUser).where(eq(schema.users.id, user.id)).returning();
-        return updateUser as User;
+        return convertDrizzleUserToUser(updateUser) as User;
       } else {
         const [newUser] = await this.conn.insert(schema.users).values(drizzleUser).returning();
         return convertDrizzleUserToUser(newUser) as User;