Merge pull request 'YARA-884' (#63) from s.yahyaee/yara724-api:main into main

Reviewed-on: Yara724/api#63

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

@@ -239,13 +239,15 @@ export class ExpertClaimService {
   }
 
   /**
-   * Build a deep-cloned `evaluation` payload with resolved `signLink`s for the
+   * Build a deep-cloned `evaluation` payload with resolved file URLs the
-   * fields that carry a user signature:
+   * front-end can render directly:
    *
    *  - `damageExpertReply.userComment.signLink`
    *  - `damageExpertReplyFinal.userComment.signLink`
    *  - `ownerInsurerApproval.signLink`
    *  - `ownerPricedPartsApproval.signLink`
+   *  - `damageExpertReply.parts[i].factorLink`        (ObjectId → URL)
+   *  - `damageExpertReplyFinal.parts[i].factorLink`   (ObjectId → URL)
    *
    * Returns `undefined` when there's no evaluation to enrich.
    */
@@ -255,16 +257,21 @@ export class ExpertClaimService {
     if (!evaluation || typeof evaluation !== "object") return undefined;
     const ev = JSON.parse(JSON.stringify(evaluation)) as Record<string, unknown>;
 
-    const enrichReplyUserComment = async (key: string) => {
+    const enrichReply = async (key: string) => {
       const reply = ev[key] as Record<string, unknown> | undefined;
-      const uc = reply?.userComment as Record<string, unknown> | undefined;
+      if (!reply) return;
+      const uc = reply.userComment as Record<string, unknown> | undefined;
       if (uc?.signDetailId != null) {
         const signLink = await this.claimSignLinkFromId(uc.signDetailId);
-        (reply as Record<string, unknown>).userComment = { ...uc, signLink };
+        reply.userComment = { ...uc, signLink };
       }
+      // Resolve each `parts[].factorLink` ObjectId to a downloadable URL.
+      // `populateFactorLinks` mutates in place — safe here because `ev` was
+      // deep-cloned via JSON above, so we never touch the live mongoose doc.
+      await this.populateFactorLinks(reply);
     };
-    await enrichReplyUserComment("damageExpertReply");
+    await enrichReply("damageExpertReply");
-    await enrichReplyUserComment("damageExpertReplyFinal");
+    await enrichReply("damageExpertReplyFinal");
 
     const enrichApproval = async (key: string) => {
       const o = ev[key] as Record<string, unknown> | undefined;

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

@@ -1429,6 +1429,7 @@ export class RequestManagementService {
           );
           await this.smsOrchestrationService.sendInviteLink(
             secondPartyPhone,
+            req.publicId,
             url,
           );
           return {
@@ -1477,7 +1478,7 @@ export class RequestManagementService {
         frontendRoute,
         requestId,
       );
-      await this.smsOrchestrationService.sendInviteLink(phoneNumber, url);
+      await this.smsOrchestrationService.sendInviteLink(phoneNumber, req.publicId, url); 
 
       return {
         requestId: req._id,
@@ -2399,7 +2400,7 @@ export class RequestManagementService {
       frontendRoutes,
       requestId,
     );
-    await this.smsOrchestrationService.sendInviteLink(phoneNumber, URL);
+    await this.smsOrchestrationService.sendInviteLink(phoneNumber, request.publicId, URL);
 
     return { url: URL };
   }

src/sms-orchestration/sms-orchestration.service.ts

@@ -50,11 +50,12 @@ export class SmsOrchestrationService implements OnModuleInit {
     return `${process.env.URL}/caseClaim?token=${claimRequestId}`;
   }
 
-  async sendInviteLink(phoneNumber: string, link: string): Promise<boolean> {
+  async sendInviteLink(phoneNumber: string, publicId: string, link: string): Promise<boolean> {
     return this.sendTemplate({
       template: "yara724-invite-link",
       receptor: phoneNumber,
-      token: link,
+      token: publicId,
+      token2: link,
     });
   }