YARA-885

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

@@ -45,6 +45,11 @@ import {
   claimCaseStatusToReportBucket,
   initialClaimExpertReportBuckets,
 } from "src/helpers/expert-panel-status-report";
+import {
+  claimDocInExpertPortfolio,
+  expertPortfolioFileIdsFromActivityEvents,
+  objectIdsFromStringSet,
+} from "src/helpers/expert-portfolio";
 import { ClaimWorkflowStep } from "src/Types&Enums/claim-request-management/claim-workflow-steps.enum";
 import { ClaimRequiredDocumentType } from "src/Types&Enums/claim-request-management/required-document-type.enum";
 import { BlameRequestType } from "src/Types&Enums/blame-request-management/blameRequestType.enum";
@@ -2570,6 +2575,7 @@ export class ExpertClaimService {
           resendDescription: desc || undefined,
           resendDocuments: uniqueDocs,
           resendCarParts: normalizedParts,
+          requestedByExpertId: new Types.ObjectId(actor.sub),
           ...(resendSnapshot && { expertProfileSnapshot: resendSnapshot }),
         },
       },
@@ -2606,6 +2612,14 @@ export class ExpertClaimService {
       });
     }
 
+    await this.recordClaimExpertActivity({
+      expertId: String(actor.sub),
+      tenantId: this.claimActivityTenantId(claim, actor),
+      claimId: String(claimRequestId),
+      eventType: ExpertFileActivityType.HANDLED,
+      idempotencyKey: `claim:${claimRequestId}:handled:resend:${actor.sub}`,
+    });
+
     return {
       claimRequestId,
       status: ClaimCaseStatus.WAITING_FOR_USER_RESEND,
@@ -2972,18 +2986,55 @@ export class ExpertClaimService {
   }
 
   /**
-   * V2: Count claim cases for this damage expert’s tenant, grouped for dashboard:
-   * `IN_PROGRESS` = user flow before submission complete (CREATED … CAPTURING_PART_DAMAGES);
-   * other {@link ClaimCaseStatus} keys unchanged.
+   * V2: Count claim cases in this damage expert’s portfolio, grouped for dashboard.
+   * Includes files the expert locked, replied on, or has CHECKED/HANDLED in expertFileActivities.
+   * Does not include the open tenant queue (`WAITING_FOR_DAMAGE_EXPERT`) unless this expert touched the file.
    */
   async getStatusReportBucketsV2(actor: any): Promise<Record<string, number>> {
     const clientKey = requireActorClientKey(actor);
-    const rows = await this.claimCaseDbService.find({}, { lean: true });
+    const expertId = String(actor.sub);
+    const expertOid = new Types.ObjectId(expertId);
+
+    const activityEvents = await this.expertFileActivityDbService.findByExpert(
+      expertId,
+      ExpertFileKind.CLAIM,
+    );
+    const activityFileIds =
+      expertPortfolioFileIdsFromActivityEvents(activityEvents);
+
+    const orClauses: Record<string, unknown>[] = [
+      { "workflow.lockedBy.actorId": expertOid },
+      { "evaluation.damageExpertReply.actorDetail.actorId": expertOid },
+      { "evaluation.damageExpertReplyFinal.actorDetail.actorId": expertOid },
+      { "evaluation.damageExpertResend.requestedByExpertId": expertOid },
+    ];
+    const activityOids = objectIdsFromStringSet(activityFileIds);
+    if (activityOids.length > 0) {
+      orClauses.push({ _id: { $in: activityOids } });
+    }
+
+    const rows =
+      orClauses.length === 0
+        ? []
+        : await this.claimCaseDbService.find({ $or: orClauses }, { lean: true });
+
     const buckets = initialClaimExpertReportBuckets();
+    const seen = new Set<string>();
     for (const doc of rows as Record<string, unknown>[]) {
-      if (!claimCaseTouchesClient(doc, clientKey)) continue;
-      const st = String(doc.status ?? "");
-      const key = claimCaseStatusToReportBucket(st);
+      const id = String(doc._id ?? "");
+      if (seen.has(id)) continue;
+      if (
+        !claimDocInExpertPortfolio(
+          doc,
+          expertId,
+          activityFileIds,
+          clientKey,
+        )
+      ) {
+        continue;
+      }
+      seen.add(id);
+      const key = claimCaseStatusToReportBucket(String(doc.status ?? ""));
       buckets.all++;
       buckets[key] = (buckets[key] ?? 0) + 1;
     }

src/expert-claim/expert-claim.v2.controller.ts

@@ -43,9 +43,9 @@ export class ExpertClaimV2Controller {
 
   @Get("report/status-counts")
   @ApiOperation({
-    summary: "Count claim cases by grouped status bucket (tenant)",
+    summary: "Count claim cases by grouped status bucket (this damage expert)",
     description:
-      "IN_PROGRESS groups user-phase statuses before submission is complete (CREATED through CAPTURING_PART_DAMAGES). Other keys match ClaimCaseStatus. Scoped to the insurer in the JWT.",
+      "Counts only files in the acting expert’s portfolio: expertFileActivities (checked or handled), current workflow lock, or a prior damageExpertReply / damageExpertReplyFinal by this expert. IN_PROGRESS groups user-phase statuses before submission is complete (CREATED through CAPTURING_PART_DAMAGES). Other keys match ClaimCaseStatus. Does not include the open tenant queue unless this expert has touched the file.",
   })
   async getStatusReportBucketsV2(@CurrentUser() actor: any) {
     return await this.expertClaimService.getStatusReportBucketsV2(actor);