Fixes für input fields, #60 -> AuditService

bizmatch-server/src/drizzle/schema.ts

@@ -135,7 +135,7 @@ export const commercials = pgTable(
 export const listingEvents = pgTable('listing_events', {
   id: uuid('id').primaryKey().defaultRandom().notNull(),
   listingId: uuid('listing_id'), // Assuming listings are referenced by UUID, adjust as necessary
-  userId: uuid('user_id'), // Nullable, if user is logged in, otherwise null
+  email: varchar('email', { length: 255 }).references(() => users.email),
   eventType: varchar('event_type', { length: 50 }), // 'view', 'print', 'email', 'facebook', 'x', 'linkedin', 'contact'
   eventTimestamp: timestamp('event_timestamp').defaultNow(),
   userIp: varchar('user_ip', { length: 45 }), // Optional if you choose to track IP in frontend or backend

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

@@ -12,6 +12,7 @@ export class EventService {
   ) {}
   async createEvent(event: ListingEvent) {
     // Speichere das Event in der Datenbank
+    event.eventTimestamp = new Date();
     await this.conn.insert(listingEvents).values(event).execute();
   }
 }

bizmatch-server/src/models/db.model.ts

@@ -34,6 +34,8 @@ export const CustomerTypeEnum = z.enum(['buyer', 'seller', 'professional']);
 export const SubscriptionTypeEnum = z.enum(['free', 'professional', 'broker']);
 export const CustomerSubTypeEnum = z.enum(['broker', 'cpa', 'attorney', 'titleCompany', 'surveyor', 'appraiser']);
 export const ListingsCategoryEnum = z.enum(['commercialProperty', 'business']);
+export const ZodEventTypeEnum = z.enum(['view', 'print', 'email', 'facebook', 'x', 'linkedin', 'contact', 'favorite']);
+export type EventTypeEnum = z.infer<typeof ZodEventTypeEnum>;
 const PropertyTypeEnum = z.enum(['retail', 'land', 'industrial', 'office', 'mixedUse', 'multifamily', 'uncategorized']);
 const TypeEnum = z.enum([
   'automotive',
@@ -123,32 +125,42 @@ export const LicensedInSchema = z.object({
     }),
   registerNo: z.string().nonempty('License number is required'),
 });
-export const GeoSchema = z.object({
-  name: z.string(),
-  state: z.string().refine(val => USStates.safeParse(val).success, {
-    message: 'Invalid state. Must be a valid 2-letter US state code.',
-  }),
-  latitude: z.number().refine(
-    value => {
-      return value >= -90 && value <= 90;
-    },
-    {
-      message: 'Latitude muss zwischen -90 und 90 liegen',
-    },
-  ),
-  longitude: z.number().refine(
-    value => {
-      return value >= -180 && value <= 180;
-    },
-    {
-      message: 'Longitude muss zwischen -180 und 180 liegen',
-    },
-  ),
-  county: z.string().optional().nullable(),
-  housenumber: z.string().optional().nullable(),
-  street: z.string().optional().nullable(),
-  zipCode: z.number().optional().nullable(),
-});
+export const GeoSchema = z
+  .object({
+    name: z.string().optional().nullable(),
+    state: z.string().refine(val => USStates.safeParse(val).success, {
+      message: 'Invalid state. Must be a valid 2-letter US state code.',
+    }),
+    latitude: z.number().refine(
+      value => {
+        return value >= -90 && value <= 90;
+      },
+      {
+        message: 'Latitude muss zwischen -90 und 90 liegen',
+      },
+    ),
+    longitude: z.number().refine(
+      value => {
+        return value >= -180 && value <= 180;
+      },
+      {
+        message: 'Longitude muss zwischen -180 und 180 liegen',
+      },
+    ),
+    county: z.string().optional().nullable(),
+    housenumber: z.string().optional().nullable(),
+    street: z.string().optional().nullable(),
+    zipCode: z.number().optional().nullable(),
+  })
+  .superRefine((data, ctx) => {
+    if (!data.name && !data.county) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'You need to select either a city or a county',
+        path: ['name'],
+      });
+    }
+  });
 const phoneRegex = /^(\+1|1)?[-.\s]?\(?[2-9]\d{2}\)?[-.\s]?\d{3}[-.\s]?\d{4}$/;
 export const UserSchema = z
   .object({
@@ -320,8 +332,8 @@ export type ShareByEMail = z.infer<typeof ShareByEMailSchema>;
 export const ListingEventSchema = z.object({
   id: z.string().uuid(), // UUID für das Event
   listingId: z.string().uuid(), // UUID für das Listing
-  userId: z.string().uuid().optional().nullable(), // UUID für den Benutzer, optional, wenn kein Benutzer eingeloggt ist
-  eventType: z.enum(['view', 'print', 'email', 'facebook', 'x', 'linkedin', 'contact']), // Die Event-Typen
+  email: z.string().email().optional().nullable(), // EMail des den Benutzer, optional, wenn kein Benutzer eingeloggt ist
+  eventType: ZodEventTypeEnum, // Die Event-Typen
   eventTimestamp: z.string().datetime().or(z.date()), // Der Zeitstempel des Events, kann ein String im ISO-Format oder ein Date-Objekt sein
   userIp: z.string().max(45).optional().nullable(), // IP-Adresse des Benutzers, optional
   userAgent: z.string().max(255).optional().nullable(), // User-Agent des Benutzers, optional