Centralized damaged parts alongside all their required info

src/expert-claim/expert-claim.service.ts

@@ -132,6 +132,7 @@ import {
 import { CLAIM_V2_TOTAL_PAYMENT_CAP_TOMAN } from "src/constants/repair-amount-limits";
 import { ListQueryV2Dto } from "src/common/dto/list-query-v2.dto";
 import { applyListQueryV2 } from "src/helpers/list-query-v2";
+import { buildEnrichedDamagedParts } from "./dto/claim-damaged-part.enricher";
 
 const CLAIM_V2_TOTAL_PAYMENT_CAP = CLAIM_V2_TOTAL_PAYMENT_CAP_TOMAN;
 
@@ -3867,56 +3868,19 @@ export class ExpertClaimService {
     const objectionParts = evaluationBlock?.objection?.objectionParts || [];
     const newObjectionParts = evaluationBlock?.objection?.newParts || [];
 
-    const damagedParts = selectedNormExpert.map((sp, index) => {
-      const ck = sp.catalogKey ?? catalogLikeKeyFromPart(sp);
-      const cap = getDamagedPartCaptureBlob(
-        damagedPartsDataExpert,
-        ck,
-        selectedNormExpert,
-      ) as { url?: string; path?: string } | undefined;
+    // Inside getClaimDetailV2, replace the damagedParts block:
 
-      // 1. Cross-reference Price Drop items via partId or name match
-      const matchingPriceDrop = priceDropLines.find(
-        (line: any) =>
-          line.partId === sp.id ||
-          line.priceDropPartKey?.toLowerCase() === sp.name?.toLowerCase(),
-      );
-
-      // 2. Evaluate if this specific part is flag-linked within an active user objection
-      const isObjected = objectionParts.some(
-        (objPart: any) => objPart.id === sp.id || objPart.name === sp.name,
-      );
-      const isNewAddedPart = newObjectionParts.some(
-        (newPart: any) => newPart.id === sp.id || newPart.name === sp.name,
-      );
-
-      return {
-        index,
-        partId: catalogPartIdFromSelectedPart(sp),
-        id: sp.id,
-        name: sp.name,
-        side: sp.side,
-        label_fa: sp.label_fa,
-        captured: hasDamagedPartCapture(
-          damagedPartsDataExpert,
-          ck,
-          selectedNormExpert,
-        ),
-        url: cap?.url || (cap?.path ? buildFileLink(cap.path) : undefined),
-
-        // --- Added Consolidated Production Enrichments ---
-        severity: matchingPriceDrop ? matchingPriceDrop.severity : null,
-        coefficient: matchingPriceDrop ? matchingPriceDrop.coefficient : null,
-        objectionStatus: {
-          hasObjection: isObjected,
-          isNewlyAddedByObjection: isNewAddedPart,
-          // You can map extra parameters here if the front-end requires reason texts
-        },
-      };
+    const damagedParts = buildEnrichedDamagedParts({
+      selectedParts: selectedNormExpert,
+      damagedPartsData: damagedPartsDataExpert,
+      evaluationBlock: (claim as any).evaluation, // damageExpertResend lives here already
+      expertAddedParts: (claim.damage as any)?.expertAddedParts ?? [],
+      getDamagedPartCaptureBlob,
+      hasDamagedPartCapture,
+      catalogLikeKeyFromPart,
+      buildFileLink,
     });
 
-    // --- Combine both branches of the conflict, preserving necessary logic from both ---
-
     // 1. Vehicle payload logic from "upstream"
     let vehiclePayload = claim.vehicle as any;
     const hasClaimVehicle =
@@ -4377,9 +4341,29 @@ export class ExpertClaimService {
       ? [...(claim as any).damage.selectedParts]
       : [];
 
+    // Diff to find parts the expert is adding that weren't in the original selection
+    const previousPartIds = new Set(
+      previousNorm.map((p) => p.id ?? `${p.name}::${p.side}`),
+    );
+    const expertAddedNow = nextNorm.filter(
+      (p) => !previousPartIds.has(p.id ?? `${p.name}::${p.side}`),
+    );
+
+    // Merge with parts the expert added in any previous edits on this claim (idempotent)
+    const existingExpertAdded: any[] =
+      (claim.damage as any)?.expertAddedParts ?? [];
+    const existingExpertAddedIds = new Set(
+      existingExpertAdded.map((p: any) => p.id ?? `${p.name}::${p.side}`),
+    );
+    const expertAddedToAppend = expertAddedNow.filter(
+      (p) => !existingExpertAddedIds.has(p.id ?? `${p.name}::${p.side}`),
+    );
+    const mergedExpertAdded = [...existingExpertAdded, ...expertAddedToAppend];
+
     const $set: Record<string, unknown> = {
       "damage.selectedParts": nextNorm,
       "media.damagedParts": nextMedia,
+      "damage.expertAddedParts": mergedExpertAdded,
     };
 
     await this.claimCaseDbService.findByIdAndUpdate(claimRequestId, {
@@ -4396,6 +4380,7 @@ export class ExpertClaimService {
           metadata: {
             previousSelectedParts: previous,
             selectedParts: nextNorm,
+            expertAddedParts: mergedExpertAdded,
             ...(damagedPartsEditSnapshot && {
               expertProfileSnapshot: damagedPartsEditSnapshot,
             }),
@@ -4408,6 +4393,7 @@ export class ExpertClaimService {
       claimRequestId: claim._id.toString(),
       selectedParts: nextNorm,
       previousSelectedParts: previous,
+      expertAddedParts: mergedExpertAdded,
       message: "Damaged parts updated successfully.",
     };
   }