@blackcode_sa/metaestetics-api 1.7.6 → 1.7.8

package/src/services/media/media.service.ts

@@ -6,16 +6,13 @@ import {
   uploadBytes,
   getDownloadURL,
   deleteObject,
-  listAll,
-  FirebaseStorage,
+  getBytes,
 } from "firebase/storage";
 import {
   doc,
   getDoc,
   setDoc,
   updateDoc,
-  arrayUnion,
-  arrayRemove,
   collection,
   query,
   where,
@@ -39,17 +36,17 @@ export enum MediaAccessLevel {
  * Media file metadata interface
  */
 export interface MediaMetadata {
-  id: string;
-  name: string;
-  url: string;
-  contentType: string;
-  size: number;
-  createdAt: Timestamp;
-  accessLevel: MediaAccessLevel;
-  ownerId: string;
-  collectionName: string;
-  path: string;
-  updatedAt?: Timestamp;
+  id: string; // Unique ID for the media, also Firestore document ID
+  name: string; // Original file name or a descriptive name
+  url: string; // Publicly accessible download URL
+  contentType: string; // Mime type of the file
+  size: number; // Size of the file in bytes
+  createdAt: Timestamp; // Firestore Timestamp of creation
+  accessLevel: MediaAccessLevel; // Access level
+  ownerId: string; // ID of the entity that owns this media (e.g., patientId, clinicId)
+  collectionName: string; // Name of the collection this media belongs to (e.g., 'patient_profile_pictures', 'clinic_gallery')
+  path: string; // Full path in Firebase Storage
+  updatedAt?: Timestamp; // Firestore Timestamp of last update
 }
 
 const MEDIA_METADATA_COLLECTION = "media_metadata";
@@ -69,31 +66,28 @@ export class MediaService extends BaseService {
    * @returns Promise with the media metadata.
    */
   async uploadMedia(
-    file: File,
+    file: File | Blob,
     ownerId: string,
     accessLevel: MediaAccessLevel,
     collectionName: string,
     originalFileName?: string
   ): Promise<MediaMetadata> {
     const mediaId = this.generateId();
-    const fileNameToUse = originalFileName || file.name;
-    // Sanitize fileNameToUse if necessary, e.g., remove special characters or ensure a safe extension
+    const fileNameToUse =
+      originalFileName || (file instanceof File ? file.name : file.toString());
+    // Using collectionName in the path for better organization
     const uniqueFileName = `${mediaId}-${fileNameToUse}`;
-    const filePath = `media/${accessLevel}/${ownerId}/${uniqueFileName}`;
+    const filePath = `media/${accessLevel}/${ownerId}/${collectionName}/${uniqueFileName}`;
 
     console.log(`[MediaService] Uploading file to: ${filePath}`);
-
     const storageRef = ref(this.storage, filePath);
-
     try {
       const uploadResult = await uploadBytes(storageRef, file, {
         contentType: file.type,
       });
       console.log("[MediaService] File uploaded successfully", uploadResult);
-
       const downloadURL = await getDownloadURL(uploadResult.ref);
       console.log("[MediaService] Got download URL:", downloadURL);
-
       const metadata: MediaMetadata = {
         id: mediaId,
         name: fileNameToUse,
@@ -104,17 +98,14 @@ export class MediaService extends BaseService {
         accessLevel: accessLevel,
         ownerId: ownerId,
         collectionName: collectionName,
-        path: filePath, // Store the full storage path
+        path: filePath,
       };
-
       const metadataDocRef = doc(this.db, MEDIA_METADATA_COLLECTION, mediaId);
       await setDoc(metadataDocRef, metadata);
       console.log("[MediaService] Metadata stored in Firestore:", mediaId);
-
       return metadata;
     } catch (error) {
       console.error("[MediaService] Error during media upload:", error);
-      // Consider more specific error handling or re-throwing a custom error
       throw error;
     }
   }
@@ -204,20 +195,21 @@ export class MediaService extends BaseService {
   }
 
   /**
-   * Update media access level. This is a complex operation if it involves moving the file.
-   * For now, this will only update the metadata. True access control might need storage path changes and Firestore rule updates.
+   * Update media access level. This involves moving the file in Firebase Storage
+   * to a new path reflecting the new access level, and updating its metadata.
    * @param mediaId - ID of the media to update.
    * @param newAccessLevel - New access level.
-   * @returns Promise with the updated media metadata.
+   * @returns Promise with the updated media metadata, or null if metadata not found.
    */
   async updateMediaAccessLevel(
     mediaId: string,
     newAccessLevel: MediaAccessLevel
   ): Promise<MediaMetadata | null> {
     console.log(
-      `[MediaService] Updating access level for media ID: ${mediaId} to ${newAccessLevel}`
+      `[MediaService] Attempting to update access level for media ID: ${mediaId} to ${newAccessLevel}`
     );
     const metadata = await this.getMediaMetadata(mediaId);
+
     if (!metadata) {
       console.warn(
         `[MediaService] Metadata not found for media ID ${mediaId}. Cannot update access level.`
@@ -225,28 +217,124 @@ export class MediaService extends BaseService {
       return null;
     }
 
-    // IMPORTANT: This only updates the metadata field.
-    // If your Firebase Storage rules depend on the path, this won't change file accessibility directly.
-    // A full implementation might involve moving the file in storage to a new path (e.g., media/newAccessLevel/...),
-    // updating the URL, and then updating the metadata. This is significantly more complex.
+    if (metadata.accessLevel === newAccessLevel) {
+      console.log(
+        `[MediaService] Media ID ${mediaId} already has access level ${newAccessLevel}. Updating timestamp only.`
+      );
+      const metadataDocRef = doc(this.db, MEDIA_METADATA_COLLECTION, mediaId);
+      try {
+        await updateDoc(metadataDocRef, { updatedAt: Timestamp.now() });
+        return { ...metadata, updatedAt: Timestamp.now() };
+      } catch (error) {
+        console.error(
+          `[MediaService] Error updating timestamp for media ID ${mediaId}:`,
+          error
+        );
+        throw error; // Re-throw to indicate the update wasn't fully successful
+      }
+    }
+
+    const oldStoragePath = metadata.path;
+    // Ensure the filename part remains consistent using metadata.id and metadata.name
+    const fileNamePart = `${metadata.id}-${metadata.name}`;
+    const newStoragePath = `media/${newAccessLevel}/${metadata.ownerId}/${metadata.collectionName}/${fileNamePart}`;
 
-    const metadataDocRef = doc(this.db, MEDIA_METADATA_COLLECTION, mediaId);
-    const updateData = {
-      accessLevel: newAccessLevel,
-      updatedAt: Timestamp.now(),
-    };
+    console.log(
+      `[MediaService] Moving file for ${mediaId} from ${oldStoragePath} to ${newStoragePath}`
+    );
+
+    const oldStorageFileRef = ref(this.storage, oldStoragePath);
+    const newStorageFileRef = ref(this.storage, newStoragePath);
 
     try {
+      // 1. Download (get bytes of) the old file
+      console.log(`[MediaService] Downloading bytes from ${oldStoragePath}`);
+      const fileBytes = await getBytes(oldStorageFileRef);
+      console.log(
+        `[MediaService] Successfully downloaded ${fileBytes.byteLength} bytes from ${oldStoragePath}`
+      );
+
+      // 2. Upload the bytes to the new path
+      console.log(`[MediaService] Uploading bytes to ${newStoragePath}`);
+      await uploadBytes(newStorageFileRef, fileBytes, {
+        contentType: metadata.contentType,
+      });
+      console.log(
+        `[MediaService] Successfully uploaded bytes to ${newStoragePath}`
+      );
+
+      // 3. Get the new download URL
+      const newDownloadURL = await getDownloadURL(newStorageFileRef);
+      console.log(
+        `[MediaService] Got new download URL for ${newStoragePath}: ${newDownloadURL}`
+      );
+
+      // 4. Prepare metadata for update
+      const updateData = {
+        accessLevel: newAccessLevel,
+        path: newStoragePath,
+        url: newDownloadURL,
+        updatedAt: Timestamp.now(),
+      };
+
+      // 5. Update Firestore metadata
+      const metadataDocRef = doc(this.db, MEDIA_METADATA_COLLECTION, mediaId);
+      console.log(
+        `[MediaService] Updating Firestore metadata for ${mediaId} with new data:`,
+        updateData
+      );
       await updateDoc(metadataDocRef, updateData);
-      console.log(`[MediaService] Media access level updated for ${mediaId}.`);
-      // Return the updated metadata
+      console.log(
+        `[MediaService] Successfully updated Firestore metadata for ${mediaId}`
+      );
+
+      // 6. Delete the old file from Firebase Storage (after metadata is updated)
+      try {
+        console.log(`[MediaService] Deleting old file from ${oldStoragePath}`);
+        await deleteObject(oldStorageFileRef);
+        console.log(
+          `[MediaService] Successfully deleted old file from ${oldStoragePath}`
+        );
+      } catch (deleteError) {
+        console.error(
+          `[MediaService] Failed to delete old file from ${oldStoragePath} for media ID ${mediaId}. This file is now orphaned. Error:`,
+          deleteError
+        );
+        // Do not re-throw here, as the primary operation (move and metadata update) was successful.
+        // Log this issue for potential manual cleanup.
+      }
+
       return { ...metadata, ...updateData } as MediaMetadata;
     } catch (error) {
       console.error(
-        `[MediaService] Error updating media access level for ${mediaId}:`,
+        `[MediaService] Error updating media access level and moving file for ${mediaId}:`,
         error
       );
-      throw error;
+      // Attempt to clean up if new file was created but process failed before metadata update
+      // This is a best-effort cleanup. If newDownloadURL is not defined, it means upload failed.
+      // If newDownloadURL is defined but metadata update failed, new file might exist.
+      if (
+        newStorageFileRef &&
+        (error as any).code !== "storage/object-not-found" &&
+        (error as any).message?.includes("uploadBytes")
+      ) {
+        // This check is a bit heuristic. Ideally, check if new file actually exists.
+        console.warn(
+          `[MediaService] Attempting to delete partially uploaded file at ${newStoragePath} due to error.`
+        );
+        try {
+          await deleteObject(newStorageFileRef);
+          console.warn(
+            `[MediaService] Cleaned up partially uploaded file at ${newStoragePath}.`
+          );
+        } catch (cleanupError) {
+          console.error(
+            `[MediaService] Failed to cleanup partially uploaded file at ${newStoragePath}:`,
+            cleanupError
+          );
+        }
+      }
+      throw error; // Re-throw the original error to the caller
     }
   }
 
@@ -284,14 +372,9 @@ export class MediaService extends BaseService {
     if (startAfterId) {
       const startAfterDoc = await this.getMediaMetadata(startAfterId);
       if (startAfterDoc) {
-        // Firestore's startAfter needs a DocumentSnapshot or field values from it.
-        // For simplicity, if using cursor-based pagination with getDocs, you'd pass the snapshot.
-        // If building query manually, it's more complex with orderBy fields.
-        // This part needs refinement based on actual pagination strategy.
-        // For now, let's assume we'd fetch the doc snapshot if needed or simplify.
-        // console.log("[MediaService] Pagination: starting after document corresponding to ID", startAfterId);
-        // This simple approach of passing ID won't directly work with Firestore's startAfter without fetching the document snapshot first.
-        // A more robust solution would involve passing the actual DocumentSnapshot or specific field values of the last retrieved document.
+        // Placeholder: Firestore's startAfter needs a DocumentSnapshot or field values.
+        // For robust pagination, pass the actual DocumentSnapshot or use field values from it.
+        // e.g., qConstraints.push(startAfter(snapshotOfStartAfterDoc));
       }
     }
 

package/src/services/practitioner/practitioner.service.ts

@@ -229,8 +229,12 @@ export class PractitionerService extends BaseService {
             // Make sure we're using the right property for featuredPhoto
             featuredPhoto:
               clinicData.featuredPhotos && clinicData.featuredPhotos.length > 0
-                ? clinicData.featuredPhotos[0]
-                : clinicData.coverPhoto || "",
+                ? typeof clinicData.featuredPhotos[0] === "string"
+                  ? clinicData.featuredPhotos[0]
+                  : ""
+                : (typeof clinicData.coverPhoto === "string"
+                    ? clinicData.coverPhoto
+                    : "") || "",
             description: clinicData.description || null,
           });
         }
@@ -442,6 +446,14 @@ export class PractitionerService extends BaseService {
         `${PRACTITIONERS_COLLECTION}/${practitionerId}/${REGISTER_TOKENS_COLLECTION}`
       );
 
+      console.log(
+        `[PRACTITIONER] Validating token for practitioner ${practitionerId}`,
+        {
+          tokenString,
+          timestamp: Timestamp.now().toDate(),
+        }
+      );
+
       const q = query(
         tokensRef,
         where("token", "==", tokenString),
@@ -449,9 +461,31 @@ export class PractitionerService extends BaseService {
         where("expiresAt", ">", Timestamp.now())
       );
 
-      const tokenSnapshot = await getDocs(q);
-      if (!tokenSnapshot.empty) {
-        return tokenSnapshot.docs[0].data() as PractitionerToken;
+      try {
+        const tokenSnapshot = await getDocs(q);
+        console.log(
+          `[PRACTITIONER] Token query results for practitioner ${practitionerId}`,
+          {
+            found: !tokenSnapshot.empty,
+            count: tokenSnapshot.size,
+          }
+        );
+
+        if (!tokenSnapshot.empty) {
+          const tokenData = tokenSnapshot.docs[0].data() as PractitionerToken;
+          console.log(`[PRACTITIONER] Valid token found`, {
+            tokenId: tokenData.id,
+            expiresAt: tokenData.expiresAt.toDate(),
+          });
+          return tokenData;
+        }
+      } catch (error) {
+        console.error(
+          `[PRACTITIONER] Error validating token for practitioner ${practitionerId}:`,
+          error
+        );
+        // Re-throw the error to be handled by the caller
+        throw error;
       }
     }
 
@@ -726,19 +760,43 @@ export class PractitionerService extends BaseService {
     userId: string
   ): Promise<Practitioner | null> {
     // Find the token
+    console.log("[PRACTITIONER] Validating token for claiming profile", {
+      tokenString,
+      userId,
+    });
+
     const token = await this.validateToken(tokenString);
+
     if (!token) {
+      console.log(
+        "[PRACTITIONER] Token validation failed - token not found or not valid",
+        {
+          tokenString,
+        }
+      );
       return null; // Token not found or not valid
     }
 
+    console.log("[PRACTITIONER] Token successfully validated", {
+      tokenId: token.id,
+      practitionerId: token.practitionerId,
+    });
+
     // Get the practitioner profile
     const practitioner = await this.getPractitioner(token.practitionerId);
     if (!practitioner) {
+      console.log("[PRACTITIONER] Practitioner not found", {
+        practitionerId: token.practitionerId,
+      });
       return null; // Practitioner not found
     }
 
     // Ensure practitioner is in DRAFT status
     if (practitioner.status !== PractitionerStatus.DRAFT) {
+      console.log("[PRACTITIONER] Practitioner status is not DRAFT", {
+        practitionerId: practitioner.id,
+        status: practitioner.status,
+      });
       throw new Error("This practitioner profile has already been claimed");
     }
 
@@ -757,6 +815,11 @@ export class PractitionerService extends BaseService {
     // Mark the token as used
     await this.markTokenAsUsed(token.id, token.practitionerId, userId);
 
+    console.log("[PRACTITIONER] Profile claimed successfully", {
+      practitionerId: updatedPractitioner.id,
+      userId,
+    });
+
     return updatedPractitioner;
   }
 

package/src/services/procedure/procedure.service.ts

@@ -153,8 +153,12 @@ export class ProcedureService extends BaseService {
       description: clinic.description || "",
       featuredPhoto:
         clinic.featuredPhotos && clinic.featuredPhotos.length > 0
-          ? clinic.featuredPhotos[0]
-          : clinic.coverPhoto || "",
+          ? typeof clinic.featuredPhotos[0] === "string"
+            ? clinic.featuredPhotos[0]
+            : ""
+          : typeof clinic.coverPhoto === "string"
+          ? clinic.coverPhoto
+          : "",
       location: clinic.location,
       contactInfo: clinic.contactInfo,
     };
@@ -344,8 +348,12 @@ export class ProcedureService extends BaseService {
         description: newClinic.description || "",
         featuredPhoto:
           newClinic.featuredPhotos && newClinic.featuredPhotos.length > 0
-            ? newClinic.featuredPhotos[0]
-            : newClinic.coverPhoto || "",
+            ? typeof newClinic.featuredPhotos[0] === "string"
+              ? newClinic.featuredPhotos[0]
+              : ""
+            : typeof newClinic.coverPhoto === "string"
+            ? newClinic.coverPhoto
+            : "",
         location: newClinic.location,
         contactInfo: newClinic.contactInfo,
       };

package/src/types/clinic/index.ts

@@ -1,18 +1,26 @@
-import { Timestamp, FieldValue } from 'firebase/firestore';
-import type { ProcedureFamily } from '../../backoffice/types/static/procedure-family.types';
-import type { TreatmentBenefit } from '../../backoffice/types/static/treatment-benefit.types';
-import type { Currency, PricingMeasure } from '../../backoffice/types/static/pricing.types';
-import type { ClinicInfo } from '../profile';
-import { ClinicReviewInfo } from '../reviews';
-import { ProcedureSummaryInfo } from '../procedure';
+import { Timestamp, FieldValue } from "firebase/firestore";
+import type { ProcedureFamily } from "../../backoffice/types/static/procedure-family.types";
+import type { TreatmentBenefit } from "../../backoffice/types/static/treatment-benefit.types";
+import type {
+  Currency,
+  PricingMeasure,
+} from "../../backoffice/types/static/pricing.types";
+import type { ClinicInfo } from "../profile";
+import { ClinicReviewInfo } from "../reviews";
+import { ProcedureSummaryInfo } from "../procedure";
 
-export const CLINIC_GROUPS_COLLECTION = 'clinic_groups';
-export const CLINIC_ADMINS_COLLECTION = 'clinic_admins';
-export const CLINICS_COLLECTION = 'clinics';
+export const CLINIC_GROUPS_COLLECTION = "clinic_groups";
+export const CLINIC_ADMINS_COLLECTION = "clinic_admins";
+export const CLINICS_COLLECTION = "clinics";
 
-import { PracticeType, Language, ClinicTag, ClinicPhotoTag } from './preferences.types';
+import {
+  PracticeType,
+  Language,
+  ClinicTag,
+  ClinicPhotoTag,
+} from "./preferences.types";
 
-export * from './preferences.types';
+export * from "./preferences.types";
 
 /**
  * Interface for clinic contact information
@@ -132,9 +140,9 @@ export interface UpdateClinicAdminData extends Partial<CreateClinicAdminData> {
  * Enum for admin token status
  */
 export enum AdminTokenStatus {
-  ACTIVE = 'active',
-  USED = 'used',
-  EXPIRED = 'expired',
+  ACTIVE = "active",
+  USED = "used",
+  EXPIRED = "expired",
 }
 
 /**
@@ -163,10 +171,10 @@ export interface AdminInfo {
  * Enum for subscription models
  */
 export enum SubscriptionModel {
-  NO_SUBSCRIPTION = 'no_subscription',
-  BASIC = 'basic',
-  PREMIUM = 'premium',
-  ENTERPRISE = 'enterprise',
+  NO_SUBSCRIPTION = "no_subscription",
+  BASIC = "basic",
+  PREMIUM = "premium",
+  ENTERPRISE = "enterprise",
 }
 
 /**
@@ -188,7 +196,7 @@ export interface ClinicGroup {
   createdAt: Timestamp;
   updatedAt: Timestamp;
   isActive: boolean;
-  logo?: string | null;
+  logo?: MediaResource | null;
   practiceType?: PracticeType;
   languages?: Language[];
   subscriptionModel: SubscriptionModel;
@@ -208,7 +216,7 @@ export interface CreateClinicGroupData {
   contactPerson: ContactPerson;
   ownerId: string | null;
   isActive: boolean;
-  logo?: string | null;
+  logo?: MediaResource | null;
   practiceType?: PracticeType;
   languages?: Language[];
   subscriptionModel?: SubscriptionModel;
@@ -239,32 +247,16 @@ export interface DoctorInfo {
   id: string;
   name: string;
   description?: string;
-  photo: string;
+  photo: string | null;
   rating: number;
   services: string[]; // Used for search and filtering
   // TODO: Add aggregated fields, like rating, reviews, services this doctor provides in this clinic and similar
 }
 
 /**
- * Interface for service information
+ * Type that allows a field to be either a URL string or a File object
  */
-// export interface ServiceInfo {  // <-- Comment out or remove old ServiceInfo
-//   id: string;
-//   name: string;
-//   description?: string;
-//   photo: string;
-//   procedureFamily: ProcedureFamily;
-//   category: string;
-//   subCategory: string;
-//   technology: string;
-//   rating: number;
-//   doctors: string[]; // Used for search and filtering
-//   price: number;
-//   pricingMeasure: PricingMeasure;
-//   currency: Currency;
-//   duration: number; // Duration in minutes
-//   treatmentBenefits: TreatmentBenefit[];
-// }
+export type MediaResource = string | File | Blob;
 
 /**
  * Interface for clinic
@@ -278,20 +270,20 @@ export interface Clinic {
   contactInfo: ClinicContactInfo;
   workingHours: WorkingHours;
   tags: ClinicTag[];
-  featuredPhotos: string[];
-  coverPhoto: string | null;
-  photosWithTags?: { url: string; tag: string }[];
+  featuredPhotos: MediaResource[];
+  coverPhoto: MediaResource | null;
+  photosWithTags?: { url: MediaResource; tag: string }[];
   doctors: string[];
   doctorsInfo: DoctorInfo[];
   procedures: string[];
-  proceduresInfo: ProcedureSummaryInfo[]; // <-- Use the new type instead of servicesInfo
-  reviewInfo: ClinicReviewInfo; // Aggregated review information
+  proceduresInfo: ProcedureSummaryInfo[];
+  reviewInfo: ClinicReviewInfo;
   admins: string[];
   createdAt: Timestamp;
   updatedAt: Timestamp;
   isActive: boolean;
   isVerified: boolean;
-  logo?: string;
+  logo?: MediaResource | null;
 }
 
 /**
@@ -305,16 +297,16 @@ export interface CreateClinicData {
   contactInfo: ClinicContactInfo;
   workingHours: WorkingHours;
   tags: ClinicTag[];
-  coverPhoto: string | null;
-  photosWithTags?: { url: string; tag: string }[];
-  doctors: string[];
-  procedures: string[];
-  proceduresInfo?: ProcedureSummaryInfo[]; // <-- Add this
+  coverPhoto?: MediaResource | null;
+  photosWithTags?: { url: MediaResource; tag: string }[];
+  doctors?: string[];
+  procedures?: string[];
+  proceduresInfo?: ProcedureSummaryInfo[];
   admins: string[];
-  isActive: boolean;
-  isVerified: boolean;
-  logo?: string;
-  featuredPhotos?: string[];
+  isActive?: boolean;
+  isVerified?: boolean;
+  logo?: MediaResource | null;
+  featuredPhotos?: MediaResource[];
 }
 
 /**
@@ -334,7 +326,7 @@ export interface CreateDefaultClinicGroupData {
   contactInfo: ClinicContactInfo;
   hqLocation: ClinicLocation;
   isActive: boolean;
-  logo?: string | null;
+  logo?: string | File | null;
   practiceType?: PracticeType;
   languages?: Language[];
   subscriptionModel?: SubscriptionModel;
@@ -355,7 +347,7 @@ export interface ClinicAdminSignupData {
   clinicGroupData?: {
     name: string;
     hqLocation: ClinicLocation;
-    logo?: string;
+    logo?: string | File | null;
     contactInfo: ClinicContactInfo;
     subscriptionModel?: SubscriptionModel;
   };
@@ -368,7 +360,7 @@ export interface ClinicGroupSetupData {
   languages: Language[];
   practiceType: PracticeType;
   description: string;
-  logo: string;
+  logo: string | File | null;
   calendarSyncEnabled: boolean;
   autoConfirmAppointments: boolean;
   businessIdentificationNumber: string | null;
@@ -384,10 +376,10 @@ export interface ClinicBranchSetupData {
   contactInfo: ClinicContactInfo;
   workingHours: WorkingHours;
   tags: ClinicTag[];
-  logo?: string;
-  coverPhoto: string | null;
-  photosWithTags?: { url: string; tag: string }[];
-  featuredPhotos?: string[];
+  logo?: MediaResource | null;
+  coverPhoto?: MediaResource | null;
+  photosWithTags?: { url: MediaResource; tag: string }[];
+  featuredPhotos?: MediaResource[];
 }
 
 /**

package/src/types/index.ts

@@ -1,5 +1,5 @@
 import { User as FirebaseAuthUser } from "firebase/auth";
-import { Timestamp, FieldValue, serverTimestamp } from "firebase/firestore";
+import { Timestamp, FieldValue } from "firebase/firestore";
 
 // User tipovi
 export enum UserRole {
@@ -14,9 +14,9 @@ export interface User {
   email: string | null;
   roles: UserRole[];
   isAnonymous: boolean;
-  createdAt: Timestamp | FieldValue | (() => FieldValue);
-  updatedAt: Timestamp | FieldValue | (() => FieldValue);
-  lastLoginAt: Timestamp | FieldValue | (() => FieldValue);
+  createdAt: Timestamp | FieldValue;
+  updatedAt: Timestamp | FieldValue;
+  lastLoginAt: Timestamp | FieldValue;
   patientProfile?: string;
   practitionerProfile?: string;
   adminProfile?: string;
@@ -27,9 +27,9 @@ export interface CreateUserData {
   email: string | null;
   roles: UserRole[];
   isAnonymous: boolean;
-  createdAt: FieldValue | Timestamp | (() => FieldValue);
-  updatedAt: FieldValue | Timestamp | (() => FieldValue);
-  lastLoginAt: FieldValue | Timestamp | (() => FieldValue);
+  createdAt: FieldValue;
+  updatedAt: FieldValue;
+  lastLoginAt: FieldValue;
 }
 
 export const USERS_COLLECTION = "users";