@blackcode_sa/metaestetics-api 1.12.43 → 1.12.46

package/src/services/appointment/utils/zone-management.utils.ts

@@ -33,14 +33,15 @@ export function calculateItemSubtotal(item: Partial<ZoneItemData>): number {
     return 0;
   }
 
-  // If price override amount is set, use it
+  const quantity = item.quantity || 0;
+
+  // If price override amount is set, use it as price per unit
   if (item.priceOverrideAmount !== undefined && item.priceOverrideAmount !== null) {
-    return item.priceOverrideAmount;
+    return item.priceOverrideAmount * quantity;
   }
 
   // Calculate normally: price * quantity
   const price = item.price || 0;
-  const quantity = item.quantity || 0;
   return price * quantity;
 }
 
@@ -52,7 +53,7 @@ export function calculateItemSubtotal(item: Partial<ZoneItemData>): number {
  */
 export function calculateFinalBilling(
   zonesData: Record<string, ZoneItemData[]>,
-  taxRate: number = 0.2,
+  taxRate: number = 0.081,
 ): FinalBilling {
   let subtotalAll = 0;
 
@@ -167,8 +168,8 @@ export async function addItemToZoneUtil(
   // Add item to zone
   zonesData[zoneId].push(itemWithSubtotal);
 
-  // Recalculate final billing
-  const finalbilling = calculateFinalBilling(zonesData); //TODO: add correct amount of tax
+  // Recalculate final billing with Swiss tax rate (8.1%)
+  const finalbilling = calculateFinalBilling(zonesData, 0.081);
 
   // Update appointment
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -218,8 +219,8 @@ export async function removeItemFromZoneUtil(
     delete metadata.zonesData[zoneId];
   }
 
-  // Recalculate final billing
-  const finalbilling = calculateFinalBilling(metadata.zonesData); //TODO: add correct amount of tax
+  // Recalculate final billing with Swiss tax rate (8.1%)
+  const finalbilling = calculateFinalBilling(metadata.zonesData, 0.081);
 
   // Update appointment
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);
@@ -269,11 +270,24 @@ export async function updateZoneItemUtil(
     updatedAt: new Date().toISOString(),
   };
 
+  console.log(`[updateZoneItemUtil] BEFORE recalculation:`, {
+    itemIndex,
+    quantity: items[itemIndex].quantity,
+    priceOverrideAmount: items[itemIndex].priceOverrideAmount,
+    price: items[itemIndex].price,
+    oldSubtotal: items[itemIndex].subtotal,
+  });
+
   // Recalculate subtotal for this item
   items[itemIndex].subtotal = calculateItemSubtotal(items[itemIndex]);
 
-  // Recalculate final billing
-  const finalbilling = calculateFinalBilling(metadata.zonesData); //TODO: add correct amount of tax
+  console.log(`[updateZoneItemUtil] AFTER recalculation:`, {
+    itemIndex,
+    newSubtotal: items[itemIndex].subtotal,
+  });
+
+  // Recalculate final billing with Swiss tax rate (8.1%)
+  const finalbilling = calculateFinalBilling(metadata.zonesData, 0.081);
 
   // Update appointment
   const appointmentRef = doc(db, APPOINTMENTS_COLLECTION, appointmentId);

package/src/backoffice/services/migrate-products.ts

@@ -1,116 +0,0 @@
-import * as admin from 'firebase-admin';
-import { Product } from '../types/product.types';
-
-/**
- * Migration script to copy existing products from technology subcollections
- * to the new top-level products collection
- * 
- * Usage: Run this once to migrate existing data
- */
-export async function migrateProductsToTopLevel(db: admin.firestore.Firestore) {
-  console.log('🚀 Starting product migration...');
-  
-  // Get all technologies
-  const technologiesSnapshot = await db.collection('technologies').get();
-  
-  const productMap = new Map<string, {
-    product: any;
-    technologyIds: string[];
-  }>();
-  
-  let totalProcessed = 0;
-  
-  // Step 1: Collect all products from all technology subcollections
-  for (const techDoc of technologiesSnapshot.docs) {
-    const technologyId = techDoc.id;
-    console.log(`📦 Processing technology: ${technologyId}`);
-    
-    const productsSnapshot = await db
-      .collection('technologies')
-      .doc(technologyId)
-      .collection('products')
-      .get();
-    
-    for (const productDoc of productsSnapshot.docs) {
-      const productId = productDoc.id;
-      const productData = productDoc.data();
-      
-      totalProcessed++;
-      
-      // Deduplicate by name + brandId
-      const key = `${productData.name}_${productData.brandId}`;
-      
-      if (productMap.has(key)) {
-        // Product already exists, just add this technology
-        productMap.get(key)!.technologyIds.push(technologyId);
-      } else {
-        // New product
-        productMap.set(key, {
-          product: productData,
-          technologyIds: [technologyId],
-        });
-      }
-    }
-  }
-  
-  console.log(`✅ Found ${productMap.size} unique products from ${totalProcessed} total entries`);
-  
-  // Step 2: Create products in top-level collection
-  const batch = db.batch();
-  let batchCount = 0;
-  const MAX_BATCH_SIZE = 500;
-  let createdCount = 0;
-  
-  for (const [key, { product, technologyIds }] of productMap.entries()) {
-    const productRef = db.collection('products').doc();
-    
-    const migratedProduct: any = {
-      ...product,
-      assignedTechnologyIds: technologyIds, // Track all assigned technologies
-      migratedAt: admin.firestore.FieldValue.serverTimestamp(),
-      migrationKey: key, // For debugging
-    };
-    
-    batch.set(productRef, migratedProduct);
-    createdCount++;
-    batchCount++;
-    
-    if (batchCount >= MAX_BATCH_SIZE) {
-      await batch.commit();
-      console.log(`💾 Committed batch of ${batchCount} products (${createdCount}/${productMap.size})`);
-      batchCount = 0;
-    }
-  }
-  
-  if (batchCount > 0) {
-    await batch.commit();
-    console.log(`💾 Committed final batch of ${batchCount} products`);
-  }
-  
-  console.log('✅ Migration complete!');
-  console.log(`📊 Summary:`);
-  console.log(`   - Products processed: ${totalProcessed}`);
-  console.log(`   - Unique products created: ${createdCount}`);
-  console.log(`   - Average technologies per product: ${(createdCount > 0 ? totalProcessed / createdCount : 0).toFixed(2)}`);
-  
-  return {
-    totalProcessed,
-    uniqueCreated: createdCount,
-  };
-}
-
-/**
- * Run migration (for testing)
- */
-if (require.main === module) {
-  (async () => {
-    try {
-      await migrateProductsToTopLevel(admin.firestore());
-      process.exit(0);
-    } catch (error) {
-      console.error('❌ Migration failed:', error);
-      process.exit(1);
-    }
-  })();
-}
-