@blackcode_sa/metaestetics-api 1.15.17-staging.5 → 1.15.17-staging.7

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.js

@@ -10542,7 +10542,7 @@ var removeMedicationUtil = async (db, patientId, medicationIndex, requesterId, r
 // src/services/patient/utils/profile.utils.ts
 var import_firestore26 = require("firebase/firestore");
 var import_zod13 = require("zod");
-var createPatientProfileUtil = async (db, data, generateId2) => {
+var createPatientProfileUtil = async (db, data, generateId) => {
   var _a, _b;
   try {
     console.log("[createPatientProfileUtil] Starting patient profile creation");
@@ -10552,7 +10552,7 @@ var createPatientProfileUtil = async (db, data, generateId2) => {
         "userRef is required to create a standard patient profile."
       );
     }
-    const patientId = generateId2();
+    const patientId = generateId();
     console.log(`[createPatientProfileUtil] Generated patientId: ${patientId}`);
     const patientData = {
       id: patientId,
@@ -10886,7 +10886,7 @@ var createPatientTokenSchema = import_zod14.z.object({
 });
 
 // src/services/patient/utils/token.utils.ts
-var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
+var createPatientTokenUtil = async (db, data, createdBy, generateId) => {
   var _a;
   const validatedData = createPatientTokenSchema.parse(data);
   const patientRef = getPatientDocRef(db, validatedData.patientId);
@@ -10897,9 +10897,9 @@ var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
     );
   }
   const expiration = validatedData.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3);
-  const tokenString = generateId2().slice(0, 6).toUpperCase();
+  const tokenString = generateId().slice(0, 6).toUpperCase();
   const token = {
-    id: generateId2(),
+    id: generateId(),
     token: tokenString,
     patientId: validatedData.patientId,
     email: validatedData.email,
@@ -15637,14 +15637,12 @@ async function uploadMultiplePhotos(photos, entityType, entityId, photoType, app
 }
 
 // src/services/clinic/utils/clinic-group.utils.ts
-function generateId() {
-  const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  const timestamp = Date.now().toString(36);
-  const randomPart = Array.from(
-    { length: 12 },
+function generateTokenCode() {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+  return Array.from(
+    { length: 6 },
     () => chars.charAt(Math.floor(Math.random() * chars.length))
   ).join("");
-  return `${randomPart}-${timestamp}`;
 }
 async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdminService, app) {
   console.log("[CLINIC_GROUP] Starting clinic group creation", {
@@ -15936,7 +15934,7 @@ async function createAdminToken(db, groupId, creatorAdminId, app, data) {
   const tokenRef = (0, import_firestore41.doc)(adminTokensRef(db, groupId));
   const token = {
     id: tokenRef.id,
-    token: generateId(),
+    token: generateTokenCode(),
     status: "active" /* ACTIVE */,
     email,
     clinicGroupId: groupId,
@@ -17799,7 +17797,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");
@@ -18683,8 +18680,8 @@ function getClinicSyncedCalendarDocRef(db, clinicId, syncedCalendarId) {
 }
 
 // src/services/calendar/utils/clinic.utils.ts
-async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getClinicCalendarEventDocRef(db, clinicId, eventId);
   const newEvent = {
     id: eventId,
@@ -18734,8 +18731,8 @@ async function checkAutoConfirmAppointmentsUtil(db, clinicId) {
 
 // src/services/calendar/utils/patient.utils.ts
 var import_firestore49 = require("firebase/firestore");
-async function createPatientCalendarEventUtil(db, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPatientCalendarEventUtil(db, patientId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPatientCalendarEventDocRef(db, patientId, eventId);
   const newEvent = {
     id: eventId,
@@ -18766,8 +18763,8 @@ async function updatePatientCalendarEventUtil(db, patientId, eventId, updateData
 
 // src/services/calendar/utils/practitioner.utils.ts
 var import_firestore50 = require("firebase/firestore");
-async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPractitionerCalendarEventDocRef(
     db,
     practitionerId,
@@ -18805,8 +18802,8 @@ async function updatePractitionerCalendarEventUtil(db, practitionerId, eventId,
 }
 
 // src/services/calendar/utils/appointment.utils.ts
-async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId) {
+  const eventId = generateId();
   const autoConfirm = await checkAutoConfirmAppointmentsUtil(db, clinicId);
   const initialStatus = autoConfirm ? "confirmed" /* CONFIRMED */ : "pending" /* PENDING */;
   const appointmentData = {
@@ -18972,8 +18969,8 @@ async function searchCalendarEventsUtil(db, params) {
 
 // src/services/calendar/utils/synced-calendar.utils.ts
 var import_firestore52 = require("firebase/firestore");
-async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPractitionerSyncedCalendarDocRef(
     db,
     practitionerId,
@@ -18992,8 +18989,8 @@ async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendar
     updatedAt: import_firestore52.Timestamp.now()
   };
 }
-async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
   const newCalendar = {
     id: calendarId,
@@ -19008,8 +19005,8 @@ async function createPatientSyncedCalendarUtil(db, patientId, calendarData, gene
     updatedAt: import_firestore52.Timestamp.now()
   };
 }
-async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
   const newCalendar = {
     id: calendarId,

package/dist/index.mjs

@@ -10509,7 +10509,7 @@ import {
   doc as doc16
 } from "firebase/firestore";
 import { z as z13 } from "zod";
-var createPatientProfileUtil = async (db, data, generateId2) => {
+var createPatientProfileUtil = async (db, data, generateId) => {
   var _a, _b;
   try {
     console.log("[createPatientProfileUtil] Starting patient profile creation");
@@ -10519,7 +10519,7 @@ var createPatientProfileUtil = async (db, data, generateId2) => {
         "userRef is required to create a standard patient profile."
       );
     }
-    const patientId = generateId2();
+    const patientId = generateId();
     console.log(`[createPatientProfileUtil] Generated patientId: ${patientId}`);
     const patientData = {
       id: patientId,
@@ -10864,7 +10864,7 @@ var createPatientTokenSchema = z14.object({
 });
 
 // src/services/patient/utils/token.utils.ts
-var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
+var createPatientTokenUtil = async (db, data, createdBy, generateId) => {
   var _a;
   const validatedData = createPatientTokenSchema.parse(data);
   const patientRef = getPatientDocRef(db, validatedData.patientId);
@@ -10875,9 +10875,9 @@ var createPatientTokenUtil = async (db, data, createdBy, generateId2) => {
     );
   }
   const expiration = validatedData.expiresAt || new Date(Date.now() + 7 * 24 * 60 * 60 * 1e3);
-  const tokenString = generateId2().slice(0, 6).toUpperCase();
+  const tokenString = generateId().slice(0, 6).toUpperCase();
   const token = {
-    id: generateId2(),
+    id: generateId(),
     token: tokenString,
     patientId: validatedData.patientId,
     email: validatedData.email,
@@ -15666,14 +15666,12 @@ async function uploadMultiplePhotos(photos, entityType, entityId, photoType, app
 }
 
 // src/services/clinic/utils/clinic-group.utils.ts
-function generateId() {
-  const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  const timestamp = Date.now().toString(36);
-  const randomPart = Array.from(
-    { length: 12 },
+function generateTokenCode() {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+  return Array.from(
+    { length: 6 },
     () => chars.charAt(Math.floor(Math.random() * chars.length))
   ).join("");
-  return `${randomPart}-${timestamp}`;
 }
 async function createClinicGroup(db, data, ownerId, isDefault = false, clinicAdminService, app) {
   console.log("[CLINIC_GROUP] Starting clinic group creation", {
@@ -15965,7 +15963,7 @@ async function createAdminToken(db, groupId, creatorAdminId, app, data) {
   const tokenRef = doc28(adminTokensRef(db, groupId));
   const token = {
     id: tokenRef.id,
-    token: generateId(),
+    token: generateTokenCode(),
     status: "active" /* ACTIVE */,
     email,
     clinicGroupId: groupId,
@@ -17868,7 +17866,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");
@@ -18774,8 +18771,8 @@ function getClinicSyncedCalendarDocRef(db, clinicId, syncedCalendarId) {
 }
 
 // src/services/calendar/utils/clinic.utils.ts
-async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createClinicCalendarEventUtil(db, clinicId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getClinicCalendarEventDocRef(db, clinicId, eventId);
   const newEvent = {
     id: eventId,
@@ -18837,8 +18834,8 @@ import {
   Timestamp as Timestamp25,
   serverTimestamp as serverTimestamp26
 } from "firebase/firestore";
-async function createPatientCalendarEventUtil(db, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPatientCalendarEventUtil(db, patientId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPatientCalendarEventDocRef(db, patientId, eventId);
   const newEvent = {
     id: eventId,
@@ -18881,8 +18878,8 @@ import {
   Timestamp as Timestamp26,
   serverTimestamp as serverTimestamp27
 } from "firebase/firestore";
-async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createPractitionerCalendarEventUtil(db, practitionerId, eventData, generateId) {
+  const eventId = generateId();
   const eventRef = getPractitionerCalendarEventDocRef(
     db,
     practitionerId,
@@ -18920,8 +18917,8 @@ async function updatePractitionerCalendarEventUtil(db, practitionerId, eventId,
 }
 
 // src/services/calendar/utils/appointment.utils.ts
-async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId2) {
-  const eventId = generateId2();
+async function createAppointmentUtil(db, clinicId, practitionerId, patientId, eventData, generateId) {
+  const eventId = generateId();
   const autoConfirm = await checkAutoConfirmAppointmentsUtil(db, clinicId);
   const initialStatus = autoConfirm ? "confirmed" /* CONFIRMED */ : "pending" /* PENDING */;
   const appointmentData = {
@@ -19111,8 +19108,8 @@ import {
   Timestamp as Timestamp28,
   serverTimestamp as serverTimestamp29
 } from "firebase/firestore";
-async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPractitionerSyncedCalendarDocRef(
     db,
     practitionerId,
@@ -19131,8 +19128,8 @@ async function createPractitionerSyncedCalendarUtil(db, practitionerId, calendar
     updatedAt: Timestamp28.now()
   };
 }
-async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createPatientSyncedCalendarUtil(db, patientId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getPatientSyncedCalendarDocRef(db, patientId, calendarId);
   const newCalendar = {
     id: calendarId,
@@ -19147,8 +19144,8 @@ async function createPatientSyncedCalendarUtil(db, patientId, calendarData, gene
     updatedAt: Timestamp28.now()
   };
 }
-async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId2) {
-  const calendarId = generateId2();
+async function createClinicSyncedCalendarUtil(db, clinicId, calendarData, generateId) {
+  const calendarId = generateId();
   const calendarRef = getClinicSyncedCalendarDocRef(db, clinicId, calendarId);
   const newCalendar = {
     id: calendarId,

package/package.json

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

package/src/admin/aggregation/clinic/clinic.aggregation.service.ts

@@ -59,7 +59,7 @@ export class ClinicAggregationService {
     try {
       await groupRef.update({
         clinicsInfo: admin.firestore.FieldValue.arrayUnion(clinicInfo),
-        clinicIds: admin.firestore.FieldValue.arrayUnion(clinicId),
+        clinics: admin.firestore.FieldValue.arrayUnion(clinicId),
         updatedAt: admin.firestore.FieldValue.serverTimestamp(),
       });
 

package/src/services/auth/auth.service.ts

@@ -319,11 +319,12 @@ export class AuthService extends BaseService {
           // 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');
 
+          // adminsInfo is populated by onCreateClinicAdmin Firestore trigger
+
           // Get the updated admin profile
           adminProfile = await clinicAdminService.getClinicAdmin(adminProfile.id);
         } catch (groupCreationError) {

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

@@ -50,6 +50,18 @@ function generateId(): string {
   return `${randomPart}-${timestamp}`;
 }
 
+/**
+ * Generates a short 6-character uppercase alphanumeric token code.
+ * Used for admin registration tokens — easy to read, type, and share.
+ * 36^6 = ~2.1 billion combinations, collision risk negligible for active tokens.
+ */
+function generateTokenCode(): string {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789"; // no I/1/O/0 to avoid confusion
+  return Array.from({ length: 6 }, () =>
+    chars.charAt(Math.floor(Math.random() * chars.length))
+  ).join("");
+}
+
 /**
  * Creates a new clinic group
  * @param db - Firestore database instance
@@ -372,9 +384,10 @@ export async function addAdminToGroup(
         adminId,
         groupId,
       });
-      return; // Admin is already in the group
+      return;
     }
 
+    // Only add the admin ID — adminsInfo is populated by onCreateClinicAdmin trigger
     console.log("[CLINIC_GROUP] Updating group with new admin");
     await updateClinicGroup(
       db,
@@ -501,7 +514,7 @@ export async function createAdminToken(
   const tokenRef = doc(adminTokensRef(db, groupId));
   const token: AdminToken = {
     id: tokenRef.id,
-    token: generateId(),
+    token: generateTokenCode(),
     status: AdminTokenStatus.ACTIVE,
     email,
     clinicGroupId: groupId,