feat(formatter): unify data pipeline with ReportRow and report_builder

2026-01-24 16:09:25 +07:00
parent 245ea0a3fa
commit e344715f61
8 changed files with 194 additions and 234 deletions
--- a/redmine_reporter/formatter.py
+++ b/redmine_reporter/formatter.py
@@ -1,85 +1,30 @@
-from typing import List, Tuple
-from redminelib.resources import Issue
-from .utils import get_version
+from typing import List
+from tabulate import tabulate
+from .types import ReportRow


-STATUS_TRANSLATION = {
-    'Closed': 'Закрыто',
-    'Re-opened': 'В работе',
-    'New': 'В работе',
-    'Resolved': 'Решена',
-    'Pending': 'Ожидание',
-    'Feedback': 'В работе',
-    'In Progress': 'В работе',
-    'Rejected': 'Закрыто',
-    'Confirming': 'Ожидание',
-}
-
-
-def hours_to_human(hours: float) -> str:
-    if hours <= 0:
-        return "0ч"
-
-    total_minutes = round(hours * 60)
-    h = total_minutes // 60
-    m = total_minutes % 60
-    parts = []
-
-    if h:
-        parts.append(f"{h}ч")
-    if m:
-        parts.append(f"{m}м")
-
-    return " ".join(parts) if parts else "0ч"
-
-
-def format_compact(issue_hours: List[Tuple[Issue, float]], fill_time: bool = True) -> str:
+def format_compact(rows: List[ReportRow]) -> str:
    lines = []
-    prev_project = None
-    prev_version = None

-    for issue, hours in issue_hours:
-        project = str(issue.project)
-        version = get_version(issue)
-        status = str(issue.status)
-        time_text = hours_to_human(hours) if fill_time else ""
-
-        display_project = project if project != prev_project else ""
-        display_version = version if (project != prev_project or version != prev_version) else ""
-        lines.append(f"{display_project} | {display_version} | {issue.id}. {issue.subject} | {status} | {time_text}")
-
-        prev_project = project
-        prev_version = version
+    for r in rows:
+        lines.append(
+            f"{r['display_project']} | {r['display_version']} | "
+            f"{r['issue_id']}. {r['subject']} | {r['status_ru']} | {r['time_text']}"
+        )

    return "\n".join(lines)


-def format_table(issue_hours: List[Tuple[Issue, float]], fill_time: bool = True) -> str:
-    from tabulate import tabulate
+def format_table(rows: List[ReportRow]) -> str:
+    table_rows = [['Проект', 'Версия', 'Задача', 'Статус', 'Затрачено']]

-    rows = [['Проект', 'Версия', 'Задача', 'Статус', 'Затрачено']]
-    prev_project = None
-    prev_version = None
-
-    for issue, hours in issue_hours:
-        project = str(issue.project)
-        version = get_version(issue)
-        status_en = str(issue.status)
-        status_ru = STATUS_TRANSLATION.get(status_en, status_en)
-        time_text = hours_to_human(hours) if fill_time else ""
-
-        display_project = project if project != prev_project else ""
-        display_version = version if (project != prev_project or version != prev_version) else ""
-
-        rows.append([
-            display_project,
-            display_version,
-            f"{issue.id}. {issue.subject}",
-            status_ru,
-            time_text
+    for r in rows:
+        table_rows.append([
+            r['display_project'],
+            r['display_version'],
+            f"{r['issue_id']}. {r['subject']}",
+            r['status_ru'],
+            r['time_text']
        ])

-        prev_project = project
-        prev_version = version
-
-    return tabulate(rows, headers="firstrow", tablefmt="fancy_grid")
+    return tabulate(table_rows, headers="firstrow", tablefmt="fancy_grid")