From 102f5410b18fe46c9d00f3c32ded2bc8c8b9f66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=D1=81=20=D0=A1=D1=83=D0=BB=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= <si@op16.ru>
Date: Tue, 29 Sep 2026 10:41:53 +0300
Subject: [PATCH] =?UTF-8?q?fix(files):=20backfill=20=E2=80=94=20regexp=5Fr?=
 =?UTF-8?q?eplace=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20substring=20FRO?=
 =?UTF-8?q?M=20(=D0=B2=D0=BE=D0=B7=D0=B2=D1=80=D0=B0=D1=89=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81,=20=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=BA=D0=BB=D1=8E=D1=87)=20+=20=D1=83=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BC=D1=83=D1=81=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9=20?=
 =?UTF-8?q?=D1=81=D0=BE=20=D1=81=D0=BB=D1=8D=D1=88=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

substring(url FROM '^.*\/api/files/') в PG возвращает СОВПАВШУЮ часть (префикс
URL), а не остаток — backfill писал бы мусорный file_key. regexp_replace
проверен на проде: ключ извлекается корректно из абсолютных и относительных URL.
Добавлен DELETE file_uploads с file_key LIKE '%/%' (ключи слэшей не содержат).
---
 server/index.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/index.ts b/server/index.ts
index 0d4188b..bf96884 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -923,6 +923,10 @@ async function runStartupDataPatches() {
   // Паттерны '%/api/files/%' и '%/uploads/%' покрывают и относительные, и старые
   // АБСОЛЮТНЫЕ URL (https://iistwin.ru/api/files/...) — раньше они пропускались,
   // и такие файлы были недоступны ботам («не отслеживается»).
+  // Защита от мусорных ключей (file_key никогда не содержит '/'): удаляем строки,
+  // вставленные ошибочными/старыми версиями backfill (например, префикс URL целиком).
+  await db.execute(sql`DELETE FROM file_uploads WHERE file_key LIKE '%/%'`).catch(() => {});
+
   // Single-file field values: { url, name, size }
   await db.execute(sql`
     INSERT INTO file_uploads (organization_id, uploaded_by, file_key, original_name, size_bytes, task_id, field_id)
@@ -930,8 +934,8 @@ async function runStartupDataPatches() {
       t.organization_id,
       t.created_by,
       CASE
-        WHEN tfv.value->>'url' LIKE '%/api/files/%' THEN substring(tfv.value->>'url' FROM '^.*/api/files/')
-        WHEN tfv.value->>'url' LIKE '%/uploads/%' THEN substring(tfv.value->>'url' FROM '^.*/uploads/')
+        WHEN tfv.value->>'url' LIKE '%/api/files/%' THEN regexp_replace(tfv.value->>'url', '^.*/api/files/', '')
+        WHEN tfv.value->>'url' LIKE '%/uploads/%' THEN regexp_replace(tfv.value->>'url', '^.*/uploads/', '')
       END AS file_key,
       tfv.value->>'name',
       (tfv.value->>'size')::integer,
@@ -953,8 +957,8 @@ async function runStartupDataPatches() {
       t.organization_id,
       t.created_by,
       CASE
-        WHEN elem->>'url' LIKE '%/api/files/%' THEN substring(elem->>'url' FROM '^.*/api/files/')
-        WHEN elem->>'url' LIKE '%/uploads/%' THEN substring(elem->>'url' FROM '^.*/uploads/')
+        WHEN elem->>'url' LIKE '%/api/files/%' THEN regexp_replace(elem->>'url', '^.*/api/files/', '')
+        WHEN elem->>'url' LIKE '%/uploads/%' THEN regexp_replace(elem->>'url', '^.*/uploads/', '')
       END AS file_key,
       elem->>'name',
       (elem->>'size')::integer,
@@ -977,8 +981,8 @@ async function runStartupDataPatches() {
       f.organization_id,
       COALESCE(tm.author_id, t.created_by),
       CASE
-        WHEN att->>'url' LIKE '%/api/files/%' THEN substring(att->>'url' FROM '^.*/api/files/')
-        WHEN att->>'url' LIKE '%/uploads/%' THEN substring(att->>'url' FROM '^.*/uploads/')
+        WHEN att->>'url' LIKE '%/api/files/%' THEN regexp_replace(att->>'url', '^.*/api/files/', '')
+        WHEN att->>'url' LIKE '%/uploads/%' THEN regexp_replace(att->>'url', '^.*/uploads/', '')
       END AS file_key,
       att->>'name',
       (att->>'size')::integer,