From ef6a5278a7308dd685af9d5e62970ffb76da55ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joe=20K=C3=BCng?= <joekueng05@gmail.com>
Date: Mon, 16 Feb 2026 14:05:43 +0100
Subject: [PATCH] fix(back-end): revert changes in uplad file

---
 .../services/quote-estimator.service.ts       | 79 +++++++++----------
 1 file changed, 36 insertions(+), 43 deletions(-)

diff --git a/frontend/src/app/features/calculator/services/quote-estimator.service.ts b/frontend/src/app/features/calculator/services/quote-estimator.service.ts
index 12e1777..93a5f80 100644
--- a/frontend/src/app/features/calculator/services/quote-estimator.service.ts
+++ b/frontend/src/app/features/calculator/services/quote-estimator.service.ts
@@ -180,24 +180,26 @@ export class QuoteEstimatorService {
                 const sessionId = sessionRes.id;
                 const sessionSetupCost = sessionRes.setupCostChf || 0;
                 
-                // 2. Process items SEQUENTIALLY to avoid timeouts/overload
+                // 2. Upload files to this session
                 const totalItems = request.items.length;
                 const allProgress: number[] = new Array(totalItems).fill(0);
                 const finalResponses: any[] = []; 
-                let completedCount = 0;
+                let completedRequests = 0;
 
-                const processNextItem = (index: number) => {
-                    if (index >= totalItems) {
-                        // All done
-                        finalize(finalResponses, sessionSetupCost, sessionId);
-                        return;
-                    }
+                const checkCompletion = () => {
+                     const avg = Math.round(allProgress.reduce((a, b) => a + b, 0) / totalItems);
+                     observer.next(avg);
+                     
+                     if (completedRequests === totalItems) {
+                         finalize(finalResponses, sessionSetupCost, sessionId);
+                     }
+                };
 
-                    const item = request.items[index];
-                    const formData = new FormData();
-                    formData.append('file', item.file);
-                    
-                    const settings = {
+                request.items.forEach((item, index) => {
+                     const formData = new FormData();
+                     formData.append('file', item.file);
+                     
+                     const settings = {
                          complexityMode: request.mode.toUpperCase(),
                          material: this.mapMaterial(request.material),
                          quality: request.quality,
@@ -207,48 +209,36 @@ export class QuoteEstimatorService {
                          infillDensity: request.mode === 'advanced' ? request.infillDensity : null,
                          infillPattern: request.mode === 'advanced' ? request.infillPattern : null,
                          nozzleDiameter: request.mode === 'advanced' ? request.nozzleDiameter : null
-                    };
+                     };
+        
+                     const settingsBlob = new Blob([JSON.stringify(settings)], { type: 'application/json' });
+                     formData.append('settings', settingsBlob);
 
-                    const settingsBlob = new Blob([JSON.stringify(settings)], { type: 'application/json' });
-                    formData.append('settings', settingsBlob);
-
-                    this.http.post<any>(`${environment.apiUrl}/api/quote-sessions/${sessionId}/line-items`, formData, { 
-                        headers,
-                        reportProgress: true,
-                        observe: 'events'
-                    }).subscribe({
+                     this.http.post<any>(`${environment.apiUrl}/api/quote-sessions/${sessionId}/line-items`, formData, { 
+                         headers,
+                         reportProgress: true,
+                         observe: 'events'
+                     }).subscribe({
                         next: (event) => {
                             if (event.type === HttpEventType.UploadProgress && event.total) {
                                 allProgress[index] = Math.round((100 * event.loaded) / event.total);
-                                reportProgress();
+                                checkCompletion();
                             } else if (event.type === HttpEventType.Response) { 
-                                allProgress[index] = 100;
-                                finalResponses[index] = { ...event.body, success: true, fileName: item.file.name, originalQty: item.quantity, originalItem: item };
-                                completedCount++;
-                                reportProgress();
-                                // Next
-                                processNextItem(index + 1);
+                                 allProgress[index] = 100;
+                                 finalResponses[index] = { ...event.body, success: true, fileName: item.file.name, originalQty: item.quantity, originalItem: item };
+                                 completedRequests++;
+                                 checkCompletion();
                             }
                         },
                         error: (err) => {
                             console.error('Item upload failed', err);
                             const errorMsg = err.error?.code === 'VIRUS_DETECTED' ? 'VIRUS_DETECTED' : 'UPLOAD_FAILED';
                             finalResponses[index] = { success: false, fileName: item.file.name, error: errorMsg };
-                            completedCount++;
-                            reportProgress();
-                            // Next even if error
-                            processNextItem(index + 1);
+                            completedRequests++;
+                            checkCompletion();
                         }
                     });
-                };
-
-                const reportProgress = () => {
-                     const avg = Math.round(allProgress.reduce((a, b) => a + b, 0) / totalItems);
-                     observer.next(avg);
-                };
-
-                // Start first item
-                processNextItem(0);
+                });
             },
             error: (err) => {
                 console.error('Failed to create session', err);
@@ -278,8 +268,10 @@ export class QuoteEstimatorService {
                      unitTime: res.printTimeSeconds || 0,
                      unitWeight: res.materialGrams || 0,
                      quantity: quantity,
-                     material: this.mapMaterial(request.material), // Uses session material
+                     material: request.material,
                      color: res.originalItem.color || 'Default'
+                     // Store ID if needed for updates? QuoteItem interface might need update
+                     // or we map it in component
                  });
                  
                  grandTotal += unitPrice * quantity;
@@ -288,6 +280,7 @@ export class QuoteEstimatorService {
              });
 
              if (validCount === 0) {
+                 // Check if any failed due to virus
                  const virusError = responses.find(r => r.error === 'VIRUS_DETECTED');
                  if (virusError) {
                      observer.error('VIRUS_DETECTED');