@blackcode_sa/metaestetics-api 1.4.8 → 1.4.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@blackcode_sa/metaestetics-api",
   "private": false,
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "Firebase authentication service with anonymous upgrade support",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

package/src/services/auth.service.ts

@@ -208,8 +208,8 @@ export class AuthService extends BaseService {
           );
         }
 
-        // First create the clinic admin
-        console.log("[AUTH] Creating clinic admin first");
+        // First create the clinic admin without a group
+        console.log("[AUTH] Creating clinic admin first (without group)");
         const createClinicAdminData: CreateClinicAdminData = {
           userRef: firebaseUser.uid,
           isGroupOwner: true,
@@ -217,11 +217,17 @@ export class AuthService extends BaseService {
           contactInfo: contactPerson,
           roleTitle: data.title,
           isActive: true,
+          // No clinicGroupId yet
         };
 
+        let adminProfile;
         try {
-          await clinicAdminService.createClinicAdmin(createClinicAdminData);
-          console.log("[AUTH] Clinic admin created successfully");
+          adminProfile = await clinicAdminService.createClinicAdmin(
+            createClinicAdminData
+          );
+          console.log("[AUTH] Clinic admin created successfully", {
+            adminId: adminProfile.id,
+          });
         } catch (adminCreationError) {
           console.error(
             "[AUTH] Clinic admin creation failed:",
@@ -236,7 +242,7 @@ export class AuthService extends BaseService {
           hqLocation: data.clinicGroupData.hqLocation,
           contactInfo: data.clinicGroupData.contactInfo,
           contactPerson: contactPerson,
-          ownerId: firebaseUser.uid,
+          ownerId: adminProfile.id, // Use admin profile ID, not user UID
           isActive: true,
           logo: data.clinicGroupData.logo || null,
           subscriptionModel:
@@ -248,13 +254,24 @@ export class AuthService extends BaseService {
         });
 
         // Create clinic group
+        let clinicGroup;
         try {
-          await clinicGroupService.createClinicGroup(
+          clinicGroup = await clinicGroupService.createClinicGroup(
             createClinicGroupData,
-            firebaseUser.uid,
-            true
+            adminProfile.id, // Use admin profile ID, not user UID
+            false // This is not a default group since we're providing complete data
           );
-          console.log("[AUTH] Clinic group created successfully");
+          console.log("[AUTH] Clinic group created successfully", {
+            groupId: clinicGroup.id,
+          });
+
+          // Now update the admin with the group ID
+          console.log("[AUTH] Updating admin with clinic group ID");
+          await clinicAdminService.updateClinicAdmin(adminProfile.id, {
+            // Use admin profile ID, not user UID
+            clinicGroupId: clinicGroup.id,
+          });
+          console.log("[AUTH] Admin updated with clinic group ID successfully");
         } catch (groupCreationError) {
           console.error(
             "[AUTH] Clinic group creation failed:",
@@ -344,9 +361,14 @@ export class AuthService extends BaseService {
           isActive: true,
         };
 
+        let adminProfile;
         try {
-          await clinicAdminService.createClinicAdmin(createClinicAdminData);
-          console.log("[AUTH] Clinic admin created successfully");
+          adminProfile = await clinicAdminService.createClinicAdmin(
+            createClinicAdminData
+          );
+          console.log("[AUTH] Clinic admin created successfully", {
+            adminId: adminProfile.id,
+          });
         } catch (adminCreationError) {
           console.error(
             "[AUTH] Clinic admin creation failed:",

package/src/services/clinic/clinic-group.service.ts

@@ -34,6 +34,7 @@ import { Auth } from "firebase/auth";
 import { Firestore } from "firebase/firestore";
 import { FirebaseApp } from "firebase/app";
 import * as ClinicGroupUtils from "./utils/clinic-group.utils";
+import { uploadPhoto } from "./utils/photos.utils";
 
 export class ClinicGroupService extends BaseService {
   private clinicAdminService: ClinicAdminService;
@@ -61,7 +62,8 @@ export class ClinicGroupService extends BaseService {
       data,
       ownerId,
       isDefault,
-      this.clinicAdminService
+      this.clinicAdminService,
+      this.app
     );
   }
 
@@ -86,28 +88,38 @@ export class ClinicGroupService extends BaseService {
     groupId: string,
     data: Partial<ClinicGroup>
   ): Promise<ClinicGroup> {
-    return ClinicGroupUtils.updateClinicGroup(this.db, groupId, data);
+    return ClinicGroupUtils.updateClinicGroup(this.db, groupId, data, this.app);
   }
 
   /**
    * Dodaje admina u grupaciju
    */
   async addAdminToGroup(groupId: string, adminId: string): Promise<void> {
-    return ClinicGroupUtils.addAdminToGroup(this.db, groupId, adminId);
+    return ClinicGroupUtils.addAdminToGroup(
+      this.db,
+      groupId,
+      adminId,
+      this.app
+    );
   }
 
   /**
    * Uklanja admina iz grupacije
    */
   async removeAdminFromGroup(groupId: string, adminId: string): Promise<void> {
-    return ClinicGroupUtils.removeAdminFromGroup(this.db, groupId, adminId);
+    return ClinicGroupUtils.removeAdminFromGroup(
+      this.db,
+      groupId,
+      adminId,
+      this.app
+    );
   }
 
   /**
    * Deaktivira grupaciju klinika
    */
   async deactivateClinicGroup(groupId: string): Promise<void> {
-    return ClinicGroupUtils.deactivateClinicGroup(this.db, groupId);
+    return ClinicGroupUtils.deactivateClinicGroup(this.db, groupId, this.app);
   }
 
   /**
@@ -121,22 +133,56 @@ export class ClinicGroupService extends BaseService {
     groupId: string,
     setupData: ClinicGroupSetupData
   ): Promise<ClinicGroup> {
+    console.log("[CLINIC_GROUP] Setting up clinic group", { groupId });
+
     // Get the clinic group
     const clinicGroup = await this.getClinicGroup(groupId);
     if (!clinicGroup) {
+      console.error("[CLINIC_GROUP] Clinic group not found", { groupId });
       throw new Error(`Clinic group with ID ${groupId} not found`);
     }
 
+    // Process logo if it's a data URL
+    let logoUrl = setupData.logo;
+    if (logoUrl && typeof logoUrl === "string" && logoUrl.startsWith("data:")) {
+      console.log("[CLINIC_GROUP] Processing logo in setupClinicGroup");
+      try {
+        const uploadedLogoUrl = await uploadPhoto(
+          logoUrl,
+          "clinic-groups",
+          groupId,
+          "logo",
+          this.app
+        );
+        console.log("[CLINIC_GROUP] Logo processed in setupClinicGroup", {
+          uploadedLogoUrl,
+        });
+
+        // Replace the data URL with the uploaded URL if upload was successful
+        if (uploadedLogoUrl !== null) {
+          logoUrl = uploadedLogoUrl;
+        }
+      } catch (error) {
+        console.error(
+          "[CLINIC_GROUP] Error processing logo in setupClinicGroup:",
+          error
+        );
+        // Continue with update even if logo upload fails
+      }
+    }
+
     // Update the clinic group with the setup data
     const updateData = {
       languages: setupData.languages,
       practiceType: setupData.practiceType,
       description: setupData.description,
-      logo: setupData.logo,
+      logo: logoUrl,
       calendarSyncEnabled: setupData.calendarSyncEnabled,
       autoConfirmAppointments: setupData.autoConfirmAppointments,
     };
 
+    console.log("[CLINIC_GROUP] Updating clinic group with setup data");
+
     // Update the clinic group
     return this.updateClinicGroup(groupId, updateData);
   }
@@ -153,6 +199,7 @@ export class ClinicGroupService extends BaseService {
       this.db,
       groupId,
       creatorAdminId,
+      this.app,
       data
     );
   }
@@ -169,7 +216,8 @@ export class ClinicGroupService extends BaseService {
       this.db,
       groupId,
       token,
-      userRef
+      userRef,
+      this.app
     );
   }
 
@@ -185,7 +233,8 @@ export class ClinicGroupService extends BaseService {
       this.db,
       groupId,
       tokenId,
-      adminId
+      adminId,
+      this.app
     );
   }
 
@@ -196,6 +245,11 @@ export class ClinicGroupService extends BaseService {
     groupId: string,
     adminId: string
   ): Promise<AdminToken[]> {
-    return ClinicGroupUtils.getActiveAdminTokens(this.db, groupId, adminId);
+    return ClinicGroupUtils.getActiveAdminTokens(
+      this.db,
+      groupId,
+      adminId,
+      this.app
+    );
   }
 }

package/src/services/clinic/clinic.service.ts

@@ -76,7 +76,8 @@ export class ClinicService extends BaseService {
       data,
       creatorAdminId,
       this.clinicGroupService,
-      this.clinicAdminService
+      this.clinicAdminService,
+      this.app
     );
   }
 
@@ -126,7 +127,8 @@ export class ClinicService extends BaseService {
       clinicId,
       data,
       adminId,
-      this.clinicAdminService
+      this.clinicAdminService,
+      this.app
     );
   }
 
@@ -140,7 +142,7 @@ export class ClinicService extends BaseService {
       "id" | "clinicId" | "createdAt" | "updatedAt" | "isVerified"
     >
   ): Promise<ClinicReview> {
-    return ReviewUtils.addReview(this.db, clinicId, review);
+    return ReviewUtils.addReview(this.db, clinicId, review, this.app);
   }
 
   /**
@@ -170,7 +172,8 @@ export class ClinicService extends BaseService {
       clinicId,
       adminId,
       newTags,
-      this.clinicAdminService
+      this.clinicAdminService,
+      this.app
     );
   }
 
@@ -189,7 +192,8 @@ export class ClinicService extends BaseService {
       clinicId,
       adminId,
       tagsToRemove,
-      this.clinicAdminService
+      this.clinicAdminService,
+      this.app
     );
   }
 
@@ -237,13 +241,22 @@ export class ClinicService extends BaseService {
     setupData: ClinicBranchSetupData,
     adminId: string
   ): Promise<Clinic> {
+    console.log("[CLINIC_SERVICE] Starting clinic branch creation", {
+      clinicGroupId,
+      adminId,
+    });
+
     // Validate that the clinic group exists
     const clinicGroup = await this.clinicGroupService.getClinicGroup(
       clinicGroupId
     );
     if (!clinicGroup) {
+      console.error("[CLINIC_SERVICE] Clinic group not found", {
+        clinicGroupId,
+      });
       throw new Error(`Clinic group with ID ${clinicGroupId} not found`);
     }
+    console.log("[CLINIC_SERVICE] Clinic group verified");
 
     // Create the clinic data
     const createClinicData: CreateClinicData = {
@@ -254,8 +267,8 @@ export class ClinicService extends BaseService {
       contactInfo: setupData.contactInfo,
       workingHours: setupData.workingHours,
       tags: setupData.tags,
-      photos: setupData.photos,
-      photosWithTags: setupData.photosWithTags,
+      photos: setupData.photos || [],
+      photosWithTags: setupData.photosWithTags || [],
       doctors: [],
       services: [],
       admins: [adminId],
@@ -265,11 +278,21 @@ export class ClinicService extends BaseService {
       featuredPhotos: setupData.featuredPhotos || [],
     };
 
-    // Create the clinic
+    console.log("[CLINIC_SERVICE] Creating clinic branch with data", {
+      name: createClinicData.name,
+      hasLogo: !!createClinicData.logo,
+      photosCount: createClinicData.photos.length,
+      featuredPhotosCount: createClinicData.featuredPhotos?.length || 0,
+      photosWithTagsCount: createClinicData.photosWithTags?.length || 0,
+    });
+
+    // Create the clinic - the createClinic method will handle photo uploads
     const clinic = await this.createClinic(createClinicData, adminId);
+    console.log("[CLINIC_SERVICE] Clinic branch created successfully", {
+      clinicId: clinic.id,
+    });
 
     // Note: The createClinic method already adds the clinic to the admin's managed clinics
-
     return clinic;
   }
 }

package/src/services/clinic/utils/admin.utils.ts

@@ -85,48 +85,10 @@ export async function createClinicAdmin(
     hasGroupId: !!clinicGroupId,
   });
 
+  // For owners creating a new group, we'll set the group ID later
   if (validatedData.isGroupOwner && !clinicGroupId) {
-    console.log("[CLINIC_ADMIN] Creating default group for owner");
-    // Kreiramo default grupu
-    const defaultGroup: CreateDefaultClinicGroupData = {
-      name: `${validatedData.contactInfo.firstName}'s Group`,
-      ownerId: validatedData.userRef,
-      contactPerson: validatedData.contactInfo,
-      contactInfo: {
-        email: validatedData.contactInfo.email,
-        phoneNumber: validatedData.contactInfo.phoneNumber || "",
-      },
-      hqLocation: {
-        address: "",
-        city: "",
-        country: "",
-        postalCode: "",
-        latitude: 0,
-        longitude: 0,
-      },
-      isActive: true,
-    };
-    console.log("[CLINIC_ADMIN] Default group data prepared", {
-      groupName: defaultGroup.name,
-    });
-
-    try {
-      const clinicGroup = await clinicGroupService.createClinicGroup(
-        defaultGroup,
-        validatedData.userRef,
-        true
-      );
-      clinicGroupId = clinicGroup.id;
-      console.log("[CLINIC_ADMIN] Default group created successfully", {
-        groupId: clinicGroupId,
-      });
-    } catch (groupCreationError) {
-      console.error(
-        "[CLINIC_ADMIN] Error creating default group:",
-        groupCreationError
-      );
-      throw groupCreationError;
-    }
+    console.log("[CLINIC_ADMIN] Owner will be assigned to group later");
+    // Skip creating default group here - will be done in auth service
   }
   // Ako nije owner a nemamo groupId, to je greška
   else if (!validatedData.isGroupOwner && !clinicGroupId) {
@@ -162,21 +124,14 @@ export async function createClinicAdmin(
 
   console.log("[CLINIC_ADMIN] Preparing admin data object");
 
-  // Ensure clinicGroupId is not undefined
-  if (!clinicGroupId) {
-    console.error(
-      "[CLINIC_ADMIN] clinicGroupId is undefined, which should not happen at this point"
-    );
-    throw new Error("clinicGroupId is required but was undefined");
-  }
-
+  // Allow creating admin without a clinic group for owners
   const adminData: Omit<ClinicAdmin, "createdAt" | "updatedAt"> & {
     createdAt: ReturnType<typeof serverTimestamp>;
     updatedAt: ReturnType<typeof serverTimestamp>;
   } = {
-    id: validatedData.userRef,
+    id: doc(collection(db, CLINIC_ADMINS_COLLECTION)).id, // Generate a new ID for the admin document
     userRef: validatedData.userRef,
-    clinicGroupId: clinicGroupId,
+    clinicGroupId: clinicGroupId || "", // Empty string for now if no group ID
     isGroupOwner: validatedData.isGroupOwner,
     clinicsManaged: [], // Uvek krećemo od prazne liste
     clinicsManagedInfo: [], // Empty array for clinic info