Fixed images being removed, fixed v4/v5 wrong status on uploadDocument

src/request-management/file-maker-status-resume.spec.ts

@@ -0,0 +1,112 @@
+import { Types } from "mongoose";
+import { CaseStatus } from "src/Types&Enums/blame-request-management/caseStatus.enum";
+import { ClaimCaseStatus } from "src/Types&Enums/claim-request-management/claim-case-status.enum";
+import { RoleEnum } from "src/Types&Enums/role.enum";
+import { RequestManagementService } from "./request-management.service";
+
+describe("FileMaker V4/V5 status resume bridge", () => {
+  const makerId = new Types.ObjectId();
+  const blameId = new Types.ObjectId();
+
+  const blameFile = {
+    _id: blameId,
+    publicId: "BL-FM-001",
+    requestNo: "R-1",
+    type: "THIRD_PARTY",
+    status: CaseStatus.OPEN,
+    blameStatus: "IN_PROGRESS",
+    isMadeByFileMaker: true,
+    initiatedByFieldExpertId: makerId,
+    requiresFileMakerApproval: false,
+    parties: [],
+    workflow: {
+      currentStep: "SECOND_COMPLETED",
+      nextStep: "WAITING_FOR_GUILT_DECISION",
+      completedSteps: ["SECOND_COMPLETED"],
+    },
+    createdAt: new Date(),
+    updatedAt: new Date(),
+  };
+
+  it("overlays claim UPLOADING_REQUIRED_DOCUMENTS onto detail status", async () => {
+    const service =
+      new (RequestManagementService as any)() as RequestManagementService;
+    (service as any).blameRequestDbService = {
+      findById: jest.fn().mockResolvedValue(blameFile),
+    };
+    (service as any).claimCaseDbService = {
+      findOne: jest.fn().mockResolvedValue({
+        _id: new Types.ObjectId(),
+        blameRequestId: blameId,
+        status: ClaimCaseStatus.UPLOADING_REQUIRED_DOCUMENTS,
+        workflow: {
+          currentStep: "UPLOAD_REQUIRED_DOCUMENTS",
+          nextStep: "SELECT_OUTER_PARTS",
+        },
+      }),
+    };
+
+    const detail = await service.getMyFileMakerFileDetail(
+      { sub: String(makerId), role: RoleEnum.FILE_MAKER },
+      String(blameId),
+    );
+
+    expect(detail.status).toBe(ClaimCaseStatus.UPLOADING_REQUIRED_DOCUMENTS);
+    expect(detail.blameCaseStatus).toBe(CaseStatus.OPEN);
+    expect(detail.claimStatus).toBe(
+      ClaimCaseStatus.UPLOADING_REQUIRED_DOCUMENTS,
+    );
+  });
+
+  it("does not overlay status when claim docs phase is finished", async () => {
+    const service =
+      new (RequestManagementService as any)() as RequestManagementService;
+    (service as any).blameRequestDbService = {
+      findById: jest.fn().mockResolvedValue({
+        ...blameFile,
+        status: CaseStatus.WAITING_FOR_FILE_REVIEWER,
+      }),
+    };
+    (service as any).claimCaseDbService = {
+      findOne: jest.fn().mockResolvedValue({
+        _id: new Types.ObjectId(),
+        blameRequestId: blameId,
+        status: ClaimCaseStatus.WAITING_FOR_FILE_REVIEWER,
+        workflow: { currentStep: "SELECT_OUTER_PARTS" },
+      }),
+    };
+
+    const detail = await service.getMyFileMakerFileDetail(
+      { sub: String(makerId), role: RoleEnum.FILE_MAKER },
+      String(blameId),
+    );
+
+    expect(detail.status).toBe(CaseStatus.WAITING_FOR_FILE_REVIEWER);
+    expect(detail.blameCaseStatus).toBeUndefined();
+  });
+
+  it("overlays the same bridge on my-files list rows", async () => {
+    const service =
+      new (RequestManagementService as any)() as RequestManagementService;
+    (service as any).blameRequestDbService = {
+      find: jest.fn().mockResolvedValue([blameFile]),
+    };
+    (service as any).claimCaseDbService = {
+      find: jest.fn().mockResolvedValue([
+        {
+          blameRequestId: blameId,
+          status: ClaimCaseStatus.UPLOADING_REQUIRED_DOCUMENTS,
+        },
+      ]),
+    };
+
+    const rows = await service.getMyFileMakerFiles({
+      sub: String(makerId),
+      role: RoleEnum.FILE_MAKER,
+    });
+
+    expect(rows).toHaveLength(1);
+    expect(rows[0].status).toBe(ClaimCaseStatus.UPLOADING_REQUIRED_DOCUMENTS);
+    expect(rows[0].blameCaseStatus).toBe(CaseStatus.OPEN);
+  });
+});

