Improve topic sorting: add popular sorting by publications and authors count

utils/generate_slug.py

@@ -5,48 +5,55 @@ from auth.orm import Author
 from services.db import local_session
 
 
-def replace_translit(src):
+def replace_translit(src: str) -> str:
     ruchars = "абвгдеёжзийклмнопрстуфхцчшщъыьэюя."
-    enchars = [
-        "a",
-        "b",
-        "v",
-        "g",
-        "d",
-        "e",
-        "yo",
-        "zh",
-        "z",
-        "i",
-        "y",
-        "k",
-        "l",
-        "m",
-        "n",
-        "o",
-        "p",
-        "r",
-        "s",
-        "t",
-        "u",
-        "f",
-        "h",
-        "c",
-        "ch",
-        "sh",
-        "sch",
-        "",
-        "y",
-        "'",
-        "e",
-        "yu",
-        "ya",
-        "-",
-    ]
-    return src.translate(str.maketrans(ruchars, enchars))
+    enchars = "abvgdeyozhziyklmnoprstufhcchshsch'yye'yuyaa-"
+
+    # Создаем словарь для замены, так как некоторые русские символы соответствуют нескольким латинским
+    translit_dict = {
+        "а": "a",
+        "б": "b",
+        "в": "v",
+        "г": "g",
+        "д": "d",
+        "е": "e",
+        "ё": "yo",
+        "ж": "zh",
+        "з": "z",
+        "и": "i",
+        "й": "y",
+        "к": "k",
+        "л": "l",
+        "м": "m",
+        "н": "n",
+        "о": "o",
+        "п": "p",
+        "р": "r",
+        "с": "s",
+        "т": "t",
+        "у": "u",
+        "ф": "f",
+        "х": "h",
+        "ц": "c",
+        "ч": "ch",
+        "ш": "sh",
+        "щ": "sch",
+        "ъ": "",
+        "ы": "y",
+        "ь": "",
+        "э": "e",
+        "ю": "yu",
+        "я": "ya",
+        ".": "-",
+    }
+
+    result = ""
+    for char in src:
+        result += translit_dict.get(char, char)
+    return result
 
 
-def generate_unique_slug(src):
+def generate_unique_slug(src: str) -> str:
     print("[resolvers.auth] generating slug from: " + src)
     slug = replace_translit(src.lower())
     slug = re.sub("[^0-9a-zA-Z]+", "-", slug)
@@ -63,3 +70,6 @@ def generate_unique_slug(src):
             unique_slug = slug
             print("[resolvers.auth] " + unique_slug)
             return quote_plus(unique_slug.replace("'", "")).replace("+", "-")
+
+    # Fallback return если что-то пошло не так
+    return quote_plus(slug.replace("'", "")).replace("+", "-")