feat(words): единый источник csv_words + CRUD + глобальная проверка дубликатов

This commit is contained in:
2026-09-30 12:35:43 +00:00
parent 6d0d1b5001
commit 7bbce67cc4
+32 -6
View File
@@ -523,14 +523,40 @@ async def create_csv_word(request: Request):
if not word_pl:
raise HTTPException(400, "word_pl is required")
# 🔧 ФИКС (30.09.2026): global_duplicate_warning —
# проверяем все уровни. Если есть — возвращаем 409 с уровнем.
# Фронт покажет предупреждение + кнопку "Всё равно добавить".
# С флагом `force=true` — пропускаем проверку.
force = bool(body.get("force", False))
pool = await get_pool()
async with pool.acquire() as conn:
existing = await conn.fetchval("""
SELECT id FROM csv_words
WHERE level_code = $1 AND LOWER(word_pl) = LOWER($2)
""", level_code, word_pl)
if existing:
raise HTTPException(409, f"Word '{word_pl}' already exists in {level_code}")
if not force:
existing = await conn.fetchrow("""
SELECT id, level_code FROM csv_words
WHERE LOWER(word_pl) = LOWER($1)
ORDER BY
CASE level_code
WHEN 'A1' THEN 1 WHEN 'A2' THEN 2
WHEN 'B1' THEN 3 WHEN 'B2' THEN 4
WHEN 'C1' THEN 5 WHEN 'C2' THEN 6
ELSE 7
END
LIMIT 1
""", word_pl)
if existing:
existing_level = existing["level_code"]
if existing_level == level_code:
raise HTTPException(
409,
f"DUPLICATE_SAME_LEVEL|{word_pl}|{existing_level}"
)
else:
raise HTTPException(
409,
f"DUPLICATE_OTHER_LEVEL|{word_pl}|{existing_level}"
)
row = await conn.fetchrow("""
INSERT INTO csv_words (level_code, word_pl, translation_ru, translation_uk, translation_en)