@blackcode_sa/metaestetics-api 1.14.32 → 1.14.36

package/dist/index.mjs

@@ -2138,7 +2138,8 @@ var AnalyticsService = class extends BaseService {
         return metrics;
       }
     }
-    const appointments = await this.fetchAppointments(void 0, dateRange);
+    const filters = (options == null ? void 0 : options.clinicBranchId) ? { clinicBranchId: options.clinicBranchId } : void 0;
+    const appointments = await this.fetchAppointments(filters, dateRange);
     const canceled = getCanceledAppointments(appointments);
     if (groupBy === "clinic") {
       return this.groupCancellationsByClinic(canceled, appointments);
@@ -2367,7 +2368,8 @@ var AnalyticsService = class extends BaseService {
         return metrics;
       }
     }
-    const appointments = await this.fetchAppointments(void 0, dateRange);
+    const filters = (options == null ? void 0 : options.clinicBranchId) ? { clinicBranchId: options.clinicBranchId } : void 0;
+    const appointments = await this.fetchAppointments(filters, dateRange);
     const noShow = getNoShowAppointments(appointments);
     if (groupBy === "clinic") {
       return this.groupNoShowsByClinic(noShow, appointments);
@@ -23616,13 +23618,12 @@ var BrandService = class extends BaseService {
     return { id: docRef.id, ...newBrand };
   }
   /**
-   * Gets a paginated list of active brands, optionally filtered by name and category.
+   * Gets a paginated list of active brands, optionally filtered by name.
    * @param rowsPerPage - The number of brands to fetch.
    * @param searchTerm - An optional string to filter brand names by (starts-with search).
    * @param lastVisible - An optional document snapshot to use as a cursor for pagination.
-   * @param category - An optional category to filter brands by.
    */
-  async getAll(rowsPerPage, searchTerm, lastVisible, category) {
+  async getAll(rowsPerPage, searchTerm, lastVisible) {
     const constraints = [
       where35("isActive", "==", true),
       orderBy19("name_lowercase")
@@ -23634,9 +23635,6 @@ var BrandService = class extends BaseService {
         where35("name_lowercase", "<=", lowercasedSearchTerm + "\uF8FF")
       );
     }
-    if (category) {
-      constraints.push(where35("category", "==", category));
-    }
     if (lastVisible) {
       constraints.push(startAfter15(lastVisible));
     }
@@ -23653,11 +23651,10 @@ var BrandService = class extends BaseService {
     return { brands, lastVisible: newLastVisible };
   }
   /**
-   * Gets the total count of active brands, optionally filtered by name and category.
+   * Gets the total count of active brands, optionally filtered by name.
    * @param searchTerm - An optional string to filter brand names by (starts-with search).
-   * @param category - An optional category to filter brands by.
    */
-  async getBrandsCount(searchTerm, category) {
+  async getBrandsCount(searchTerm) {
     const constraints = [where35("isActive", "==", true)];
     if (searchTerm) {
       const lowercasedSearchTerm = searchTerm.toLowerCase();
@@ -23666,9 +23663,6 @@ var BrandService = class extends BaseService {
         where35("name_lowercase", "<=", lowercasedSearchTerm + "\uF8FF")
       );
     }
-    if (category) {
-      constraints.push(where35("category", "==", category));
-    }
     const q = query35(this.getBrandsRef(), ...constraints);
     const snapshot = await getCountFromServer3(q);
     return snapshot.data().count;
@@ -23738,7 +23732,6 @@ var BrandService = class extends BaseService {
       "id",
       "name",
       "manufacturer",
-      "category",
       "website",
       "description",
       "isActive"
@@ -23769,15 +23762,14 @@ var BrandService = class extends BaseService {
     return includeBom ? "\uFEFF" + csvBody : csvBody;
   }
   brandToCsvRow(brand) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     const values = [
       (_a = brand.id) != null ? _a : "",
       (_b = brand.name) != null ? _b : "",
       (_c = brand.manufacturer) != null ? _c : "",
-      (_d = brand.category) != null ? _d : "",
-      (_e = brand.website) != null ? _e : "",
-      (_f = brand.description) != null ? _f : "",
-      String((_g = brand.isActive) != null ? _g : "")
+      (_d = brand.website) != null ? _d : "",
+      (_e = brand.description) != null ? _e : "",
+      String((_f = brand.isActive) != null ? _f : "")
     ];
     return values.map((v) => this.formatCsvValue(v)).join(",");
   }
@@ -25245,7 +25237,8 @@ var TechnologyService = class extends BaseService {
     const products = await this.getAssignedProducts(technologyId);
     const byBrand = {};
     products.forEach((product) => {
-      byBrand[product.brandName] = (byBrand[product.brandName] || 0) + 1;
+      const brandName = product.brandName || "Unknown";
+      byBrand[brandName] = (byBrand[brandName] || 0) + 1;
     });
     return {
       totalAssigned: products.length,
@@ -25592,11 +25585,10 @@ var ProductService = class extends BaseService {
   /**
    * Creates a new product in the top-level collection
    */
-  async createTopLevel(brandId, product, technologyIds = []) {
+  async createTopLevel(product, technologyIds = []) {
     const now = /* @__PURE__ */ new Date();
     const newProduct = {
       ...product,
-      brandId,
       assignedTechnologyIds: technologyIds,
       createdAt: now,
       updatedAt: now,
@@ -25609,11 +25601,14 @@ var ProductService = class extends BaseService {
    * Gets all products from the top-level collection
    */
   async getAllTopLevel(options) {
-    const { rowsPerPage, lastVisible, brandId } = options;
+    const { rowsPerPage, lastVisible, brandId, category } = options;
     const constraints = [where39("isActive", "==", true), orderBy23("name")];
     if (brandId) {
       constraints.push(where39("brandId", "==", brandId));
     }
+    if (category) {
+      constraints.push(where39("category", "==", category));
+    }
     if (lastVisible) {
       constraints.push(startAfter19(lastVisible));
     }
@@ -25754,14 +25749,10 @@ var ProductService = class extends BaseService {
       "name",
       "brandId",
       "brandName",
+      "category",
       "assignedTechnologyIds",
       "description",
-      "technicalDetails",
-      "dosage",
-      "composition",
-      "indications",
-      "contraindications",
-      "warnings",
+      "metadata",
       "isActive"
     ];
     const rows = [];
@@ -25790,21 +25781,17 @@ var ProductService = class extends BaseService {
     return includeBom ? "\uFEFF" + csvBody : csvBody;
   }
   productToCsvRow(product) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     const values = [
       (_a = product.id) != null ? _a : "",
       (_b = product.name) != null ? _b : "",
       (_c = product.brandId) != null ? _c : "",
       (_d = product.brandName) != null ? _d : "",
-      (_f = (_e = product.assignedTechnologyIds) == null ? void 0 : _e.join(";")) != null ? _f : "",
-      (_g = product.description) != null ? _g : "",
-      (_h = product.technicalDetails) != null ? _h : "",
-      (_i = product.dosage) != null ? _i : "",
-      (_j = product.composition) != null ? _j : "",
-      (_l = (_k = product.indications) == null ? void 0 : _k.join(";")) != null ? _l : "",
-      (_n = (_m = product.contraindications) == null ? void 0 : _m.map((c) => c.name).join(";")) != null ? _n : "",
-      (_p = (_o = product.warnings) == null ? void 0 : _o.join(";")) != null ? _p : "",
-      String((_q = product.isActive) != null ? _q : "")
+      (_e = product.category) != null ? _e : "",
+      (_g = (_f = product.assignedTechnologyIds) == null ? void 0 : _f.join(";")) != null ? _g : "",
+      (_h = product.description) != null ? _h : "",
+      product.metadata ? JSON.stringify(product.metadata) : "",
+      String((_i = product.isActive) != null ? _i : "")
     ];
     return values.map((v) => this.formatCsvValue(v)).join(",");
   }

package/package.json

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

package/src/admin/mailing/patientInvite/patientInvite.mailing.ts

@@ -69,7 +69,7 @@ export class PatientInviteMailingService extends BaseMailingService {
   private readonly DEFAULT_REGISTRATION_URL =
     "https://metaesthetics.net/patient/register";
   private readonly DEFAULT_SUBJECT =
-    "Claim Your Patient Profile - MetaEstetics";
+    "Claim Your Patient Profile - MetaEsthetics";
   private readonly DEFAULT_MAILGUN_DOMAIN = "mg.metaesthetics.net";
 
   /**
@@ -120,7 +120,7 @@ export class PatientInviteMailingService extends BaseMailingService {
       // Determine 'from' address
       const fromAddress =
         data.options?.fromAddress ||
-        `MetaEstetics <no-reply@${
+        `MetaEsthetics <no-reply@${
           data.options?.mailgunDomain || this.DEFAULT_MAILGUN_DOMAIN
         }>`;
 
@@ -358,7 +358,7 @@ export class PatientInviteMailingService extends BaseMailingService {
         Logger.warn(
           "[PatientInviteMailingService] No fromAddress provided, using default"
         );
-        mailgunConfig.fromAddress = `MetaEstetics <no-reply@${this.DEFAULT_MAILGUN_DOMAIN}>`;
+        mailgunConfig.fromAddress = `MetaEsthetics <no-reply@${this.DEFAULT_MAILGUN_DOMAIN}>`;
       }
 
       // Prepare email data

package/src/admin/mailing/patientInvite/templates/invitation.template.ts

@@ -22,7 +22,7 @@ export const patientInvitationTemplate = `
       padding: 20px;
     }
     .header {
-      background-color: #2C8E99;
+      background-color: #4A90E2;
       padding: 20px;
       text-align: center;
       color: white;
@@ -37,31 +37,20 @@ export const patientInvitationTemplate = `
       font-size: 12px;
       color: #888;
     }
-    .button {
-      display: inline-block;
-      background-color: #2C8E99;
-      color: white;
-      text-decoration: none;
-      padding: 12px 24px;
-      border-radius: 4px;
-      margin: 20px 0;
-      font-weight: bold;
-    }
     .token {
-      font-size: 28px;
+      font-size: 24px;
       font-weight: bold;
-      color: #2C8E99;
-      padding: 15px 25px;
-      background-color: #e0f4f6;
-      border-radius: 8px;
+      color: #4A90E2;
+      padding: 10px;
+      background-color: #e9f0f9;
+      border-radius: 4px;
       display: inline-block;
-      letter-spacing: 4px;
-      margin: 15px 0;
-      font-family: monospace;
+      letter-spacing: 2px;
+      margin: 10px 0;
     }
     .info-box {
       background-color: #fff;
-      border-left: 4px solid #2C8E99;
+      border-left: 4px solid #4A90E2;
       padding: 15px;
       margin: 20px 0;
     }
@@ -70,7 +59,7 @@ export const patientInvitationTemplate = `
 <body>
   <div class="container">
     <div class="header">
-      <h1>Welcome to MetaEstetics</h1>
+      <h1>Welcome to MetaEsthetics</h1>
     </div>
     <div class="content">
       <p>Hello {{patientName}},</p>
@@ -97,21 +86,17 @@ export const patientInvitationTemplate = `
       
       <p>To create your account:</p>
       <ol>
-        <li>Download the MetaEstetics Patient app or visit {{registrationUrl}}</li>
-        <li>Create an account using your email address</li>
+        <li>Download the <strong>MetaEsthetics</strong> app from the App Store (iOS) or Google Play Store (Android)</li>
+        <li>Open the app and create an account using your email address</li>
         <li>When prompted, enter the token shown above</li>
         <li>Your profile will be automatically linked to your new account</li>
       </ol>
       
-      <div style="text-align: center;">
-        <a href="{{registrationUrl}}" class="button">Create Your Account</a>
-      </div>
-      
       <p>If you have any questions or didn't expect this email, please contact {{contactName}} at {{contactEmail}}.</p>
     </div>
     <div class="footer">
       <p>This is an automated message from {{clinicName}}. Please do not reply to this email.</p>
-      <p>&copy; {{currentYear}} MetaEstetics. All rights reserved.</p>
+      <p>&copy; {{currentYear}} MetaEsthetics. All rights reserved.</p>
     </div>
   </div>
 </body>

package/src/backoffice/services/brand.service.ts

@@ -46,17 +46,15 @@ export class BrandService extends BaseService {
   }
 
   /**
-   * Gets a paginated list of active brands, optionally filtered by name and category.
+   * Gets a paginated list of active brands, optionally filtered by name.
    * @param rowsPerPage - The number of brands to fetch.
    * @param searchTerm - An optional string to filter brand names by (starts-with search).
    * @param lastVisible - An optional document snapshot to use as a cursor for pagination.
-   * @param category - An optional category to filter brands by.
    */
   async getAll(
     rowsPerPage: number,
     searchTerm?: string,
-    lastVisible?: any,
-    category?: string
+    lastVisible?: any
   ) {
     const constraints: QueryConstraint[] = [
       where("isActive", "==", true),
@@ -71,10 +69,6 @@ export class BrandService extends BaseService {
       );
     }
 
-    if (category) {
-      constraints.push(where("category", "==", category));
-    }
-
     if (lastVisible) {
       constraints.push(startAfter(lastVisible));
     }
@@ -97,11 +91,10 @@ export class BrandService extends BaseService {
   }
 
   /**
-   * Gets the total count of active brands, optionally filtered by name and category.
+   * Gets the total count of active brands, optionally filtered by name.
    * @param searchTerm - An optional string to filter brand names by (starts-with search).
-   * @param category - An optional category to filter brands by.
    */
-  async getBrandsCount(searchTerm?: string, category?: string) {
+  async getBrandsCount(searchTerm?: string) {
     const constraints: QueryConstraint[] = [where("isActive", "==", true)];
 
     if (searchTerm) {
@@ -112,10 +105,6 @@ export class BrandService extends BaseService {
       );
     }
 
-    if (category) {
-      constraints.push(where("category", "==", category));
-    }
-
     const q = query(this.getBrandsRef(), ...constraints);
     const snapshot = await getCountFromServer(q);
     return snapshot.data().count;
@@ -199,7 +188,6 @@ export class BrandService extends BaseService {
       "id",
       "name",
       "manufacturer",
-      "category",
       "website",
       "description",
       "isActive",
@@ -246,7 +234,6 @@ export class BrandService extends BaseService {
       brand.id ?? "",
       brand.name ?? "",
       brand.manufacturer ?? "",
-      brand.category ?? "",
       brand.website ?? "",
       brand.description ?? "",
       String(brand.isActive ?? ""),

package/src/backoffice/services/product.service.ts

@@ -268,14 +268,12 @@ export class ProductService extends BaseService implements IProductService {
    * Creates a new product in the top-level collection
    */
   async createTopLevel(
-    brandId: string,
-    product: Omit<Product, 'id' | 'createdAt' | 'updatedAt' | 'brandId' | 'assignedTechnologyIds'>,
+    product: Omit<Product, 'id' | 'createdAt' | 'updatedAt' | 'assignedTechnologyIds'>,
     technologyIds: string[] = [],
   ): Promise<Product> {
     const now = new Date();
     const newProduct: Omit<Product, 'id'> = {
       ...product,
-      brandId,
       assignedTechnologyIds: technologyIds,
       createdAt: now,
       updatedAt: now,
@@ -293,8 +291,9 @@ export class ProductService extends BaseService implements IProductService {
     rowsPerPage: number;
     lastVisible?: any;
     brandId?: string;
+    category?: string;
   }): Promise<{ products: Product[]; lastVisible: any }> {
-    const { rowsPerPage, lastVisible, brandId } = options;
+    const { rowsPerPage, lastVisible, brandId, category } = options;
 
     const constraints: QueryConstraint[] = [where('isActive', '==', true), orderBy('name')];
 
@@ -302,6 +301,10 @@ export class ProductService extends BaseService implements IProductService {
       constraints.push(where('brandId', '==', brandId));
     }
 
+    if (category) {
+      constraints.push(where('category', '==', category));
+    }
+
     if (lastVisible) {
       constraints.push(startAfter(lastVisible));
     }
@@ -340,7 +343,7 @@ export class ProductService extends BaseService implements IProductService {
    */
   async updateTopLevel(
     productId: string,
-    product: Partial<Omit<Product, 'id' | 'createdAt' | 'brandId'>>,
+    product: Partial<Omit<Product, 'id' | 'createdAt'>>,
   ): Promise<Product | null> {
     const updateData = {
       ...product,
@@ -468,14 +471,10 @@ export class ProductService extends BaseService implements IProductService {
       "name",
       "brandId",
       "brandName",
+      "category",
       "assignedTechnologyIds",
       "description",
-      "technicalDetails",
-      "dosage",
-      "composition",
-      "indications",
-      "contraindications",
-      "warnings",
+      "metadata",
       "isActive",
     ];
 
@@ -521,14 +520,10 @@ export class ProductService extends BaseService implements IProductService {
       product.name ?? "",
       product.brandId ?? "",
       product.brandName ?? "",
+      product.category ?? "",
       product.assignedTechnologyIds?.join(";") ?? "",
       product.description ?? "",
-      product.technicalDetails ?? "",
-      product.dosage ?? "",
-      product.composition ?? "",
-      product.indications?.join(";") ?? "",
-      product.contraindications?.map(c => c.name).join(";") ?? "",
-      product.warnings?.join(";") ?? "",
+      product.metadata ? JSON.stringify(product.metadata) : "",
       String(product.isActive ?? ""),
     ];
     return values.map((v) => this.formatCsvValue(v)).join(",");

package/src/backoffice/services/technology.service.ts

@@ -979,7 +979,9 @@ export class TechnologyService extends BaseService implements ITechnologyService
     
     const byBrand: Record<string, number> = {};
     products.forEach(product => {
-      byBrand[product.brandName] = (byBrand[product.brandName] || 0) + 1;
+      // Use brandName for grouping stats
+      const brandName = product.brandName || 'Unknown';
+      byBrand[brandName] = (byBrand[brandName] || 0) + 1;
     });
     
     return {

package/src/backoffice/types/brand.types.ts

@@ -7,7 +7,6 @@
  * @property manufacturer - Naziv proizvođača
  * @property description - Detaljan opis brenda i njegovih proizvoda
  * @property website - Web stranica brenda
- * @property category - Kategorija brenda (npr. "laser", "peeling", "injectables") - za filtriranje
  * @property isActive - Da li je brend aktivan u sistemu
  * @property createdAt - Datum kreiranja
  * @property updatedAt - Datum poslednjeg ažuriranja
@@ -22,7 +21,6 @@ export interface Brand {
   isActive: boolean;
   website?: string;
   description?: string;
-  category?: string;
 }
 
 /**

package/src/backoffice/types/product.types.ts

@@ -1,21 +1,14 @@
-import type { ContraindicationDynamic } from './admin-constants.types';
-
 /**
  * Product used in procedures
- * Can be consumables, equipment, or any other product needed for performing procedures
+ * Simplified structure with only essential fields and flexible metadata
  *
  * @property id - Unique identifier of the product
  * @property name - Name of the product
- * @property brandId - ID of the brand that manufactures this product
- * @property brandName - Name of the brand (denormalized for display)
+ * @property brandId - Reference to the Brand document ID
+ * @property brandName - Display name of the brand (denormalized for performance)
+ * @property description - Detailed description of the product
  * @property assignedTechnologyIds - Array of technology IDs this product is assigned to
- * @property description - Detailed description of the product and its purpose
- * @property technicalDetails - Technical details and specifications
- * @property warnings - List of warnings related to product use
- * @property dosage - Dosage information (if applicable)
- * @property composition - Product composition
- * @property indications - List of indications for use
- * @property contraindications - List of contraindications
+ * @property metadata - Flexible key-value pairs for additional product information
  * @property isActive - Whether the product is active in the system
  * @property createdAt - Creation date
  * @property updatedAt - Last update date
@@ -23,23 +16,21 @@ import type { ContraindicationDynamic } from './admin-constants.types';
 export interface Product {
   id?: string;
   name: string;
-  brandId: string;
-  brandName: string;
+  brandId: string;                  // Reference to Brand document
+  brandName: string;                // Denormalized brand name for display
+  description: string;
+  category?: string;                // "Injectables", "Laser Devices", "Skincare", etc.
   
-  // NEW: Technology assignment tracking
+  // Technology assignment tracking
   assignedTechnologyIds?: string[];
   
-  // Product details
+  // Flexible metadata for any additional information
+  metadata?: Record<string, string | number | boolean>;
+  
+  // System fields
+  isActive: boolean;
   createdAt: Date;
   updatedAt: Date;
-  isActive: boolean;
-  description?: string;
-  technicalDetails?: string;
-  warnings?: string[];
-  dosage?: string;
-  composition?: string;
-  indications?: string[];
-  contraindications?: ContraindicationDynamic[];
   
   // LEGACY FIELDS: Only present in technology subcollections (/technologies/{id}/products/)
   // These fields are synced by Cloud Functions for backward compatibility
@@ -72,13 +63,11 @@ export interface IProductService {
   
   /**
    * Creates a new product in the top-level collection
-   * @param brandId - ID of the brand that manufactures this product
    * @param product - Product data
    * @param technologyIds - Optional array of technology IDs to assign this product to
    */
   createTopLevel(
-    brandId: string,
-    product: Omit<Product, 'id' | 'createdAt' | 'updatedAt' | 'brandId' | 'assignedTechnologyIds'>,
+    product: Omit<Product, 'id' | 'createdAt' | 'updatedAt' | 'assignedTechnologyIds'>,
     technologyIds?: string[],
   ): Promise<Product>;
 
@@ -90,6 +79,7 @@ export interface IProductService {
     rowsPerPage: number;
     lastVisible?: any;
     brandId?: string;
+    category?: string;
   }): Promise<{ products: Product[]; lastVisible: any }>;
 
   /**
@@ -105,7 +95,7 @@ export interface IProductService {
    */
   updateTopLevel(
     productId: string,
-    product: Partial<Omit<Product, 'id' | 'createdAt' | 'brandId'>>,
+    product: Partial<Omit<Product, 'id' | 'createdAt'>>,
   ): Promise<Product | null>;
 
   /**

package/src/services/analytics/analytics.service.ts

@@ -644,8 +644,11 @@ export class AnalyticsService extends BaseService {
       }
     }
 
-    // Fall back to calculation
-    const appointments = await this.fetchAppointments(undefined, dateRange);
+    // Fall back to calculation - filter by clinic if specified
+    const filters: AnalyticsFilters | undefined = options?.clinicBranchId
+      ? { clinicBranchId: options.clinicBranchId }
+      : undefined;
+    const appointments = await this.fetchAppointments(filters, dateRange);
     const canceled = getCanceledAppointments(appointments);
 
     if (groupBy === 'clinic') {
@@ -941,8 +944,11 @@ export class AnalyticsService extends BaseService {
       }
     }
 
-    // Fall back to calculation
-    const appointments = await this.fetchAppointments(undefined, dateRange);
+    // Fall back to calculation - filter by clinic if specified
+    const filters: AnalyticsFilters | undefined = options?.clinicBranchId
+      ? { clinicBranchId: options.clinicBranchId }
+      : undefined;
+    const appointments = await this.fetchAppointments(filters, dateRange);
     const noShow = getNoShowAppointments(appointments);
 
     if (groupBy === 'clinic') {