Validierung Part II, neue Komponenten

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

@@ -1,15 +1,16 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { and, count, eq, ilike, inArray, or, SQL, sql } from 'drizzle-orm';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres/driver.js';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
+import { ZodError } from 'zod';
 import * as schema from '../drizzle/schema.js';
 import { customerSubTypeEnum, PG_CONNECTION } from '../drizzle/schema.js';
 import { FileService } from '../file/file.service.js';
 import { GeoService } from '../geo/geo.service.js';
-import { User } from '../models/db.model.js';
-import { emailToDirName, JwtUser, UserListingCriteria } from '../models/main.model.js';
-import { getDistanceQuery } from '../utils.js';
+import { User, UserSchema } from '../models/db.model.js';
+import { createDefaultUser, emailToDirName, JwtUser, UserListingCriteria } from '../models/main.model.js';
+import { getDistanceQuery, toDrizzleUser } from '../utils.js';
 
 type CustomerSubType = (typeof customerSubTypeEnum.enumValues)[number];
 @Injectable()
@@ -111,9 +112,8 @@ export class UserService {
       .from(schema.users)
       .where(sql`email = ${email}`)) as User[];
     if (users.length === 0) {
-      const user: User = { id: undefined, email, firstname: jwtuser.firstname, lastname: jwtuser.lastname, customerType: 'buyer' };
-      this.saveUser(user);
-      return user;
+      const user: User = { id: undefined, customerType: 'buyer', ...createDefaultUser(email, jwtuser.firstname, jwtuser.lastname) };
+      return await this.saveUser(user);
     } else {
       const user = users[0];
       user.hasCompanyLogo = this.fileService.hasCompanyLogo(emailToDirName(user.email));
@@ -132,17 +132,33 @@ export class UserService {
     user.hasProfile = this.fileService.hasProfile(emailToDirName(user.email));
     return user;
   }
-  async saveUser(user: any): Promise<User> {
-    if (user.id) {
-      user.created = new Date(user.created);
+  async saveUser(user: User): Promise<User> {
+    try {
       user.updated = new Date();
-      const [updateUser] = await this.conn.update(schema.users).set(user).where(eq(schema.users.id, user.id)).returning();
-      return updateUser as User;
-    } else {
-      user.created = new Date();
-      user.updated = new Date();
-      const [newUser] = await this.conn.insert(schema.users).values(user).returning();
-      return newUser as User;
+      if (user.id) {
+        user.created = new Date(user.created);
+      } else {
+        user.created = new Date();
+      }
+      const validatedUser = UserSchema.parse(user);
+      const drizzleUser = toDrizzleUser(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;
+      } else {
+        const drizzleUser = toDrizzleUser(user);
+        const [newUser] = await this.conn.insert(schema.users).values(drizzleUser).returning();
+        return newUser as User;
+      }
+    } catch (error) {
+      if (error instanceof ZodError) {
+        const formattedErrors = error.errors.map(err => ({
+          field: err.path.join('.'),
+          message: err.message,
+        }));
+        throw new BadRequestException(formattedErrors);
+      }
+      throw error;
     }
   }
   // async findUser(criteria: UserListingCriteria) {