BugFixing

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

@@ -258,35 +258,59 @@ export type AreasServed = z.infer<typeof AreasServedSchema>;
 export type LicensedIn = z.infer<typeof LicensedInSchema>;
 export type User = z.infer<typeof UserSchema>;
 
-export const BusinessListingSchema = z.object({
-  id: z.string().uuid().optional().nullable(),
-  email: z.string().email(),
-  type: z.string().refine(val => TypeEnum.safeParse(val).success, {
-    message: 'Invalid type. Must be one of: ' + TypeEnum.options.join(', '),
-  }),
-  title: z.string().min(10),
-  description: z.string().min(10),
-  location: GeoSchema,
-  price: z.number().positive().max(1000000000),
-  favoritesForUser: z.array(z.string()),
-  draft: z.boolean(),
-  listingsCategory: ListingsCategoryEnum,
-  realEstateIncluded: z.boolean().optional().nullable(),
-  leasedLocation: z.boolean().optional().nullable(),
-  franchiseResale: z.boolean().optional().nullable(),
-  salesRevenue: z.number().positive().max(100000000),
-  cashFlow: z.number().positive().max(100000000),
-  supportAndTraining: z.string().min(5),
-  employees: z.number().int().positive().max(100000).optional().nullable(),
-  established: z.number().int().min(1800).max(2030).optional().nullable(),
-  internalListingNumber: z.number().int().positive().optional().nullable(),
-  reasonForSale: z.string().min(5).optional().nullable(),
-  brokerLicencing: z.string().optional().nullable(),
-  internals: z.string().min(5).optional().nullable(),
-  imageName: z.string().optional().nullable(),
-  created: z.date(),
-  updated: z.date(),
-});
+export const BusinessListingSchema = z
+  .object({
+    id: z.string().uuid().optional().nullable(),
+    email: z.string().email(),
+    type: z.string().refine(val => TypeEnum.safeParse(val).success, {
+      message: 'Invalid type. Must be one of: ' + TypeEnum.options.join(', '),
+    }),
+    title: z.string().min(10),
+    description: z.string().min(10),
+    location: GeoSchema,
+    price: z.number().positive(),
+    favoritesForUser: z.array(z.string()),
+    draft: z.boolean(),
+    listingsCategory: ListingsCategoryEnum,
+    realEstateIncluded: z.boolean().optional().nullable(),
+    leasedLocation: z.boolean().optional().nullable(),
+    franchiseResale: z.boolean().optional().nullable(),
+    salesRevenue: z.number().positive().nullable(),
+    cashFlow: z.number().positive().max(100000000),
+    supportAndTraining: z.string().min(5),
+    employees: z.number().int().positive().max(100000).optional().nullable(),
+    established: z.number().int().min(1800).max(2030).optional().nullable(),
+    internalListingNumber: z.number().int().positive().optional().nullable(),
+    reasonForSale: z.string().min(5).optional().nullable(),
+    brokerLicencing: z.string().optional().nullable(),
+    internals: z.string().min(5).optional().nullable(),
+    imageName: z.string().optional().nullable(),
+    created: z.date(),
+    updated: z.date(),
+  })
+  .superRefine((data, ctx) => {
+    if (data.price && data.price > 1000000000) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Price must less than or equal $1,000,000,000',
+        path: ['price'],
+      });
+    }
+    if (data.salesRevenue && data.salesRevenue > 100000000) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'SalesRevenue must less than or equal $100,000,000',
+        path: ['salesRevenue'],
+      });
+    }
+    if (data.cashFlow && data.cashFlow > 100000000) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'CashFlow must less than or equal $100,000,000',
+        path: ['cashFlow'],
+      });
+    }
+  });
 export type BusinessListing = z.infer<typeof BusinessListingSchema>;
 
 export const CommercialPropertyListingSchema = z
@@ -300,7 +324,7 @@ export const CommercialPropertyListingSchema = z
     title: z.string().min(10),
     description: z.string().min(10),
     location: GeoSchema,
-    price: z.number().positive().max(1000000000),
+    price: z.number().positive(),
     favoritesForUser: z.array(z.string()),
     listingsCategory: ListingsCategoryEnum,
     draft: z.boolean(),
@@ -309,7 +333,15 @@ export const CommercialPropertyListingSchema = z
     created: z.date(),
     updated: z.date(),
   })
-  .strict();
+  .superRefine((data, ctx) => {
+    if (data.price && data.price > 1000000000) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: 'Price must less than or equal $1,000,000,000',
+        path: ['price'],
+      });
+    }
+  });
 
 export type CommercialPropertyListing = z.infer<typeof CommercialPropertyListingSchema>;
 

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

@@ -123,11 +123,9 @@ export interface KeycloakUser {
   attributes?: Attributes;
 }
 export interface JwtUser {
-  userId: string;
-  username: string;
-  firstname: string;
-  lastname: string;
-  roles: string[];
+  email: string;
+  role: string;
+  uid: string;
 }
 interface Attributes {
   [key: string]: any;