status modfied

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

@@ -66,7 +66,9 @@ import {
 } from "src/helpers/blame-party-agreement-decision";
 import { resendRequestHasPayload } from "src/helpers/claim-expert-resend";
 import {
+  claimCaseStatusAfterExpertReplyV2,
   classifyV2ExpertPricingParts,
+  claimIsAwaitingExpertFactorValidationV2,
 } from "src/helpers/claim-v2-expert-reply-workflow";
 import {
   getClaimCarAngleCaptureBlob,
@@ -1911,7 +1913,7 @@ export class ExpertClaimService {
    * V2 (ClaimCase): validate user-uploaded repair factors on the active expert reply.
    * Preconditions: all `factorNeeded` parts have `factorLink`; case is UNDER_REVIEW at EXPERT_COST_EVALUATION.
    * — All approved → claimStatus APPROVED, INSURER_REVIEW: owner accepts/rejects to close.
-   * — Any rejected (expert repriced) → WAITING_FOR_INSURER_APPROVAL, APPROVED, INSURER_REVIEW until owner accepts/rejects.
+   * — Any rejected (expert repriced) → INSURER_REVIEW_AWAITING_OWNER_SIGN, APPROVED, INSURER_REVIEW until owner accepts/rejects.
    */
   async validateClaimFactorsV2(
     claimRequestId: string,
@@ -1927,11 +1929,7 @@ export class ExpertClaimService {
 
     const factorValidationSnapshot = await this.snapshotDamageExpert(actor.sub);
 
-    if (
-      claim.status !== ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL ||
-      claim.claimStatus !== ClaimStatus.UNDER_REVIEW ||
-      claim.workflow?.currentStep !== ClaimWorkflowStep.EXPERT_COST_EVALUATION
-    ) {
+    if (!claimIsAwaitingExpertFactorValidationV2(claim)) {
       throw new BadRequestException(
         "Claim is not awaiting expert factor validation (UNDER_REVIEW at EXPERT_COST_EVALUATION).",
       );
@@ -2075,7 +2073,7 @@ export class ExpertClaimService {
     if (anyRejected) {
       await this.claimCaseDbService.findByIdAndUpdate(claimRequestId, {
         $set: {
-          status: ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL,
+          status: ClaimCaseStatus.INSURER_REVIEW_AWAITING_OWNER_SIGN,
           claimStatus: ClaimStatus.APPROVED,
           "workflow.currentStep": ClaimWorkflowStep.INSURER_REVIEW,
           "workflow.nextStep": ClaimWorkflowStep.CLAIM_COMPLETED,
@@ -2108,7 +2106,7 @@ export class ExpertClaimService {
           "Factors reviewed with repricing. Owner must accept or reject via owner-insurer-approval/sign.",
         claimRequestId,
         claimStatus: ClaimStatus.APPROVED,
-        caseStatus: ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL,
+        caseStatus: ClaimCaseStatus.INSURER_REVIEW_AWAITING_OWNER_SIGN,
         outcome: "REJECTED_REPRICED_OWNER_SIGN",
       };
     }
@@ -2155,7 +2153,7 @@ export class ExpertClaimService {
         "All factors approved. The claim proceeds to insurer review (same as non-factor expert reply).",
       claimRequestId,
       claimStatus: ClaimStatus.APPROVED,
-      caseStatus: ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL,
+      caseStatus: ClaimCaseStatus.INSURER_REVIEW_AWAITING_OWNER_SIGN,
       outcome: "ALL_APPROVED_INSURER_REVIEW",
     };
   }
@@ -2482,7 +2480,7 @@ export class ExpertClaimService {
    * On success:
    * - Stores reply; clears owner signature fields (`ownerInsurerApproval`, `ownerPricedPartsApproval`)
    * - Unlocks the workflow
-   * - Pricing-only (`factorNeeded=false` everywhere): WAITING_FOR_INSURER_APPROVAL, APPROVED, INSURER_REVIEW → owner final sign/reject.
+   * - Pricing-only (`factorNeeded=false` everywhere): INSURER_REVIEW_AWAITING_OWNER_SIGN, APPROVED, INSURER_REVIEW → owner final sign/reject.
    * - All lines `factorNeeded`: NEEDS_REVISION, OWNER_UPLOAD_FACTOR_DOCUMENTS → uploads → UNDER_REVIEW, EXPERT_COST_EVALUATION (validate factors).
    * - Mixed priced + factor: NEEDS_REVISION, INSURER_REVIEW with next OWNER_UPLOAD_FACTOR_DOCUMENTS → owner signs priced lines first → upload factors → expert validates → final sign.
    */
@@ -2576,7 +2574,7 @@ export class ExpertClaimService {
     let currentStep = ClaimWorkflowStep.INSURER_REVIEW;
     let nextWorkflowStep = ClaimWorkflowStep.CLAIM_COMPLETED;
 
-    const nextCaseStatus = ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL;
+    const nextCaseStatus = claimCaseStatusAfterExpertReplyV2(processedParts);
     let nextClaimStatus = ClaimStatus.APPROVED;
 
     if (needsFactorUpload) {
@@ -2780,7 +2778,7 @@ export class ExpertClaimService {
    * Returns claims that are (then filtered to the actor's insurer via `claimCaseTouchesClient`):
    * 1. WAITING_FOR_DAMAGE_EXPERT and not locked (open queue)
    * 2. Locked by this expert (in-progress)
-   * 3. WAITING_FOR_INSURER_APPROVAL + UNDER_REVIEW at EXPERT_COST_EVALUATION (factor validation queue)
+   * 3. EXPERT_VALIDATING_REPAIR_FACTORS (or legacy WAITING_FOR_INSURER_APPROVAL) + UNDER_REVIEW at EXPERT_COST_EVALUATION (factor validation queue)
    */
   async getClaimListV2(actor: any): Promise<GetClaimListV2ResponseDto> {
     requireActorClientKey(actor);
@@ -2808,9 +2806,18 @@ export class ExpertClaimService {
         },
         // User uploaded all factors; expert must approve/reject (unlocked queue)
         {
-          status: ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL,
-          claimStatus: ClaimStatus.UNDER_REVIEW,
-          'workflow.currentStep': ClaimWorkflowStep.EXPERT_COST_EVALUATION,
+          $or: [
+            {
+              status: ClaimCaseStatus.EXPERT_VALIDATING_REPAIR_FACTORS,
+              claimStatus: ClaimStatus.UNDER_REVIEW,
+              'workflow.currentStep': ClaimWorkflowStep.EXPERT_COST_EVALUATION,
+            },
+            {
+              status: ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL,
+              claimStatus: ClaimStatus.UNDER_REVIEW,
+              'workflow.currentStep': ClaimWorkflowStep.EXPERT_COST_EVALUATION,
+            },
+          ],
         },
       ],
     });
@@ -2867,10 +2874,7 @@ export class ExpertClaimService {
     );
 
     const list = filtered.map((c) => {
-      const awaitingFactorValidation =
-        c.status === ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL &&
-        c.claimStatus === ClaimStatus.UNDER_REVIEW &&
-        c.workflow?.currentStep === ClaimWorkflowStep.EXPERT_COST_EVALUATION;
+      const awaitingFactorValidation = claimIsAwaitingExpertFactorValidationV2(c);
       const v = this.vehicleForExpertFromClaimAndBlameMap(c, blameById);
       const blame = c.blameRequestId
         ? blameById.get(c.blameRequestId.toString())
@@ -3237,7 +3241,7 @@ export class ExpertClaimService {
    * Validations:
    * - Claim must exist and belong to the actor's insurer (`assertClaimCaseForTenant`)
    * - Allowed when: WAITING_FOR_DAMAGE_EXPERT (queue), or EXPERT_REVIEWING (after lock — same expert must be able to reopen detail),
-   *   or factor-validation queue (WAITING_FOR_INSURER_APPROVAL + UNDER_REVIEW + EXPERT_COST_EVALUATION)
+   *   or factor-validation queue (EXPERT_VALIDATING_REPAIR_FACTORS / legacy WAITING_FOR_INSURER_APPROVAL + UNDER_REVIEW + EXPERT_COST_EVALUATION)
    * - If an active workflow lock exists (15 min from lockedAt): only the locking expert; after expiry, any expert (tenant) may view
    */
   async getClaimDetailV2(
@@ -3259,9 +3263,7 @@ export class ExpertClaimService {
       claim.status === ClaimCaseStatus.WAITING_FOR_DAMAGE_EXPERT ||
       claim.status === ClaimCaseStatus.EXPERT_REVIEWING;
     const isFactorValidationPending =
-      claim.status === ClaimCaseStatus.WAITING_FOR_INSURER_APPROVAL &&
-      claim.claimStatus === ClaimStatus.UNDER_REVIEW &&
-      claim.workflow?.currentStep === ClaimWorkflowStep.EXPERT_COST_EVALUATION;
+      claimIsAwaitingExpertFactorValidationV2(claim);
 
     if (!isDamageExpertPhase && !isFactorValidationPending) {
       throw new ForbiddenException(