src/request-management/request-management.service.ts

@@ -12733,6 +12733,26 @@ export class RequestManagementService {
     return { ...workflow, completedSteps };
   }
 
+  /**
+   * V4/V5 dirty bridge: FileMaker FE resumes from blame `status`, but pre-capture
+   * document upload lives on the claim (`UPLOADING_REQUIRED_DOCUMENTS`) while blame
+   * is still at FIRST/SECOND_COMPLETED. Mirror claim status into `status` only for
+   * that phase so leave/re-enter can continue; keep real blame status as
+   * `blameCaseStatus`. Remove once FE keys off `claimStatus` / a unified resume pointer.
+   */
+  private fileMakerStatusForResume(
+    blameStatus: unknown,
+    claimStatus: unknown,
+  ): { status: unknown; blameCaseStatus?: unknown } {
+    if (claimStatus === ClaimCaseStatus.UPLOADING_REQUIRED_DOCUMENTS) {
+      return {
+        status: ClaimCaseStatus.UPLOADING_REQUIRED_DOCUMENTS,
+        blameCaseStatus: blameStatus,
+      };
+    }
+    return { status: blameStatus };
+  }
+
   async getMyFileMakerFiles(fileMaker: any): Promise<any[]> {
     if (fileMaker?.role !== RoleEnum.FILE_MAKER) {
       throw new ForbiddenException("Only FileMakers can use this endpoint.");
@@ -12742,14 +12762,35 @@ export class RequestManagementService {
       isMadeByFileMaker: true,
       initiatedByFieldExpertId: makerId,
     });
+    const blameIds = (files || []).map((f: any) => f._id).filter(Boolean);
+    const claims =
+      blameIds.length > 0
+        ? await this.claimCaseDbService.find(
+            { blameRequestId: { $in: blameIds } },
+            { lean: true, select: "blameRequestId status" },
+          )
+        : [];
+    const claimStatusByBlameId = new Map<string, unknown>();
+    for (const c of claims as any[]) {
+      const blameId = c?.blameRequestId != null ? String(c.blameRequestId) : "";
+      if (blameId) claimStatusByBlameId.set(blameId, c.status);
+    }
+
     return (files || []).map((f: any) => {
       const workflow = this.fileMakerWorkflowProjection(f);
+      const resume = this.fileMakerStatusForResume(
+        f.status,
+        claimStatusByBlameId.get(String(f._id)),
+      );
       return {
         _id: f._id,
         publicId: f.publicId,
         requestNo: f.requestNo,
         type: f.type,
-        status: f.status,
+        status: resume.status,
+        ...(resume.blameCaseStatus !== undefined
+          ? { blameCaseStatus: resume.blameCaseStatus }
+          : {}),
         blameStatus: f.blameStatus,
         workflow: {
           currentStep: workflow.currentStep,
@@ -12794,12 +12835,20 @@ export class RequestManagementService {
         : claim
           ? { ...(claim as any) }
           : null;
+    const resume = this.fileMakerStatusForResume(
+      plain.status,
+      claimPlain?.status,
+    );
+
     return {
       _id: plain._id,
       publicId: plain.publicId,
       requestNo: plain.requestNo,
       type: plain.type,
-      status: plain.status,
+      status: resume.status,
+      ...(resume.blameCaseStatus !== undefined
+        ? { blameCaseStatus: resume.blameCaseStatus }
+        : {}),
       blameStatus: plain.blameStatus,
       workflow: this.fileMakerWorkflowProjection(plain),
       requiresFileMakerApproval: plain.requiresFileMakerApproval,