@blackcode_sa/metaestetics-api 1.12.1 → 1.12.3

package/package.json

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

package/src/backoffice/services/FIXES_README.md

@@ -0,0 +1,102 @@
+# Service Method Fixes for Procedure Creation
+
+## Problem
+The procedure creation components (`CreateProcedureBulk.tsx`, `CreateProcedure.tsx`, `UpdateProcedure.tsx`) were not loading categories and subcategories because the service methods were returning paginated objects instead of arrays.
+
+## Root Cause
+The procedure service was calling paginated methods that return objects like `{ categories, lastVisible }` instead of filter methods that return arrays like `Category[]`.
+
+## Changes Made
+
+### 1. Added Missing Methods
+
+#### CategoryService
+- **Added**: `getAllForFilterByFamily(family: ProcedureFamily): Promise<Category[]>`
+- **Added**: Interface `ICategoryService` in `category.types.ts`
+- **Modified**: `CategoryService` now implements `ICategoryService`
+
+#### TechnologyService  
+- **Added**: `getAllForFilterBySubcategory(subcategoryId: string): Promise<Technology[]>`
+- **Modified**: Added method to `ITechnologyService` interface
+- **Modified**: `TechnologyService` implements `ITechnologyService`
+
+#### ProductService
+- **Added**: `getAllByTechnology(technologyId: string): Promise<Product[]>`
+- **Modified**: Added method to `IProductService` interface
+
+### 2. Updated Procedure Service Calls
+
+Changed from paginated methods to filter methods:
+
+```typescript
+// Before (returned { categories, lastVisible })
+await getCategoryService().getAllByFamily(family)
+
+// After (returns Category[])
+await getCategoryService().getAllForFilterByFamily(family)
+```
+
+```typescript
+// Before (returned { subcategories, lastVisible })
+await getSubcategoryService().getAllByCategoryId(id)
+
+// After (returns Subcategory[])
+await getSubcategoryService().getAllForFilterByCategoryId(id)
+```
+
+```typescript
+// Before (returned { technologies, lastVisible })
+await getTechnologyService().getAllBySubcategoryId(id)
+
+// After (returns Technology[])
+await getTechnologyService().getAllForFilterBySubcategory(id)
+```
+
+```typescript
+// Before (method didn't exist)
+await getProductService().getAllByTechnology(technologyId)
+
+// After (returns Product[])
+await getProductService().getAllByTechnology(technologyId)
+```
+
+### 3. Service Method Patterns
+
+#### Paginated Methods (for admin UI with pagination)
+- Return: `{ items: T[], lastVisible: DocumentData }`
+- Example: `getAllByFamily()`, `getAllByCategoryId()`, `getAllBySubcategoryId()`
+
+#### Filter Methods (for dropdowns/filters)  
+- Return: `T[]`
+- Example: `getAllForFilter()`, `getAllForFilterByFamily()`, `getAllForFilterByCategoryId()`
+
+## Files Modified
+
+### API (Backend)
+- `Api/src/backoffice/services/category.service.ts`
+- `Api/src/backoffice/services/technology.service.ts`
+- `Api/src/backoffice/services/product.service.ts`
+- `Api/src/backoffice/types/category.types.ts`
+- `Api/src/backoffice/types/technology.types.ts`
+- `Api/src/backoffice/types/product.types.ts`
+
+### Client App
+- `ClinicApp/src/store/procedure/procedure.service.ts`
+
+## Expected Result
+Categories, subcategories, technologies, and products should now load correctly in:
+- Create Procedure Bulk form
+- Create Procedure form  
+- Update Procedure form
+
+The dropdowns should populate with the correct options when selecting families, categories, subcategories, and technologies.
+
+## Testing
+1. Navigate to Create Procedure Bulk
+2. Select a family (Aesthetics/Surgery) - categories should load
+3. Select a category - subcategories should load
+4. Select a subcategory - technologies should load
+5. Select a technology - products should load and qualified practitioners should appear
+
+## Note
+If TypeScript errors persist about missing methods, the API package may need to be rebuilt (`npm run build` in the Api directory) for the type definitions to be updated in the consuming client application.

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

@@ -12,10 +12,10 @@ import {
   startAfter,
   updateDoc,
   where,
-} from "firebase/firestore";
-import { Category, CATEGORIES_COLLECTION } from "../types/category.types";
-import { BaseService } from "../../services/base.service";
-import { ProcedureFamily } from "../types/static/procedure-family.types";
+} from 'firebase/firestore';
+import { Category, CATEGORIES_COLLECTION, ICategoryService } from '../types/category.types';
+import { BaseService } from '../../services/base.service';
+import { ProcedureFamily } from '../types/static/procedure-family.types';
 
 /**
  * Servis za upravljanje kategorijama procedura.
@@ -30,7 +30,7 @@ import { ProcedureFamily } from "../types/static/procedure-family.types";
  *   family: ProcedureFamily.AESTHETICS
  * });
  */
