Einbau Validation finished

bizmatch-server/src/listings/business-listing.service.ts

@@ -1,13 +1,14 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { and, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
+import { ZodError } from 'zod';
 import * as schema from '../drizzle/schema.js';
 import { businesses, PG_CONNECTION } from '../drizzle/schema.js';
 import { FileService } from '../file/file.service.js';
 import { GeoService } from '../geo/geo.service.js';
-import { BusinessListing, CommercialPropertyListing } from '../models/db.model';
+import { BusinessListing, BusinessListingSchema } from '../models/db.model.js';
 import { BusinessListingCriteria, emailToDirName, JwtUser } from '../models/main.model.js';
 import { getDistanceQuery } from '../utils.js';
 
@@ -169,17 +170,41 @@ export class BusinessListingService {
   }
   // #### CREATE ########################################
   async createListing(data: BusinessListing): Promise<BusinessListing> {
-    data.created = new Date();
-    data.updated = new Date();
-    const [createdListing] = await this.conn.insert(businesses).values(data).returning();
-    return createdListing as BusinessListing;
+    try {
+      data.created = new Date();
+      data.updated = new Date();
+      const validatedBusinessListing = BusinessListingSchema.parse(data);
+      const [createdListing] = await this.conn.insert(businesses).values(validatedBusinessListing).returning();
+      return createdListing as BusinessListing;
+    } 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;
+    }
   }
   // #### UPDATE Business ########################################
-  async updateBusinessListing(id: string, data: BusinessListing): Promise<BusinessListing | CommercialPropertyListing> {
-    data.updated = new Date();
-    data.created = new Date(data.created);
-    const [updateListing] = await this.conn.update(businesses).set(data).where(eq(businesses.id, id)).returning();
-    return updateListing as BusinessListing | CommercialPropertyListing;
+  async updateBusinessListing(id: string, data: BusinessListing): Promise<BusinessListing> {
+    try {
+      data.updated = new Date();
+      data.created = new Date(data.created);
+      const validatedBusinessListing = BusinessListingSchema.parse(data);
+      const [updateListing] = await this.conn.update(businesses).set(data).where(eq(businesses.id, id)).returning();
+      return updateListing as BusinessListing;
+    } 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;
+    }
   }
   // #### DELETE  ########################################
   async deleteListing(id: string): Promise<void> {

bizmatch-server/src/listings/commercial-property.service.ts

@@ -1,13 +1,14 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { and, count, eq, gte, ilike, inArray, lte, ne, or, SQL, sql } from 'drizzle-orm';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { Logger } from 'winston';
+import { ZodError } from 'zod';
 import * as schema from '../drizzle/schema.js';
 import { commercials, PG_CONNECTION } from '../drizzle/schema.js';
 import { FileService } from '../file/file.service.js';
 import { GeoService } from '../geo/geo.service.js';
-import { CommercialPropertyListing } from '../models/db.model';
+import { CommercialPropertyListing, CommercialPropertyListingSchema } from '../models/db.model.js';
 import { CommercialPropertyListingCriteria, emailToDirName, JwtUser } from '../models/main.model.js';
 import { getDistanceQuery } from '../utils.js';
 
@@ -123,23 +124,47 @@ export class CommercialPropertyService {
   }
   // #### CREATE ########################################
   async createListing(data: CommercialPropertyListing): Promise<CommercialPropertyListing> {
-    data.created = new Date();
-    data.updated = new Date();
-    const [createdListing] = await this.conn.insert(commercials).values(data).returning();
-    return createdListing as CommercialPropertyListing;
+    try {
+      data.created = new Date();
+      data.updated = new Date();
+      const validatedCommercialPropertyListing = CommercialPropertyListingSchema.parse(data);
+      const [createdListing] = await this.conn.insert(commercials).values(validatedCommercialPropertyListing).returning();
+      return createdListing as CommercialPropertyListing;
+    } 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;
+    }
   }
   // #### UPDATE CommercialProps ########################################
   async updateCommercialPropertyListing(id: string, data: CommercialPropertyListing): Promise<CommercialPropertyListing> {
-    data.updated = new Date();
-    data.created = new Date(data.created);
-    const imageOrder = await this.fileService.getPropertyImages(data.imagePath, String(data.serialId));
-    let difference = imageOrder.filter(x => !data.imageOrder.includes(x)).concat(data.imageOrder.filter(x => !imageOrder.includes(x)));
-    if (difference.length > 0) {
-      this.logger.warn(`changes between image directory and imageOrder in listing ${data.serialId}: ${difference.join(',')}`);
-      data.imageOrder = imageOrder;
+    try {
+      data.updated = new Date();
+      data.created = new Date(data.created);
+      const validatedCommercialPropertyListing = CommercialPropertyListingSchema.parse(data);
+      const imageOrder = await this.fileService.getPropertyImages(data.imagePath, String(data.serialId));
+      let difference = imageOrder.filter(x => !data.imageOrder.includes(x)).concat(data.imageOrder.filter(x => !imageOrder.includes(x)));
+      if (difference.length > 0) {
+        this.logger.warn(`changes between image directory and imageOrder in listing ${data.serialId}: ${difference.join(',')}`);
+        data.imageOrder = imageOrder;
+      }
+      const [updateListing] = await this.conn.update(commercials).set(data).where(eq(commercials.id, id)).returning();
+      return updateListing as CommercialPropertyListing;
+    } 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;
     }
-    const [updateListing] = await this.conn.update(commercials).set(data).where(eq(commercials.id, id)).returning();
-    return updateListing as CommercialPropertyListing;
   }
   // ##############################################################
   // Images for commercial Properties