@blackcode_sa/metaestetics-api 1.7.6 → 1.7.8

package/src/validations/clinic.schema.ts

@@ -20,6 +20,15 @@ import {
   doctorInfoSchema,
 } from "./shared.schema";
 
+/**
+ * Schema for validating both URL strings and File objects
+ */
+const mediaResourceSchema = z.union([
+  z.string(),
+  z.instanceof(File),
+  z.instanceof(Blob),
+]);
+
 /**
  * Validaciona šema za kontakt informacije
  */
@@ -175,7 +184,7 @@ export const clinicGroupSchema = z.object({
   createdAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
   updatedAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
   isActive: z.boolean(),
-  logo: z.string().optional().nullable(),
+  logo: mediaResourceSchema.optional().nullable(),
   practiceType: z.nativeEnum(PracticeType).optional(),
   languages: z.array(z.nativeEnum(Language)).optional(),
   subscriptionModel: z.nativeEnum(SubscriptionModel),
@@ -196,12 +205,12 @@ export const clinicSchema = z.object({
   contactInfo: clinicContactInfoSchema,
   workingHours: workingHoursSchema,
   tags: z.array(z.nativeEnum(ClinicTag)),
-  featuredPhotos: z.array(z.string()),
-  coverPhoto: z.string().nullable(),
+  featuredPhotos: z.array(mediaResourceSchema),
+  coverPhoto: mediaResourceSchema.nullable(),
   photosWithTags: z
     .array(
       z.object({
-        url: z.string(),
+        url: mediaResourceSchema,
         tag: z.string(),
       })
     )
@@ -210,15 +219,13 @@ export const clinicSchema = z.object({
   doctorsInfo: z.array(doctorInfoSchema), // Aggregated doctor info
   procedures: z.array(z.string()), // List of procedure IDs offered by clinic
   proceduresInfo: z.array(procedureSummaryInfoSchema), // Use the correct schema for aggregated procedure info
-  // services: z.array(z.string()), // Likely deprecated, procedures covers this
-  // servicesInfo: z.array(serviceInfoSchema), // Deprecated, use proceduresInfo
   reviewInfo: clinicReviewInfoSchema,
   admins: z.array(z.string()),
   createdAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
   updatedAt: z.instanceof(Date).or(z.instanceof(Timestamp)), // Timestamp
   isActive: z.boolean(),
   isVerified: z.boolean(),
-  logo: z.string().optional(),
+  logo: mediaResourceSchema.optional().nullable(),
 });
 
 /**
@@ -246,7 +253,7 @@ export const createClinicGroupSchema = z.object({
   contactPerson: contactPersonSchema,
   ownerId: z.string().nullable(),
   isActive: z.boolean(),
-  logo: z.string().optional().nullable(),
+  logo: mediaResourceSchema.optional().nullable(),
   practiceType: z.nativeEnum(PracticeType).optional(),
   languages: z.array(z.nativeEnum(Language)).optional(),
   subscriptionModel: z
@@ -270,23 +277,23 @@ export const createClinicSchema = z.object({
   contactInfo: clinicContactInfoSchema,
   workingHours: workingHoursSchema,
   tags: z.array(z.nativeEnum(ClinicTag)),
-  coverPhoto: z.string().nullable(),
+  coverPhoto: mediaResourceSchema.nullable().optional(),
   photosWithTags: z
     .array(
       z.object({
-        url: z.string(),
+        url: mediaResourceSchema,
         tag: z.string(),
       })
     )
     .optional(),
-  // doctors, doctorsInfo, procedures, proceduresInfo are managed internally/aggregated
-  // doctors: z.array(z.string()),
-  // services: z.array(z.string()), // Deprecated
-  admins: z.array(z.string()), // Should likely just be creator ID initially
-  isActive: z.boolean(),
-  isVerified: z.boolean(),
-  logo: z.string().optional(),
-  featuredPhotos: z.array(z.string()).optional(),
+  doctors: z.array(z.string()).optional().default([]),
+  procedures: z.array(z.string()).optional().default([]),
+  proceduresInfo: z.array(procedureSummaryInfoSchema).optional(),
+  admins: z.array(z.string()),
+  isActive: z.boolean().optional().default(true),
+  isVerified: z.boolean().optional().default(false),
+  logo: mediaResourceSchema.optional().nullable(),
+  featuredPhotos: z.array(mediaResourceSchema).optional().default([]),
 });
 
 /**
@@ -299,7 +306,7 @@ export const createDefaultClinicGroupSchema = z.object({
   contactInfo: clinicContactInfoSchema,
   hqLocation: clinicLocationSchema,
   isActive: z.boolean(),
-  logo: z.string().optional().nullable(),
+  logo: mediaResourceSchema.optional().nullable(),
   practiceType: z.nativeEnum(PracticeType).optional(),
   languages: z.array(z.nativeEnum(Language)).optional(),
   subscriptionModel: z
@@ -324,7 +331,7 @@ export const clinicAdminSignupSchema = z.object({
     .object({
       name: z.string(),
       hqLocation: clinicLocationSchema,
-      logo: z.string().optional(),
+      logo: mediaResourceSchema.optional(),
       contactInfo: clinicContactInfoSchema,
       subscriptionModel: z
         .nativeEnum(SubscriptionModel)
@@ -341,7 +348,7 @@ export const clinicGroupSetupSchema = z.object({
   languages: z.array(z.nativeEnum(Language)),
   practiceType: z.nativeEnum(PracticeType),
   description: z.string(),
-  logo: z.string(),
+  logo: mediaResourceSchema,
   calendarSyncEnabled: z.boolean(),
   autoConfirmAppointments: z.boolean(),
   businessIdentificationNumber: z.string().optional().nullable(),
@@ -357,17 +364,17 @@ export const clinicBranchSetupSchema = z.object({
   contactInfo: clinicContactInfoSchema,
   workingHours: workingHoursSchema,
   tags: z.array(z.nativeEnum(ClinicTag)),
-  logo: z.string().optional(),
-  coverPhoto: z.string().nullable(),
+  logo: mediaResourceSchema.optional(),
+  coverPhoto: mediaResourceSchema.nullable().optional(),
   photosWithTags: z
     .array(
       z.object({
-        url: z.string(),
+        url: mediaResourceSchema,
         tag: z.string(),
       })
     )
     .optional(),
-  featuredPhotos: z.array(z.string()).optional(),
+  featuredPhotos: z.array(mediaResourceSchema).optional(),
 });
 
 /**
@@ -383,4 +390,27 @@ export const updateClinicGroupSchema = createClinicGroupSchema.partial();
 /**
  * Validaciona šema za updating clinic
  */
-export const updateClinicSchema = createClinicSchema.partial();
+export const updateClinicSchema = z.object({
+  name: z.string().optional(),
+  description: z.string().optional(),
+  location: clinicLocationSchema.optional(),
+  contactInfo: clinicContactInfoSchema.optional(),
+  workingHours: workingHoursSchema.optional(),
+  tags: z.array(z.nativeEnum(ClinicTag)).optional(),
+  coverPhoto: mediaResourceSchema.nullable().optional(),
+  photosWithTags: z
+    .array(
+      z.object({
+        url: mediaResourceSchema,
+        tag: z.string(),
+      })
+    )
+    .optional(),
+  doctors: z.array(z.string()).optional(),
+  procedures: z.array(z.string()).optional(),
+  proceduresInfo: z.array(procedureSummaryInfoSchema).optional(),
+  isActive: z.boolean().optional(),
+  isVerified: z.boolean().optional(),
+  logo: mediaResourceSchema.optional().nullable(),
+  featuredPhotos: z.array(mediaResourceSchema).optional(),
+});

package/src/validations/schemas.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { UserRole } from "../types";
-import { Timestamp, FieldValue, serverTimestamp } from "firebase/firestore";
+import { Timestamp, FieldValue } from "firebase/firestore";
 
 export const emailSchema = z
   .string()
@@ -24,41 +24,21 @@ export const userRolesSchema = z
   .min(1, "User must have at least one role")
   .max(3, "User cannot have more than 3 roles");
 
-export const timestampSchema = z.custom<
-  Timestamp | FieldValue | (() => FieldValue)
->((data) => {
-  // If data is null or undefined, it's not valid
-  if (data == null) {
-    return false;
-  }
-
-  // If it's serverTimestamp (FieldValue), it's valid
-  if (typeof data === "object" && "isEqual" in data) {
+export const timestampSchema = z.custom<Timestamp | FieldValue>((data) => {
+  // If it's a serverTimestamp (FieldValue), it's valid
+  if (data && typeof data === "object" && "isEqual" in data) {
     return true;
   }
 
   // If it's a Timestamp object, validate its structure
-  if (
+  return (
+    data &&
     typeof data === "object" &&
     "toDate" in data &&
     "seconds" in data &&
     "nanoseconds" in data
-  ) {
-    return true;
-  }
-
-  // If it's the serverTimestamp function reference
-  if (data === serverTimestamp) {
-    return true;
-  }
-
-  // If it's a function that returns FieldValue (serverTimestamp call)
-  if (typeof data === "function") {
-    return true;
-  }
-
-  return false;
-}, "Must be a Timestamp object, FieldValue or serverTimestamp function");
+  );
+}, "Must be a Timestamp object or serverTimestamp");
 
 /**
  * Validaciona šema za clinic admin opcije pri kreiranju