@blackcode_sa/metaestetics-api 1.12.42 → 1.12.45

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

@@ -13,8 +13,6 @@ import {
   startAfter,
   getCountFromServer,
   QueryConstraint,
-  arrayUnion,
-  arrayRemove,
 } from 'firebase/firestore';
 import { Product, PRODUCTS_COLLECTION, IProductService } from '../types/product.types';
 import { BaseService } from '../../services/base.service';
@@ -22,15 +20,7 @@ import { TECHNOLOGIES_COLLECTION } from '../types/technology.types';
 
 export class ProductService extends BaseService implements IProductService {
   /**
-   * Gets reference to top-level products collection (source of truth)
-   * @returns Firestore collection reference
-   */
-  private getTopLevelProductsRef() {
-    return collection(this.db, PRODUCTS_COLLECTION);
-  }
-
-  /**
-   * Gets reference to products collection under a technology (backward compatibility)
+   * Gets reference to products collection under a technology
    * @param technologyId - ID of the technology
    * @returns Firestore collection reference
    */
@@ -47,11 +37,11 @@ export class ProductService extends BaseService implements IProductService {
     product: Omit<Product, 'id' | 'createdAt' | 'updatedAt' | 'brandId' | 'technologyId'>,
   ): Promise<Product> {
     const now = new Date();
-    // Create product with legacy structure for subcollection compatibility
+    // categoryId and subcategoryId are now expected to be part of the product object
     const newProduct: Omit<Product, 'id'> = {
       ...product,
       brandId,
-      technologyId, // Required for old subcollection structure
+      technologyId,
       createdAt: now,
       updatedAt: now,
       isActive: true,
@@ -135,35 +125,38 @@ export class ProductService extends BaseService implements IProductService {
 
   /**
    * Gets counts of active products grouped by category, subcategory, and technology.
-   * Queries technology subcollections which have the legacy fields synced by Cloud Functions.
+   * This uses a single collectionGroup query for efficiency.
    */
   async getProductCounts(): Promise<{
     byCategory: Record<string, number>;
     bySubcategory: Record<string, number>;
     byTechnology: Record<string, number>;
   }> {
+    const q = query(collectionGroup(this.db, PRODUCTS_COLLECTION), where('isActive', '==', true));
+    const snapshot = await getDocs(q);
+
     const counts = {
       byCategory: {} as Record<string, number>,
       bySubcategory: {} as Record<string, number>,
       byTechnology: {} as Record<string, number>,
     };
 
-    // Query technology subcollections (which have synced legacy fields)
-    const q = query(collectionGroup(this.db, PRODUCTS_COLLECTION), where('isActive', '==', true));
-    const snapshot = await getDocs(q);
+    if (snapshot.empty) {
+      return counts;
+    }
 
     snapshot.docs.forEach(doc => {
       const product = doc.data() as Product;
-      
-      // Use legacy fields from subcollections
-      if (product.categoryId) {
-        counts.byCategory[product.categoryId] = (counts.byCategory[product.categoryId] || 0) + 1;
+      const { categoryId, subcategoryId, technologyId } = product;
+
+      if (categoryId) {
+        counts.byCategory[categoryId] = (counts.byCategory[categoryId] || 0) + 1;
       }
-      if (product.subcategoryId) {
-        counts.bySubcategory[product.subcategoryId] = (counts.bySubcategory[product.subcategoryId] || 0) + 1;
+      if (subcategoryId) {
+        counts.bySubcategory[subcategoryId] = (counts.bySubcategory[subcategoryId] || 0) + 1;
       }
-      if (product.technologyId) {
-        counts.byTechnology[product.technologyId] = (counts.byTechnology[product.technologyId] || 0) + 1;
+      if (technologyId) {
+        counts.byTechnology[technologyId] = (counts.byTechnology[technologyId] || 0) + 1;
       }
     });
 
@@ -259,195 +252,4 @@ export class ProductService extends BaseService implements IProductService {
       ...docSnap.data(),
     } as Product;
   }
-
-  // ==========================================
-  // NEW METHODS: Top-level collection (preferred)
-  // ==========================================
-
-  /**
-   * Creates a new product in the top-level collection
-   */
-  async createTopLevel(
-    brandId: string,
-    product: Omit<Product, 'id' | 'createdAt' | 'updatedAt' | 'brandId' | 'assignedTechnologyIds'>,
-    technologyIds: string[] = [],
-  ): Promise<Product> {
-    const now = new Date();
-    const newProduct: Omit<Product, 'id'> = {
-      ...product,
-      brandId,
-      assignedTechnologyIds: technologyIds,
-      createdAt: now,
-      updatedAt: now,
-      isActive: true,
-    };
-
-    const productRef = await addDoc(this.getTopLevelProductsRef(), newProduct);
-    return { id: productRef.id, ...newProduct };
-  }
-
-  /**
-   * Gets all products from the top-level collection
-   */
-  async getAllTopLevel(options: {
-    rowsPerPage: number;
-    lastVisible?: any;
-    brandId?: string;
-  }): Promise<{ products: Product[]; lastVisible: any }> {
-    const { rowsPerPage, lastVisible, brandId } = options;
-
-    const constraints: QueryConstraint[] = [where('isActive', '==', true), orderBy('name')];
-
-    if (brandId) {
-      constraints.push(where('brandId', '==', brandId));
-    }
-
-    if (lastVisible) {
-      constraints.push(startAfter(lastVisible));
-    }
-    constraints.push(limit(rowsPerPage));
-
-    const q = query(this.getTopLevelProductsRef(), ...constraints);
-    const snapshot = await getDocs(q);
-
-    const products = snapshot.docs.map(
-      doc =>
-        ({
-          id: doc.id,
-          ...doc.data(),
-        } as Product),
-    );
-    const newLastVisible = snapshot.docs[snapshot.docs.length - 1];
-
-    return { products, lastVisible: newLastVisible };
-  }
-
-  /**
-   * Gets a product by ID from the top-level collection
-   */
-  async getByIdTopLevel(productId: string): Promise<Product | null> {
-    const docRef = doc(this.getTopLevelProductsRef(), productId);
-    const docSnap = await getDoc(docRef);
-    if (!docSnap.exists()) return null;
-    return {
-      id: docSnap.id,
-      ...docSnap.data(),
-    } as Product;
-  }
-
-  /**
-   * Updates a product in the top-level collection
-   */
-  async updateTopLevel(
-    productId: string,
-    product: Partial<Omit<Product, 'id' | 'createdAt' | 'brandId'>>,
-  ): Promise<Product | null> {
-    const updateData = {
-      ...product,
-      updatedAt: new Date(),
-    };
-
-    const docRef = doc(this.getTopLevelProductsRef(), productId);
-    await updateDoc(docRef, updateData);
-
-    return this.getByIdTopLevel(productId);
-  }
-
-  /**
-   * Deletes a product from the top-level collection (soft delete)
-   */
-  async deleteTopLevel(productId: string): Promise<void> {
-    await this.updateTopLevel(productId, {
-      isActive: false,
-    });
-  }
-
-  /**
-   * Assigns a product to a technology
-   */
-  async assignToTechnology(productId: string, technologyId: string): Promise<void> {
-    const docRef = doc(this.getTopLevelProductsRef(), productId);
-    await updateDoc(docRef, {
-      assignedTechnologyIds: arrayUnion(technologyId),
-      updatedAt: new Date(),
-    });
-    // Cloud Function will handle syncing to subcollection
-  }
-
-  /**
-   * Unassigns a product from a technology
-   */
-  async unassignFromTechnology(productId: string, technologyId: string): Promise<void> {
-    const docRef = doc(this.getTopLevelProductsRef(), productId);
-    await updateDoc(docRef, {
-      assignedTechnologyIds: arrayRemove(technologyId),
-      updatedAt: new Date(),
-    });
-    // Cloud Function will handle removing from subcollection
-  }
-
-  /**
-   * Gets products assigned to a specific technology
-   */
-  async getAssignedProducts(technologyId: string): Promise<Product[]> {
-    const q = query(
-      this.getTopLevelProductsRef(),
-      where('assignedTechnologyIds', 'array-contains', technologyId),
-      where('isActive', '==', true),
-      orderBy('name'),
-    );
-    const snapshot = await getDocs(q);
-    return snapshot.docs.map(
-      doc =>
-        ({
-          id: doc.id,
-          ...doc.data(),
-        } as Product),
-    );
-  }
-
-  /**
-   * Gets products NOT assigned to a specific technology
-   */
-  async getUnassignedProducts(technologyId: string): Promise<Product[]> {
-    const q = query(
-      this.getTopLevelProductsRef(),
-      where('isActive', '==', true),
-      orderBy('name'),
-    );
-    const snapshot = await getDocs(q);
-    
-    const allProducts = snapshot.docs.map(
-      doc =>
-        ({
-          id: doc.id,
-          ...doc.data(),
-        } as Product),
-    );
-    
-    // Filter out products already assigned to this technology
-    return allProducts.filter(product => 
-      !product.assignedTechnologyIds?.includes(technologyId)
-    );
-  }
-
-  /**
-   * Gets all products for a brand (from top-level collection)
-   */
-  async getByBrand(brandId: string): Promise<Product[]> {
-    const q = query(
-      this.getTopLevelProductsRef(),
-      where('brandId', '==', brandId),
-      where('isActive', '==', true),
-      orderBy('name'),
-    );
-    const snapshot = await getDocs(q);
-    return snapshot.docs.map(
-      doc =>
-        ({
-          id: doc.id,
-          ...doc.data(),
-        } as Product),
-    );
-  }
 }

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

@@ -15,7 +15,6 @@ import {
   arrayUnion,
   arrayRemove,
   Firestore,
-  writeBatch,
 } from 'firebase/firestore';
 import { Technology, TECHNOLOGIES_COLLECTION, ITechnologyService } from '../types/technology.types';
 import { Requirement, RequirementType } from '../types/requirement.types';
@@ -30,7 +29,6 @@ import {
 import { BaseService } from '../../services/base.service';
 import { ProcedureFamily } from '../types/static/procedure-family.types';
 import { Practitioner, PractitionerCertification } from '../../types/practitioner';
-import { Product, PRODUCTS_COLLECTION } from '../types/product.types';
 
 /**
  * Default vrednosti za sertifikaciju
@@ -242,25 +240,7 @@ export class TechnologyService extends BaseService implements ITechnologyService
     updateData.updatedAt = new Date();
 
     const docRef = doc(this.technologiesRef, id);
-    
-    // Get the technology before update to check what changed
-    const beforeTech = await this.getById(id);
-    
     await updateDoc(docRef, updateData);
-    
-    // If categoryId, subcategoryId, or name changed, update all products in subcollection
-    const categoryChanged = beforeTech && updateData.categoryId && beforeTech.categoryId !== updateData.categoryId;
-    const subcategoryChanged = beforeTech && updateData.subcategoryId && beforeTech.subcategoryId !== updateData.subcategoryId;
-    const nameChanged = beforeTech && updateData.name && beforeTech.name !== updateData.name;
-    
-    if (categoryChanged || subcategoryChanged || nameChanged) {
-      await this.updateProductsInSubcollection(id, {
-        categoryId: updateData.categoryId,
-        subcategoryId: updateData.subcategoryId,
-        technologyName: updateData.name,
-      });
-    }
-    
     return this.getById(id);
   }
 
@@ -798,153 +778,4 @@ export class TechnologyService extends BaseService implements ITechnologyService
         } as Technology),
     );
   }
-
-  // ==========================================
-  // NEW METHODS: Product assignment management
-  // ==========================================
-
-  /**
-   * Assigns multiple products to a technology
-   * Updates each product's assignedTechnologyIds array
-   */
-  async assignProducts(technologyId: string, productIds: string[]): Promise<void> {
-    const batch = writeBatch(this.db);
-    
-    for (const productId of productIds) {
-      const productRef = doc(this.db, PRODUCTS_COLLECTION, productId);
-      batch.update(productRef, {
-        assignedTechnologyIds: arrayUnion(technologyId),
-        updatedAt: new Date(),
-      });
-    }
-    
-    await batch.commit();
-    // Cloud Function will handle syncing to subcollections
-  }
-
-  /**
-   * Unassigns multiple products from a technology
-   * Updates each product's assignedTechnologyIds array
-   */
-  async unassignProducts(technologyId: string, productIds: string[]): Promise<void> {
-    const batch = writeBatch(this.db);
-    
-    for (const productId of productIds) {
-      const productRef = doc(this.db, PRODUCTS_COLLECTION, productId);
-      batch.update(productRef, {
-        assignedTechnologyIds: arrayRemove(technologyId),
-        updatedAt: new Date(),
-      });
-    }
-    
-    await batch.commit();
-    // Cloud Function will handle removing from subcollections
-  }
-
-  /**
-   * Gets products assigned to a specific technology
-   * Reads from top-level collection for immediate consistency (Cloud Functions may lag)
-   */
-  async getAssignedProducts(technologyId: string): Promise<Product[]> {
-    const q = query(
-      collection(this.db, PRODUCTS_COLLECTION),
-      where('assignedTechnologyIds', 'array-contains', technologyId),
-      where('isActive', '==', true),
-      orderBy('name'),
-    );
-    const snapshot = await getDocs(q);
-    
-    return snapshot.docs.map(
-      doc =>
-        ({
-          id: doc.id,
-          ...doc.data(),
-        } as Product),
-    );
-  }
-
-  /**
-   * Gets products NOT assigned to a specific technology
-   */
-  async getUnassignedProducts(technologyId: string): Promise<Product[]> {
-    const q = query(
-      collection(this.db, PRODUCTS_COLLECTION),
-      where('isActive', '==', true),
-      orderBy('name'),
-    );
-    const snapshot = await getDocs(q);
-    
-    const allProducts = snapshot.docs.map(
-      doc =>
-        ({
-          id: doc.id,
-          ...doc.data(),
-        } as Product),
-    );
-    
-    // Filter out products already assigned to this technology
-    return allProducts.filter(product => 
-      !product.assignedTechnologyIds?.includes(technologyId)
-    );
-  }
-
-  /**
-   * Gets product assignment statistics for a technology
-   */
-  async getProductStats(technologyId: string): Promise<{
-    totalAssigned: number;
-    byBrand: Record<string, number>;
-  }> {
-    const products = await this.getAssignedProducts(technologyId);
-    
-    const byBrand: Record<string, number> = {};
-    products.forEach(product => {
-      byBrand[product.brandName] = (byBrand[product.brandName] || 0) + 1;
-    });
-    
-    return {
-      totalAssigned: products.length,
-      byBrand,
-    };
-  }
-
-  /**
-   * Updates products in technology subcollection when technology metadata changes
-   * @param technologyId - ID of the technology
-   * @param updates - Fields to update (categoryId, subcategoryId, technologyName)
-   */
-  private async updateProductsInSubcollection(
-    technologyId: string,
-    updates: { categoryId?: string; subcategoryId?: string; technologyName?: string }
-  ): Promise<void> {
-    const productsRef = collection(this.db, TECHNOLOGIES_COLLECTION, technologyId, PRODUCTS_COLLECTION);
-    const productsSnapshot = await getDocs(productsRef);
-    
-    if (productsSnapshot.empty) {
-      return;
-    }
-    
-    const batch = writeBatch(this.db);
-    
-    for (const productDoc of productsSnapshot.docs) {
-      const productRef = productDoc.ref;
-      const updateFields: any = {};
-      
-      if (updates.categoryId !== undefined) {
-        updateFields.categoryId = updates.categoryId;
-      }
-      if (updates.subcategoryId !== undefined) {
-        updateFields.subcategoryId = updates.subcategoryId;
-      }
-      if (updates.technologyName !== undefined) {
-        updateFields.technologyName = updates.technologyName;
-      }
-      
-      if (Object.keys(updateFields).length > 0) {
-        batch.update(productRef, updateFields);
-      }
-    }
-    
-    await batch.commit();
-  }
 }

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

@@ -6,10 +6,9 @@ import type { ContraindicationDynamic } from './admin-constants.types';
  *
  * @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 assignedTechnologyIds - Array of technology IDs this product is assigned to
  * @property description - Detailed description of the product and its purpose
+ * @property brandId - ID of the brand that manufactures this product
+ * @property technologyId - ID of the technology this product is used with
  * @property technicalDetails - Technical details and specifications
  * @property warnings - List of warnings related to product use
  * @property dosage - Dosage information (if applicable)
@@ -25,11 +24,10 @@ export interface Product {
   name: string;
   brandId: string;
   brandName: string;
-  
-  // NEW: Technology assignment tracking
-  assignedTechnologyIds?: string[];
-  
-  // Product details
+  technologyId: string;
+  technologyName: string;
+  categoryId: string;
+  subcategoryId: string;
   createdAt: Date;
   updatedAt: Date;
   isActive: boolean;
@@ -40,18 +38,6 @@ export interface Product {
   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
-  // NOT stored in top-level /products collection
-  /** Present only in subcollections - synced from technology metadata */
-  technologyId?: string;
-  /** Present only in subcollections - synced from technology name */
-  technologyName?: string;
-  /** Present only in subcollections - synced from technology categoryId */
-  categoryId?: string;
-  /** Present only in subcollections - synced from technology subcategoryId */
-  subcategoryId?: string;
 }
 
 /**
@@ -61,97 +47,9 @@ export const PRODUCTS_COLLECTION = 'products';
 
 /**
  * Interface for the ProductService class
- * 
- * NOTE: This interface maintains backward compatibility while adding new top-level collection methods.
- * Old methods using technologyId are kept for existing code, new methods work with top-level collection.
  */
 export interface IProductService {
-  // ==========================================
-  // NEW METHODS: Top-level collection (preferred)
-  // ==========================================
-  
-  /**
-   * 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'>,
-    technologyIds?: string[],
-  ): Promise<Product>;
-
-  /**
-   * Gets all products from the top-level collection
-   * @param options - Query options
-   */
-  getAllTopLevel(options: {
-    rowsPerPage: number;
-    lastVisible?: any;
-    brandId?: string;
-  }): Promise<{ products: Product[]; lastVisible: any }>;
-
-  /**
-   * Gets a product by ID from the top-level collection
-   * @param productId - ID of the product
-   */
-  getByIdTopLevel(productId: string): Promise<Product | null>;
-
-  /**
-   * Updates a product in the top-level collection
-   * @param productId - ID of the product to update
-   * @param product - Updated product data
-   */
-  updateTopLevel(
-    productId: string,
-    product: Partial<Omit<Product, 'id' | 'createdAt' | 'brandId'>>,
-  ): Promise<Product | null>;
-
-  /**
-   * Deletes a product from the top-level collection (soft delete)
-   * @param productId - ID of the product to delete
-   */
-  deleteTopLevel(productId: string): Promise<void>;
-
-  /**
-   * Assigns a product to a technology
-   * @param productId - ID of the product
-   * @param technologyId - ID of the technology
-   */
-  assignToTechnology(productId: string, technologyId: string): Promise<void>;
-
-  /**
-   * Unassigns a product from a technology
-   * @param productId - ID of the product
-   * @param technologyId - ID of the technology
-   */
-  unassignFromTechnology(productId: string, technologyId: string): Promise<void>;
-
-  /**
-   * Gets products assigned to a specific technology
-   * @param technologyId - ID of the technology
-   */
-  getAssignedProducts(technologyId: string): Promise<Product[]>;
-
-  /**
-   * Gets products NOT assigned to a specific technology
-   * @param technologyId - ID of the technology
-   */
-  getUnassignedProducts(technologyId: string): Promise<Product[]>;
-
-  /**
-   * Gets all products for a brand
-   * @param brandId - ID of the brand
-   */
-  getByBrand(brandId: string): Promise<Product[]>;
-
-  // ==========================================
-  // DEPRECATED METHODS: Kept for backward compatibility
-  // ==========================================
-  
   /**
-   * @deprecated Use createTopLevel instead
    * Creates a new product
    * @param technologyId - ID of the technology this product is used with
    * @param brandId - ID of the brand that manufactures this product
@@ -164,7 +62,6 @@ export interface IProductService {
   ): Promise<Product>;
 
   /**
-   * @deprecated Use getAllTopLevel instead
    * Gets a paginated list of all products, with optional filters.
    */
   getAll(options: {
@@ -176,7 +73,6 @@ export interface IProductService {
   }): Promise<{ products: Product[]; lastVisible: any }>;
 
   /**
-   * @deprecated Use alternative counting methods
    * Gets the total count of active products, with optional filters.
    */
   getProductsCount(options: {
@@ -186,7 +82,6 @@ export interface IProductService {
   }): Promise<number>;
 
   /**
-   * @deprecated Use alternative counting methods
    * Gets counts of active products grouped by category, subcategory, and technology.
    */
   getProductCounts(): Promise<{
@@ -196,21 +91,18 @@ export interface IProductService {
   }>;
 
   /**
-   * @deprecated Use getAssignedProducts instead
    * Gets all products for a specific technology (non-paginated, for filters/dropdowns)
    * @param technologyId - ID of the technology
    */
   getAllByTechnology(technologyId: string): Promise<Product[]>;
 
   /**
-   * @deprecated Use getByBrand instead
    * Gets all products for a brand
    * @param brandId - ID of the brand
    */
   getAllByBrand(brandId: string): Promise<Product[]>;
 
   /**
-   * @deprecated Use updateTopLevel instead
    * Updates a product
    * @param technologyId - ID of the technology
    * @param productId - ID of the product to update
@@ -223,7 +115,6 @@ export interface IProductService {
   ): Promise<Product | null>;
 
   /**
-   * @deprecated Use deleteTopLevel instead
    * Deletes a product (soft delete)
    * @param technologyId - ID of the technology
    * @param productId - ID of the product to delete
@@ -231,7 +122,6 @@ export interface IProductService {
   delete(technologyId: string, productId: string): Promise<void>;
 
   /**
-   * @deprecated Use getByIdTopLevel instead
    * Gets a product by ID
    * @param technologyId - ID of the technology
    * @param productId - ID of the product