Tighten configuration and export handling

redmine_reporter/client.py

@@ -1,17 +1,21 @@
 from typing import Any, Dict, List, Optional, Tuple
+
 from redminelib import Redmine
 from redminelib.resources import Issue
+
 from .config import Config
 from .utils import get_version
 
-REQUESTS_OPTIONS = {"verify": "/etc/ssl/certs/ca-certificates.crt"}
-
 
 def _get_redmine_auth_kwargs() -> Dict[str, Any]:
     """Return Redmine auth kwargs. API key has priority over legacy password auth."""
-    if Config.REDMINE_API_KEY:
-        return {"key": Config.REDMINE_API_KEY}
-    return {"username": Config.REDMINE_USER, "password": Config.REDMINE_PASSWORD}
+    api_key = Config.get_redmine_api_key()
+    if api_key:
+        return {"key": api_key}
+    return {
+        "username": Config.get_redmine_user(),
+        "password": Config.get_redmine_password(),
+    }
 
 
 def fetch_issues_with_spent_time(
@@ -24,9 +28,9 @@ def fetch_issues_with_spent_time(
     """
 
     redmine = Redmine(
-        Config.REDMINE_URL,
+        Config.get_redmine_url(),
         **_get_redmine_auth_kwargs(),
-        requests=REQUESTS_OPTIONS,
+        requests={"verify": Config.get_redmine_verify()},
     )
 
     current_user = redmine.user.get("current")
@@ -48,9 +52,7 @@ def fetch_issues_with_spent_time(
 
     # Загружаем полные объекты задач
     issue_list_str = ",".join(str(i) for i in issue_ids)
-    issues = redmine.issue.filter(
-        issue_id=issue_list_str, status_id="*", sort="project:asc"
-    )
+    issues = redmine.issue.filter(issue_id=issue_list_str, status_id="*", sort="project:asc")
 
     # Сопоставляем задачи с суммарным временем
     result = []