@blackcode_sa/metaestetics-api 1.15.17-staging.4 → 1.15.17-staging.6

package/dist/admin/index.d.mts

@@ -1420,6 +1420,7 @@ interface AdminToken {
     email?: string | null;
     status: AdminTokenStatus;
     usedByUserRef?: string;
+    clinicGroupId: string;
     createdAt: Timestamp;
     expiresAt: Timestamp;
 }
@@ -1558,7 +1559,8 @@ interface ClinicGroup {
     clinicsInfo: ClinicInfo[];
     admins: string[];
     adminsInfo: AdminInfo[];
-    adminTokens: AdminToken[];
+    /** @deprecated Tokens now stored in subcollection clinic_groups/{id}/adminTokens */
+    adminTokens?: AdminToken[];
     ownerId: string | null;
     createdAt: Timestamp;
     updatedAt: Timestamp;

package/dist/admin/index.d.ts

@@ -1420,6 +1420,7 @@ interface AdminToken {
     email?: string | null;
     status: AdminTokenStatus;
     usedByUserRef?: string;
+    clinicGroupId: string;
     createdAt: Timestamp;
     expiresAt: Timestamp;
 }
@@ -1558,7 +1559,8 @@ interface ClinicGroup {
     clinicsInfo: ClinicInfo[];
     admins: string[];
     adminsInfo: AdminInfo[];
-    adminTokens: AdminToken[];
+    /** @deprecated Tokens now stored in subcollection clinic_groups/{id}/adminTokens */
+    adminTokens?: AdminToken[];
     ownerId: string | null;
     createdAt: Timestamp;
     updatedAt: Timestamp;

package/dist/admin/index.js

@@ -4961,7 +4961,7 @@ var ClinicAggregationService = class {
     try {
       await groupRef.update({
         clinicsInfo: admin8.firestore.FieldValue.arrayUnion(clinicInfo),
-        clinicIds: admin8.firestore.FieldValue.arrayUnion(clinicId),
+        clinics: admin8.firestore.FieldValue.arrayUnion(clinicId),
         updatedAt: admin8.firestore.FieldValue.serverTimestamp()
       });
       console.log(

package/dist/admin/index.mjs

@@ -4883,7 +4883,7 @@ var ClinicAggregationService = class {
     try {
       await groupRef.update({
         clinicsInfo: admin8.firestore.FieldValue.arrayUnion(clinicInfo),
-        clinicIds: admin8.firestore.FieldValue.arrayUnion(clinicId),
+        clinics: admin8.firestore.FieldValue.arrayUnion(clinicId),
         updatedAt: admin8.firestore.FieldValue.serverTimestamp()
       });
       console.log(

package/dist/index.d.mts

@@ -5865,6 +5865,7 @@ interface AdminToken {
     email?: string | null;
     status: AdminTokenStatus;
     usedByUserRef?: string;
+    clinicGroupId: string;
     createdAt: Timestamp;
     expiresAt: Timestamp;
 }
@@ -6003,7 +6004,8 @@ interface ClinicGroup {
     clinicsInfo: ClinicInfo[];
     admins: string[];
     adminsInfo: AdminInfo[];
-    adminTokens: AdminToken[];
+    /** @deprecated Tokens now stored in subcollection clinic_groups/{id}/adminTokens */
+    adminTokens?: AdminToken[];
     ownerId: string | null;
     createdAt: Timestamp;
     updatedAt: Timestamp;
@@ -7305,6 +7307,18 @@ declare class ClinicGroupService extends BaseService {
      * Dohvata aktivne admin tokene
      */
     getActiveAdminTokens(groupId: string, adminId: string): Promise<AdminToken[]>;
+    /**
+     * Gets ALL admin tokens for a clinic group (all statuses)
+     */
+    getAllAdminTokens(groupId: string, adminId: string): Promise<AdminToken[]>;
+    /**
+     * Finds an admin token by its value across all clinic groups.
+     * Uses a collection group query for O(1) lookup.
+     */
+    findAdminTokenByValue(tokenValue: string): Promise<{
+        token: AdminToken;
+        clinicGroupId: string;
+    } | null>;
     /**
      * Updates the onboarding status for a clinic group
      *

package/dist/index.d.ts

@@ -5865,6 +5865,7 @@ interface AdminToken {
     email?: string | null;
     status: AdminTokenStatus;
     usedByUserRef?: string;
+    clinicGroupId: string;
     createdAt: Timestamp;
     expiresAt: Timestamp;
 }
@@ -6003,7 +6004,8 @@ interface ClinicGroup {
     clinicsInfo: ClinicInfo[];
     admins: string[];
     adminsInfo: AdminInfo[];
-    adminTokens: AdminToken[];
+    /** @deprecated Tokens now stored in subcollection clinic_groups/{id}/adminTokens */
+    adminTokens?: AdminToken[];
     ownerId: string | null;
     createdAt: Timestamp;
     updatedAt: Timestamp;
@@ -7305,6 +7307,18 @@ declare class ClinicGroupService extends BaseService {
      * Dohvata aktivne admin tokene
      */
     getActiveAdminTokens(groupId: string, adminId: string): Promise<AdminToken[]>;
+    /**
+     * Gets ALL admin tokens for a clinic group (all statuses)
+     */
+    getAllAdminTokens(groupId: string, adminId: string): Promise<AdminToken[]>;
+    /**
+     * Finds an admin token by its value across all clinic groups.
+     * Uses a collection group query for O(1) lookup.
+     */
+    findAdminTokenByValue(tokenValue: string): Promise<{
+        token: AdminToken;
+        clinicGroupId: string;
+    } | null>;
     /**
      * Updates the onboarding status for a clinic group
      *

package/dist/index.js

@@ -667,11 +667,11 @@ var StaffInviteStatus = /* @__PURE__ */ ((StaffInviteStatus2) => {
 var CLINIC_GROUPS_COLLECTION = "clinic_groups";
 var CLINIC_ADMINS_COLLECTION = "clinic_admins";
 var CLINICS_COLLECTION = "clinics";
-var AdminTokenStatus = /* @__PURE__ */ ((AdminTokenStatus2) => {
-  AdminTokenStatus2["ACTIVE"] = "active";
-  AdminTokenStatus2["USED"] = "used";
-  AdminTokenStatus2["EXPIRED"] = "expired";
-  return AdminTokenStatus2;
+var AdminTokenStatus = /* @__PURE__ */ ((AdminTokenStatus3) => {
+  AdminTokenStatus3["ACTIVE"] = "active";
+  AdminTokenStatus3["USED"] = "used";
+  AdminTokenStatus3["EXPIRED"] = "expired";
+  return AdminTokenStatus3;
 })(AdminTokenStatus || {});
 var SubscriptionModel = /* @__PURE__ */ ((SubscriptionModel2) => {
   SubscriptionModel2["NO_SUBSCRIPTION"] = "no_subscription";
@@ -2189,7 +2189,7 @@ var AnalyticsService = class extends BaseService {
    * @param limit - Number of top procedures to return
    * @returns Array of procedure popularity metrics
    */
-  async getProcedurePopularity(dateRange, limit22 = 10) {
+  async getProcedurePopularity(dateRange, limit23 = 10) {
     const appointments = await this.fetchAppointments(void 0, dateRange);
     const completed = getCompletedAppointments(appointments);
     const procedureMap = /* @__PURE__ */ new Map();
@@ -2218,7 +2218,7 @@ var AnalyticsService = class extends BaseService {
       completedCount: data.count,
       rank: 0
       // Will be set after sorting
-    })).sort((a, b) => b.appointmentCount - a.appointmentCount).slice(0, limit22).map((item, index) => ({ ...item, rank: index + 1 }));
+    })).sort((a, b) => b.appointmentCount - a.appointmentCount).slice(0, limit23).map((item, index) => ({ ...item, rank: index + 1 }));
   }
   /**
    * Get procedure profitability metrics
@@ -2227,7 +2227,7 @@ var AnalyticsService = class extends BaseService {
    * @param limit - Number of top procedures to return
    * @returns Array of procedure profitability metrics
    */
-  async getProcedureProfitability(dateRange, limit22 = 10) {
+  async getProcedureProfitability(dateRange, limit23 = 10) {
     const appointments = await this.fetchAppointments(void 0, dateRange);
     const completed = getCompletedAppointments(appointments);
     const procedureMap = /* @__PURE__ */ new Map();
@@ -2261,7 +2261,7 @@ var AnalyticsService = class extends BaseService {
       appointmentCount: data.count,
       rank: 0
       // Will be set after sorting
-    })).sort((a, b) => b.totalRevenue - a.totalRevenue).slice(0, limit22).map((item, index) => ({ ...item, rank: index + 1 }));
+    })).sort((a, b) => b.totalRevenue - a.totalRevenue).slice(0, limit23).map((item, index) => ({ ...item, rank: index + 1 }));
   }
   // ==========================================
   // Time Efficiency Analytics
@@ -5727,10 +5727,9 @@ var adminTokenSchema = import_zod9.z.object({
   email: import_zod9.z.string().email().optional().nullable(),
   status: import_zod9.z.nativeEnum(AdminTokenStatus),
   usedByUserRef: import_zod9.z.string().optional(),
+  clinicGroupId: import_zod9.z.string(),
   createdAt: import_zod9.z.instanceof(Date).or(import_zod9.z.instanceof(import_firestore9.Timestamp)),
-  // Timestamp
   expiresAt: import_zod9.z.instanceof(Date).or(import_zod9.z.instanceof(import_firestore9.Timestamp))
-  // Timestamp
 });
 var stripeTransactionDataSchema = import_zod9.z.object({
   sessionId: import_zod9.z.string().optional(),
@@ -5791,7 +5790,7 @@ var clinicGroupSchema = import_zod9.z.object({
   clinicsInfo: import_zod9.z.array(clinicInfoSchema),
   admins: import_zod9.z.array(import_zod9.z.string()),
   adminsInfo: import_zod9.z.array(adminInfoSchema),
-  adminTokens: import_zod9.z.array(adminTokenSchema),
+  adminTokens: import_zod9.z.array(adminTokenSchema).optional(),
   ownerId: import_zod9.z.string().nullable(),
   createdAt: import_zod9.z.instanceof(Date).or(import_zod9.z.instanceof(import_firestore9.Timestamp)),
   // Timestamp
@@ -15730,6 +15729,7 @@ async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdm
     admins: [ownerId],
     adminsInfo: [],
     adminTokens: [],
+    // @deprecated — tokens now in subcollection, kept for backward compat
     ownerId,
     createdAt: now,
     updatedAt: now,
@@ -15914,6 +15914,10 @@ async function deactivateClinicGroup(db, groupId, app) {
     app
   );
 }
+var ADMIN_TOKENS_SUBCOLLECTION = "adminTokens";
+function adminTokensRef(db, groupId) {
+  return (0, import_firestore41.collection)(db, CLINIC_GROUPS_COLLECTION, groupId, ADMIN_TOKENS_SUBCOLLECTION);
+}
 async function createAdminToken(db, groupId, creatorAdminId, app, data) {
   const group = await getClinicGroup(db, groupId);
   if (!group) {
@@ -15929,68 +15933,60 @@ async function createAdminToken(db, groupId, creatorAdminId, app, data) {
     now.seconds + expiresInDays * 24 * 60 * 60,
     now.nanoseconds
   );
+  const tokenRef = (0, import_firestore41.doc)(adminTokensRef(db, groupId));
   const token = {
-    id: generateId(),
+    id: tokenRef.id,
     token: generateId(),
     status: "active" /* ACTIVE */,
     email,
+    clinicGroupId: groupId,
     createdAt: now,
     expiresAt
   };
-  await updateClinicGroup(
-    db,
-    groupId,
-    {
-      adminTokens: [...group.adminTokens, token]
-    },
-    app
-  );
+  await (0, import_firestore41.setDoc)(tokenRef, token);
   return token;
 }
-async function verifyAndUseAdminToken(db, groupId, token, userRef, app) {
-  const group = await getClinicGroup(db, groupId);
-  if (!group) {
-    throw new Error("Clinic group not found");
-  }
-  const adminToken = group.adminTokens.find((t) => t.token === token);
-  if (!adminToken) {
+async function verifyAndUseAdminToken(db, groupId, tokenValue, userRef, app) {
+  const tokensQuery = (0, import_firestore41.query)(
+    adminTokensRef(db, groupId),
+    (0, import_firestore41.where)("token", "==", tokenValue),
+    (0, import_firestore41.limit)(1)
+  );
+  const snapshot = await (0, import_firestore41.getDocs)(tokensQuery);
+  if (snapshot.empty) {
     throw new Error("Admin token not found");
   }
+  const tokenDoc = snapshot.docs[0];
+  const adminToken = tokenDoc.data();
   if (adminToken.status !== "active" /* ACTIVE */) {
     throw new Error("Admin token is not active");
   }
   const now = import_firestore41.Timestamp.now();
   if (adminToken.expiresAt.seconds < now.seconds) {
-    const updatedTokens2 = group.adminTokens.map(
-      (t) => t.id === adminToken.id ? { ...t, status: "expired" /* EXPIRED */ } : t
-    );
-    await updateClinicGroup(
-      db,
-      groupId,
-      {
-        adminTokens: updatedTokens2
-      },
-      app
-    );
+    await (0, import_firestore41.updateDoc)(tokenDoc.ref, { status: "expired" /* EXPIRED */ });
     throw new Error("Admin token has expired");
   }
-  const updatedTokens = group.adminTokens.map(
-    (t) => t.id === adminToken.id ? {
-      ...t,
-      status: "used" /* USED */,
-      usedByUserRef: userRef
-    } : t
-  );
-  await updateClinicGroup(
-    db,
-    groupId,
-    {
-      adminTokens: updatedTokens
-    },
-    app
-  );
+  await (0, import_firestore41.updateDoc)(tokenDoc.ref, {
+    status: "used" /* USED */,
+    usedByUserRef: userRef
+  });
   return true;
 }
+async function findAdminTokenByValue(db, tokenValue) {
+  const tokensQuery = (0, import_firestore41.query)(
+    (0, import_firestore41.collectionGroup)(db, ADMIN_TOKENS_SUBCOLLECTION),
+    (0, import_firestore41.where)("token", "==", tokenValue),
+    (0, import_firestore41.where)("status", "==", "active" /* ACTIVE */),
+    (0, import_firestore41.limit)(1)
+  );
+  const snapshot = await (0, import_firestore41.getDocs)(tokensQuery);
+  if (snapshot.empty) return null;
+  const tokenData = snapshot.docs[0].data();
+  return {
+    token: tokenData,
+    clinicGroupId: tokenData.clinicGroupId
+  };
+}
 async function deleteAdminToken(db, groupId, tokenId, adminId, app) {
   const group = await getClinicGroup(db, groupId);
   if (!group) {
@@ -15999,15 +15995,7 @@ async function deleteAdminToken(db, groupId, tokenId, adminId, app) {
   if (!group.admins.includes(adminId)) {
     throw new Error("Admin does not belong to this clinic group");
   }
-  const updatedTokens = group.adminTokens.filter((t) => t.id !== tokenId);
-  await updateClinicGroup(
-    db,
-    groupId,
-    {
-      adminTokens: updatedTokens
-    },
-    app
-  );
+  await (0, import_firestore41.deleteDoc)((0, import_firestore41.doc)(adminTokensRef(db, groupId), tokenId));
 }
 async function getActiveAdminTokens(db, groupId, adminId, app) {
   const group = await getClinicGroup(db, groupId);
@@ -16017,7 +16005,23 @@ async function getActiveAdminTokens(db, groupId, adminId, app) {
   if (!group.admins.includes(adminId)) {
     throw new Error("Admin does not belong to this clinic group");
   }
-  return group.adminTokens.filter((t) => t.status === "active" /* ACTIVE */);
+  const tokensQuery = (0, import_firestore41.query)(
+    adminTokensRef(db, groupId),
+    (0, import_firestore41.where)("status", "==", "active" /* ACTIVE */)
+  );
+  const snapshot = await (0, import_firestore41.getDocs)(tokensQuery);
+  return snapshot.docs.map((d) => d.data());
+}
+async function getAllAdminTokens(db, groupId, adminId, app) {
+  const group = await getClinicGroup(db, groupId);
+  if (!group) {
+    throw new Error("Clinic group not found");
+  }
+  if (!group.admins.includes(adminId)) {
+    throw new Error("Admin does not belong to this clinic group");
+  }
+  const snapshot = await (0, import_firestore41.getDocs)(adminTokensRef(db, groupId));
+  return snapshot.docs.map((d) => d.data());
 }
 
 // src/services/clinic/clinic-group.service.ts
@@ -16147,11 +16151,19 @@ var ClinicGroupService = class extends BaseService {
   async getActiveAdminTokens(groupId, adminId) {
     return getActiveAdminTokens(this.db, groupId, adminId, this.app);
   }
-  // TODO: Add a method to get all admin tokens for a clinic group (not just active ones)
-  // TODO: Refactor admin token methods not to add tokens to the clinicGroup document,
-  // but to add them to a subcollection called adminTokens that belongs to a specific clinicGroup document
-  // TODO: Add granular control over admin permissions, e.g. only allow admins to manage certain clinics to tokens directly
-  // TODO: Generally refactor admin tokens and invites, also create cloud function to send invites and send updates when sombody uses the token
+  /**
+   * Gets ALL admin tokens for a clinic group (all statuses)
+   */
+  async getAllAdminTokens(groupId, adminId) {
+    return getAllAdminTokens(this.db, groupId, adminId, this.app);
+  }
+  /**
+   * Finds an admin token by its value across all clinic groups.
+   * Uses a collection group query for O(1) lookup.
+   */
+  async findAdminTokenByValue(tokenValue) {
+    return findAdminTokenByValue(this.db, tokenValue);
+  }
   /**
    * Updates the onboarding status for a clinic group
    *
@@ -17787,7 +17799,6 @@ var AuthService = class extends BaseService {
           });
           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");
@@ -17805,46 +17816,20 @@ var AuthService = class extends BaseService {
         console.log("[AUTH] Invite token provided", {
           token: data.inviteToken
         });
-        console.log("[AUTH] Searching for token in clinic groups");
-        const groupsRef = (0, import_firestore46.collection)(this.db, CLINIC_GROUPS_COLLECTION);
-        const q = (0, import_firestore46.query)(groupsRef);
-        const querySnapshot = await (0, import_firestore46.getDocs)(q);
-        let foundGroup = null;
-        let foundToken = null;
-        console.log("[AUTH] Found", querySnapshot.size, "clinic groups to check");
-        for (const docSnapshot of querySnapshot.docs) {
-          const group = docSnapshot.data();
-          console.log("[AUTH] Checking group", {
-            groupId: group.id,
-            groupName: group.name
-          });
-          const token = group.adminTokens.find((t) => {
-            const isMatch = t.token === data.inviteToken && t.status === "active" /* ACTIVE */ && new Date(t.expiresAt.toDate()) > /* @__PURE__ */ new Date();
-            console.log("[AUTH] Checking token", {
-              tokenId: t.id,
-              tokenMatch: t.token === data.inviteToken,
-              tokenStatus: t.status,
-              tokenActive: t.status === "active" /* ACTIVE */,
-              tokenExpiry: new Date(t.expiresAt.toDate()),
-              tokenExpired: new Date(t.expiresAt.toDate()) <= /* @__PURE__ */ new Date(),
-              isMatch
-            });
-            return isMatch;
-          });
-          if (token) {
-            foundGroup = group;
-            foundToken = token;
-            console.log("[AUTH] Found matching token in group", {
-              groupId: group.id,
-              tokenId: token.id
-            });
-            break;
-          }
-        }
-        if (!foundGroup || !foundToken) {
-          console.error("[AUTH] No valid token found in any clinic group");
+        console.log("[AUTH] Searching for token via collection group query");
+        const tokenResult = await clinicGroupService.findAdminTokenByValue(data.inviteToken);
+        if (!tokenResult) {
+          console.error("[AUTH] No valid active token found");
           throw new Error("Invalid or expired invite token");
         }
+        console.log("[AUTH] Found matching token", {
+          tokenId: tokenResult.token.id,
+          clinicGroupId: tokenResult.clinicGroupId
+        });
+        const foundGroup = await clinicGroupService.getClinicGroup(tokenResult.clinicGroupId);
+        if (!foundGroup) {
+          throw new Error("Clinic group not found for token");
+        }
         clinicGroup = foundGroup;
         console.log("[AUTH] Creating clinic admin");
         const createClinicAdminData = {
@@ -24202,17 +24187,17 @@ var ProcedureService = class extends BaseService {
       const proceduresCollection = (0, import_firestore64.collection)(this.db, PROCEDURES_COLLECTION);
       let proceduresQuery = (0, import_firestore64.query)(proceduresCollection);
       if (pagination && pagination > 0) {
-        const { limit: limit22, startAfter: startAfter20 } = await import("firebase/firestore");
+        const { limit: limit23, startAfter: startAfter20 } = await import("firebase/firestore");
         if (lastDoc) {
           proceduresQuery = (0, import_firestore64.query)(
             proceduresCollection,
             (0, import_firestore64.orderBy)("name"),
             // Use imported orderBy
             startAfter20(lastDoc),
-            limit22(pagination)
+            limit23(pagination)
           );
         } else {
-          proceduresQuery = (0, import_firestore64.query)(proceduresCollection, (0, import_firestore64.orderBy)("name"), limit22(pagination));
+          proceduresQuery = (0, import_firestore64.query)(proceduresCollection, (0, import_firestore64.orderBy)("name"), limit23(pagination));
         }
       } else {
         proceduresQuery = (0, import_firestore64.query)(proceduresCollection, (0, import_firestore64.orderBy)("name"));
@@ -28252,9 +28237,9 @@ var ConstantsService = class extends BaseService {
    */
   async getAllBenefits(options) {
     const allBenefits = await this.getAllBenefitsForFilter();
-    const { page, limit: limit22 } = options;
-    const startIndex = page * limit22;
-    const endIndex = startIndex + limit22;
+    const { page, limit: limit23 } = options;
+    const startIndex = page * limit23;
+    const endIndex = startIndex + limit23;
     const paginatedBenefits = allBenefits.slice(startIndex, endIndex);
     return { benefits: paginatedBenefits, total: allBenefits.length };
   }
@@ -28351,9 +28336,9 @@ var ConstantsService = class extends BaseService {
    */
   async getAllContraindications(options) {
     const allContraindications = await this.getAllContraindicationsForFilter();
-    const { page, limit: limit22 } = options;
-    const startIndex = page * limit22;
-    const endIndex = startIndex + limit22;
+    const { page, limit: limit23 } = options;
+    const startIndex = page * limit23;
+    const endIndex = startIndex + limit23;
     const paginatedContraindications = allContraindications.slice(
       startIndex,
       endIndex