From e5e2fabb1decd8708d13d79d0c6d94a62638ed53 Mon Sep 17 00:00:00 2001
From: AI Assistant <ai@architools.local>
Date: Tue, 24 Mar 2026 21:46:37 +0200
Subject: [PATCH] =?UTF-8?q?fix(rgi):=20correct=20download=20flow=20?=
 =?UTF-8?q?=E2=80=94=20confirmOnView=20+=20downloadFile=20by=20documentPk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The download uses documentPk (not documentTypeId) as the file identifier:
1. confirmOnView/{wid}/{appId}/{documentPk} — confirm view
2. loadDocument/downloadFile/{wid}/{documentPk} — actual download

Removed fileVisibility step (not needed, was causing 404).
Updated page download links to pass documentPk.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/app/(modules)/rgi-test/page.tsx          |  2 +-
 src/app/api/eterra/rgi/download-doc/route.ts | 50 +++++---------------
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/src/app/(modules)/rgi-test/page.tsx b/src/app/(modules)/rgi-test/page.tsx
index c79d803..e269244 100644
--- a/src/app/(modules)/rgi-test/page.tsx
+++ b/src/app/(modules)/rgi-test/page.tsx
@@ -296,7 +296,7 @@ function IssuedDocsPanel({
           </div>
           <Button size="sm" variant="outline" className="shrink-0 gap-1" asChild>
             <a
-              href={`/api/eterra/rgi/download-doc?workspaceId=${doc.workspaceId || workspaceId}&applicationId=${doc.applicationId || applicationPk}&docId=${doc.documentTypeId}&fileId=${doc.documentPk}`}
+              href={`/api/eterra/rgi/download-doc?workspaceId=${doc.workspaceId || workspaceId}&applicationId=${doc.applicationId || applicationPk}&documentPk=${doc.documentPk}`}
               target="_blank"
               rel="noopener noreferrer"
             >
diff --git a/src/app/api/eterra/rgi/download-doc/route.ts b/src/app/api/eterra/rgi/download-doc/route.ts
index cef1b2b..ae8d6d3 100644
--- a/src/app/api/eterra/rgi/download-doc/route.ts
+++ b/src/app/api/eterra/rgi/download-doc/route.ts
@@ -5,33 +5,22 @@ export const runtime = "nodejs";
 export const dynamic = "force-dynamic";
 
 /**
- * GET /api/eterra/rgi/download-doc?workspaceId=127&applicationId=X&docId=Y&fileId=Z
+ * GET /api/eterra/rgi/download-doc?workspaceId=127&applicationId=X&documentPk=Y
  *
  * Downloads an issued document from eTerra RGI.
- * 3-step flow:
- *   1. fileVisibility/{wid}/{appId}/{docId} — check access, get fileId
- *   2. confirmOnView/{wid}/{appId}/{fileId} — confirm view
- *   3. loadDocument/downloadFile/{wid}/{fileId} — actual download
- *
- * If fileId is provided, skips step 1.
+ * 2-step flow:
+ *   1. confirmOnView/{wid}/{appId}/{documentPk}
+ *   2. loadDocument/downloadFile/{wid}/{documentPk}
  */
 export async function GET(req: NextRequest) {
   try {
     const workspaceId = req.nextUrl.searchParams.get("workspaceId");
     const applicationId = req.nextUrl.searchParams.get("applicationId");
-    const docId = req.nextUrl.searchParams.get("docId");
-    let fileId = req.nextUrl.searchParams.get("fileId");
+    const documentPk = req.nextUrl.searchParams.get("documentPk");
 
-    if (!workspaceId || !applicationId) {
+    if (!workspaceId || !applicationId || !documentPk) {
       return NextResponse.json(
-        { error: "workspaceId and applicationId are required" },
-        { status: 400 },
-      );
-    }
-
-    if (!docId && !fileId) {
-      return NextResponse.json(
-        { error: "docId or fileId is required" },
+        { error: "workspaceId, applicationId and documentPk are required" },
         { status: 400 },
       );
     }
@@ -44,35 +33,18 @@ export async function GET(req: NextRequest) {
 
     const client = await EterraClient.create(username, password);
 
-    // Step 1: Get fileId from visibility check (if not provided)
-    if (!fileId && docId) {
-      const visibility = await client.rgiGet(
-        `rgi/appdetail/issueddocs/fileVisibility/${workspaceId}/${applicationId}/${docId}`,
-      );
-      // Extract fileId from visibility response
-      if (visibility && typeof visibility === "object") {
-        const v = visibility as Record<string, unknown>;
-        fileId = String(
-          v.fileId ?? v.id ?? v.pk ?? v.documentFileId ?? "",
-        );
-      }
-      if (!fileId) {
-        return NextResponse.json({ error: "fileId not found in visibility response", visibility }, { status: 404 });
-      }
-    }
-
-    // Step 2: Confirm on view
+    // Step 1: Confirm on view
     try {
       await client.rgiGet(
-        `rgi/appdetail/issueddocs/confirmOnView/${workspaceId}/${applicationId}/${fileId}`,
+        `rgi/appdetail/issueddocs/confirmOnView/${workspaceId}/${applicationId}/${documentPk}`,
       );
     } catch {
       // Non-critical — continue to download
     }
 
-    // Step 3: Download
+    // Step 2: Download file
     const { data, contentType, filename } = await client.rgiDownload(
-      `rgi/appdetail/loadDocument/downloadFile/${workspaceId}/${fileId}`,
+      `rgi/appdetail/loadDocument/downloadFile/${workspaceId}/${documentPk}`,
     );
 
     return new NextResponse(new Uint8Array(data), {