-export class CategoryService extends BaseService {
+export class CategoryService extends BaseService implements ICategoryService {
   /**
    * Referenca na Firestore kolekciju kategorija
    */
@@ -43,9 +43,9 @@ export class CategoryService extends BaseService {
    * @param category - Podaci za novu kategoriju
    * @returns Kreirana kategorija sa generisanim ID-em
    */
-  async create(category: Omit<Category, "id" | "createdAt" | "updatedAt">) {
+  async create(category: Omit<Category, 'id' | 'createdAt' | 'updatedAt'>) {
     const now = new Date();
-    const newCategory: Omit<Category, "id"> = {
+    const newCategory: Omit<Category, 'id'> = {
       ...category,
       createdAt: now,
       updatedAt: now,
@@ -68,8 +68,8 @@ export class CategoryService extends BaseService {
     for (const family of families) {
       const q = query(
         this.categoriesRef,
-        where("family", "==", family),
-        where("isActive", "==", active)
+        where('family', '==', family),
+        where('isActive', '==', active),
       );
       const snapshot = await getCountFromServer(q);
       counts[family] = snapshot.data().count;
@@ -82,14 +82,36 @@ export class CategoryService extends BaseService {
    * @returns Lista svih aktivnih kategorija
    */
   async getAllForFilter() {
-    const q = query(this.categoriesRef, where("isActive", "==", true));
+    const q = query(this.categoriesRef, where('isActive', '==', true));
     const snapshot = await getDocs(q);
     return snapshot.docs.map(
-      (doc) =>
+      doc =>
         ({
           id: doc.id,
           ...doc.data(),
-        } as Category)
+        } as Category),
+    );
+  }
+
+  /**
+   * Vraća sve kategorije za određenu familiju za potrebe filtera (bez paginacije)
+   * @param family - Familija procedura (aesthetics/surgery)
+   * @returns Lista aktivnih kategorija koje pripadaju traženoj familiji
+   */
+  async getAllForFilterByFamily(family: ProcedureFamily) {
+    const q = query(
+      this.categoriesRef,
+      where('family', '==', family),
+      where('isActive', '==', true),
+      orderBy('name'),
+    );
+    const snapshot = await getDocs(q);
+    return snapshot.docs.map(
+      doc =>
+        ({
+          id: doc.id,
+          ...doc.data(),
+        } as Category),
     );
   }
 
@@ -103,12 +125,12 @@ export class CategoryService extends BaseService {
       active?: boolean;
       limit?: number;
       lastVisible?: DocumentData;
-    } = {}
+    } = {},
   ) {
     const { active = true, limit: queryLimit = 10, lastVisible } = options;
     const constraints = [
-      where("isActive", "==", active),
-      orderBy("name"),
+      where('isActive', '==', active),
+      orderBy('name'),
       queryLimit ? limit(queryLimit) : undefined,
       lastVisible ? startAfter(lastVisible) : undefined,
     ].filter((c): c is NonNullable<typeof c> => !!c);
@@ -116,11 +138,11 @@ export class CategoryService extends BaseService {
     const q = query(this.categoriesRef, ...constraints);
     const snapshot = await getDocs(q);
     const categories = snapshot.docs.map(
-      (doc) =>
+      doc =>
         ({
           id: doc.id,
           ...doc.data(),
-        } as Category)
+        } as Category),
     );
     const newLastVisible = snapshot.docs[snapshot.docs.length - 1];
     return { categories, lastVisible: newLastVisible };
@@ -138,13 +160,13 @@ export class CategoryService extends BaseService {
       active?: boolean;
       limit?: number;
       lastVisible?: DocumentData;
-    } = {}
+    } = {},
   ) {
     const { active = true, limit: queryLimit = 10, lastVisible } = options;
     const constraints = [
-      where("family", "==", family),
-      where("isActive", "==", active),
-      orderBy("name"),
+      where('family', '==', family),
+      where('isActive', '==', active),
+      orderBy('name'),
       queryLimit ? limit(queryLimit) : undefined,
       lastVisible ? startAfter(lastVisible) : undefined,
     ].filter((c): c is NonNullable<typeof c> => !!c);
@@ -152,11 +174,11 @@ export class CategoryService extends BaseService {
     const q = query(this.categoriesRef, ...constraints);
     const snapshot = await getDocs(q);
     const categories = snapshot.docs.map(
-      (doc) =>
+      doc =>
         ({
           id: doc.id,
           ...doc.data(),
-        } as Category)
+        } as Category),
     );
     const newLastVisible = snapshot.docs[snapshot.docs.length - 1];
     return { categories, lastVisible: newLastVisible };
@@ -168,10 +190,7 @@ export class CategoryService extends BaseService {
    * @param category - Novi podaci za kategoriju
    * @returns Ažurirana kategorija
    */
-  async update(
-    id: string,
-    category: Partial<Omit<Category, "id" | "createdAt">>
-  ) {
+  async update(id: string, category: Partial<Omit<Category, 'id' | 'createdAt'>>) {
     const updateData = {
       ...category,
       updatedAt: new Date(),

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

@@ -13,14 +13,10 @@ import {
   startAfter,
   getCountFromServer,
   QueryConstraint,
-} from "firebase/firestore";
-import {
-  Product,
-  PRODUCTS_COLLECTION,
-  IProductService,
-} from "../types/product.types";
-import { BaseService } from "../../services/base.service";
-import { TECHNOLOGIES_COLLECTION } from "../types/technology.types";
+} from 'firebase/firestore';
+import { Product, PRODUCTS_COLLECTION, IProductService } from '../types/product.types';
+import { BaseService } from '../../services/base.service';
+import { TECHNOLOGIES_COLLECTION } from '../types/technology.types';
 
 export class ProductService extends BaseService implements IProductService {
   /**
@@ -29,12 +25,7 @@ export class ProductService extends BaseService implements IProductService {
    * @returns Firestore collection reference
    */
   private getProductsRef(technologyId: string) {
-    return collection(
-      this.db,
-      TECHNOLOGIES_COLLECTION,
-      technologyId,
-      PRODUCTS_COLLECTION
-    );
+    return collection(this.db, TECHNOLOGIES_COLLECTION, technologyId, PRODUCTS_COLLECTION);
   }
 
   /**
@@ -43,14 +34,11 @@ export class ProductService extends BaseService implements IProductService {
   async create(
     technologyId: string,
     brandId: string,
-    product: Omit<
-      Product,
-      "id" | "createdAt" | "updatedAt" | "brandId" | "technologyId"
-    >
+    product: Omit<Product, 'id' | 'createdAt' | 'updatedAt' | 'brandId' | 'technologyId'>,
   ): Promise<Product> {
     const now = new Date();
     // categoryId and subcategoryId are now expected to be part of the product object
-    const newProduct: Omit<Product, "id"> = {
+    const newProduct: Omit<Product, 'id'> = {
       ...product,
       brandId,
       technologyId,
@@ -59,10 +47,7 @@ export class ProductService extends BaseService implements IProductService {
       isActive: true,
     };
 
-    const productRef = await addDoc(
-      this.getProductsRef(technologyId),
-      newProduct
-    );
+    const productRef = await addDoc(this.getProductsRef(technologyId), newProduct);
 
     return { id: productRef.id, ...newProduct };
   }
@@ -78,27 +63,18 @@ export class ProductService extends BaseService implements IProductService {
     subcategoryId?: string;
     technologyId?: string;
   }): Promise<{ products: Product[]; lastVisible: any }> {
-    const {
-      rowsPerPage,
-      lastVisible,
-      categoryId,
-      subcategoryId,
-      technologyId,
-    } = options;
+    const { rowsPerPage, lastVisible, categoryId, subcategoryId, technologyId } = options;
 
-    const constraints: QueryConstraint[] = [
-      where("isActive", "==", true),
-      orderBy("name"),
-    ];
+    const constraints: QueryConstraint[] = [where('isActive', '==', true), orderBy('name')];
 
     if (categoryId) {
-      constraints.push(where("categoryId", "==", categoryId));
+      constraints.push(where('categoryId', '==', categoryId));
     }
     if (subcategoryId) {
-      constraints.push(where("subcategoryId", "==", subcategoryId));
+      constraints.push(where('subcategoryId', '==', subcategoryId));
     }
     if (technologyId) {
-      constraints.push(where("technologyId", "==", technologyId));
+      constraints.push(where('technologyId', '==', technologyId));
     }
 
     if (lastVisible) {
@@ -106,18 +82,15 @@ export class ProductService extends BaseService implements IProductService {
     }
     constraints.push(limit(rowsPerPage));
 
-    const q = query(
-      collectionGroup(this.db, PRODUCTS_COLLECTION),
-      ...constraints
-    );
+    const q = query(collectionGroup(this.db, PRODUCTS_COLLECTION), ...constraints);
     const snapshot = await getDocs(q);
 
     const products = snapshot.docs.map(
-      (doc) =>
+      doc =>
         ({
           id: doc.id,
           ...doc.data(),
-        } as Product)
+        } as Product),
     );
     const newLastVisible = snapshot.docs[snapshot.docs.length - 1];
 
@@ -133,22 +106,19 @@ export class ProductService extends BaseService implements IProductService {
     technologyId?: string;
   }): Promise<number> {
     const { categoryId, subcategoryId, technologyId } = options;
-    const constraints: QueryConstraint[] = [where("isActive", "==", true)];
+    const constraints: QueryConstraint[] = [where('isActive', '==', true)];
 
     if (categoryId) {
-      constraints.push(where("categoryId", "==", categoryId));
+      constraints.push(where('categoryId', '==', categoryId));
     }
     if (subcategoryId) {
-      constraints.push(where("subcategoryId", "==", subcategoryId));
+      constraints.push(where('subcategoryId', '==', subcategoryId));
     }
     if (technologyId) {
-      constraints.push(where("technologyId", "==", technologyId));
+      constraints.push(where('technologyId', '==', technologyId));
     }
 
-    const q = query(
-      collectionGroup(this.db, PRODUCTS_COLLECTION),
-      ...constraints
-    );
+    const q = query(collectionGroup(this.db, PRODUCTS_COLLECTION), ...constraints);
     const snapshot = await getCountFromServer(q);
     return snapshot.data().count;
   }
@@ -162,10 +132,7 @@ export class ProductService extends BaseService implements IProductService {
     bySubcategory: Record<string, number>;
     byTechnology: Record<string, number>;
   }> {
-    const q = query(
-      collectionGroup(this.db, PRODUCTS_COLLECTION),
-      where("isActive", "==", true)
-    );
+    const q = query(collectionGroup(this.db, PRODUCTS_COLLECTION), where('isActive', '==', true));
     const snapshot = await getDocs(q);
 
     const counts = {
@@ -178,27 +145,43 @@ export class ProductService extends BaseService implements IProductService {
       return counts;
     }
 
-    snapshot.docs.forEach((doc) => {
+    snapshot.docs.forEach(doc => {
       const product = doc.data() as Product;
       const { categoryId, subcategoryId, technologyId } = product;
 
       if (categoryId) {
-        counts.byCategory[categoryId] =
-          (counts.byCategory[categoryId] || 0) + 1;
+        counts.byCategory[categoryId] = (counts.byCategory[categoryId] || 0) + 1;
       }
       if (subcategoryId) {
-        counts.bySubcategory[subcategoryId] =
-          (counts.bySubcategory[subcategoryId] || 0) + 1;
+        counts.bySubcategory[subcategoryId] = (counts.bySubcategory[subcategoryId] || 0) + 1;
       }
       if (technologyId) {
-        counts.byTechnology[technologyId] =
-          (counts.byTechnology[technologyId] || 0) + 1;
+        counts.byTechnology[technologyId] = (counts.byTechnology[technologyId] || 0) + 1;
       }
     });
 
     return counts;
   }
 
+  /**
+   * Gets all products for a specific technology (non-paginated, for filters/dropdowns)
+   */
+  async getAllByTechnology(technologyId: string): Promise<Product[]> {
+    const q = query(
+      this.getProductsRef(technologyId),
+      where('isActive', '==', true),
+      orderBy('name'),
+    );
+    const snapshot = await getDocs(q);
+    return snapshot.docs.map(
+      doc =>
+        ({
+          id: doc.id,
+          ...doc.data(),
+        } as Product),
+    );
+  }
+
   /**
    * Gets all products for a brand by filtering through all technologies
    */
@@ -211,18 +194,18 @@ export class ProductService extends BaseService implements IProductService {
     for (const techDoc of technologiesSnapshot.docs) {
       const q = query(
         this.getProductsRef(techDoc.id),
-        where("brandId", "==", brandId),
-        where("isActive", "==", true)
+        where('brandId', '==', brandId),
+        where('isActive', '==', true),
       );
       const snapshot = await getDocs(q);
       products.push(
         ...snapshot.docs.map(
-          (doc) =>
+          doc =>
             ({
               id: doc.id,
               ...doc.data(),
-            } as Product)
-        )
+            } as Product),
+        ),
       );
     }
 
@@ -235,9 +218,7 @@ export class ProductService extends BaseService implements IProductService {
   async update(
     technologyId: string,
     productId: string,
-    product: Partial<
-      Omit<Product, "id" | "createdAt" | "brandId" | "technologyId">
-    >
+    product: Partial<Omit<Product, 'id' | 'createdAt' | 'brandId' | 'technologyId'>>,
   ): Promise<Product | null> {
     const updateData = {
       ...product,
@@ -262,10 +243,7 @@ export class ProductService extends BaseService implements IProductService {
   /**
    * Gets a product by ID
    */
-  async getById(
-    technologyId: string,
-    productId: string
-  ): Promise<Product | null> {
+  async getById(technologyId: string, productId: string): Promise<Product | null> {
     const docRef = doc(this.getProductsRef(technologyId), productId);
     const docSnap = await getDoc(docRef);
     if (!docSnap.exists()) return null;