refactor: mini refactoring for backend

Author: n0rfas

Pipfile

@@ -27,21 +27,19 @@ async function load() {
   }
 }
 
-/** New API: activity.authors_statistics is author -> stats; legacy: authors_statistics.authors */
+/** Root authors_statistics or author -> stats; legacy: activity / nested .authors */
 const authorsStats = computed(() => {
   const root = stats.value;
-  const fromActivity = root?.activity?.authors_statistics;
-  const legacy = root?.authors_statistics;
-  if (fromActivity != null) {
-    if (fromActivity.authors != null && typeof fromActivity.authors === "object") {
-      return fromActivity.authors;
-    }
-    return fromActivity;
+  const pick =
+    root?.authors_statistics ??
+    root?.activity?.authors_statistics;
+  if (pick == null) {
+    return {};
   }
-  if (legacy?.authors != null) {
-    return legacy.authors;
+  if (pick.authors != null && typeof pick.authors === "object") {
+    return pick.authors;
   }
-  return {};
+  return pick;
 });
 
 /** Pie slices: commit count per author (desc). */

frontend/src/views/AuthorsView.vue

@@ -43,19 +43,22 @@ async function load() {
   }
 }
 
-/** New API: activity.commits_summary; legacy: root commits_summary */
+/** Root commits_summary; legacy: activity.commits_summary */
 const commitsSummary = computed(() => {
   const root = stats.value;
-  return root?.activity?.commits_summary ?? root?.commits_summary ?? {};
+  return root?.commits_summary ?? root?.activity?.commits_summary ?? {};
 });
 
 const commitTypeRaw = computed(() => {
   const root = stats.value;
-  return (
-    root?.activity?.commit_type ??
-    root?.commit_type?.commit_type_by_week ??
-    {}
-  );
+  const ct = root?.commit_type ?? root?.activity?.commit_type;
+  if (!ct || typeof ct !== "object") {
+    return {};
+  }
+  if (ct.commit_type_by_week && typeof ct.commit_type_by_week === "object") {
+    return ct.commit_type_by_week;
+  }
+  return ct;
 });
 
 const commitTypeWeeks = computed(() => {
@@ -75,10 +78,14 @@ const commitTypes = computed(() => {
   return orderedCommitTypes(typeSet);
 });
 
-/** activity.derived.weekly_lines_history: week -> { extension -> line count } */
+/** Root weekly_lines_history; legacy: activity.derived.weekly_lines_history */
 const weeklyLinesHistory = computed(() => {
   const root = stats.value;
-  return root?.activity?.derived?.weekly_lines_history ?? {};
+  return (
+    root?.weekly_lines_history ??
+    root?.activity?.derived?.weekly_lines_history ??
+    {}
+  );
 });
 
 const weeklyLinesWeeks = computed(() => Object.keys(weeklyLinesHistory.value).sort());
@@ -111,6 +118,7 @@ const weeklyLinesExtensions = computed(() =>
 const busFactorRaw = computed(() => {
   const root = stats.value;
   return (
+    root?.bus_factor ??
     root?.risks?.bus_factor ??
     root?.post_data?.bus_factor ??
     root?.commits_summary?.post_data?.bus_factor
@@ -165,7 +173,7 @@ const codeChurn21dPercent = computed(() => {
 
 const codeChurn21dRaw = computed(() => {
   const root = stats.value;
-  return root?.activity?.code_churn_21d ?? root?.code_churn_21d ?? {};
+  return root?.code_churn_21d ?? root?.activity?.code_churn_21d ?? {};
 });
 
 const codeChurnAddedLines = computed(() => {
@@ -607,7 +615,7 @@ onUnmounted(() => {
             <span class="font-semibold">Lines of code by week</span>
             <div
               class="tooltip tooltip-right before:max-w-xs before:text-left before:whitespace-normal"
-              data-tip="Stacked area: estimated lines per file extension at the end of each week (from activity.derived.weekly_lines_history)."
+              data-tip="Stacked area: estimated lines per file extension at the end of each week (weekly_lines_history)."
             >
               <button
                 type="button"

frontend/src/views/OverviewView.vue

@@ -1,13 +1,13 @@
-# from .authors import AuthorsCollector
-# from .commit_type import CommitTypeCollector
-# from .summary import SummaryCollector
-# from .code_curn_21d import CodeChurnCollector
-# from .weekly_file_extensions import WeeklyFileExtensionsCollector
+from .authors import AuthorCommitsCounter
+from .commit_type import CommitTypeCollector
+from .summary import CommitsSummaryCollector
+from .code_churn import CodeChurnCollector
+from .weekly_file_extensions import WeeklyFileExtensionsCollector
 
-# __all__ = [
-#     # "AuthorsCollector",
-#     "CommitTypeCollector",
-#     "SummaryCollector",
-#     "CodeChurnCollector",
-#     "WeeklyFileExtensionsCollector",
-# ]
+__all__ = [
+    "AuthorCommitsCounter",
+    "CommitTypeCollector",
+    "CommitsSummaryCollector",
+    "CodeChurnCollector",
+    "WeeklyFileExtensionsCollector",
+]

git_analytics/collectors/__init__.py

@@ -2,7 +2,7 @@
 from typing import Dict, List, Any, Optional
 from abc import ABC, abstractmethod
 
-from git_analytics.engines.metrics import CommitContext
+from git_analytics.history import CommitContext
 
 
 class WeeklyCollector(ABC):

git_analytics/collectors/base.py git_analytics/collectors/_base.pygit_analytics/collectors/base.py renamed to git_analytics/collectors/_base.py

@@ -1,4 +1,4 @@
-from git_analytics.engines.metrics import CommitContext
+from git_analytics.history import CommitContext
 
 
 class AuthorCommitsCounter:

git_analytics/collectors/authors.py

@@ -3,25 +3,24 @@
 from collections import defaultdict, deque
 from datetime import datetime, timedelta, timezone
 
-from git_analytics.engines.metrics import CommitContext
+from git_analytics.history import CommitContext
 
 
 class CodeChurnCollector:
     name = "code_churn_21d"
 
     def __init__(
         self,
-        reporting_days: int = 365,
         churn_days: int = 21,
-        now: Optional[datetime] = None,
     ) -> None:
-        self._reporting_days = reporting_days
         self._churn_days = churn_days
-        self._now = (now or datetime.now(timezone.utc)).astimezone(timezone.utc)
-
-        self._report_start = self._now - timedelta(days=reporting_days)
         self._churn_window_seconds = churn_days * 24 * 60 * 60
 
+        # Начало периода отчетности устанавливается динамически:
+        # первый_коммит + churn_days
+        self._report_start: Optional[datetime] = None
+        self._first_commit_date: Optional[datetime] = None
+
         # file_path -> normalized_line -> deque[birth_ts]
         self._live_lines: Dict[str, Dict[str, deque[int]]] = defaultdict(lambda: defaultdict(deque))
 
@@ -38,6 +37,12 @@ def consume(self, ctx: CommitContext) -> None:
         parent = commit.parents[0]
         commit_dt = ctx.committed_datetime.astimezone(timezone.utc)
         commit_ts = int(commit_dt.timestamp())
+
+        # Устанавливаем период отчетности при первом коммите
+        if self._first_commit_date is None:
+            self._first_commit_date = commit_dt
+            self._report_start = self._first_commit_date + timedelta(days=self._churn_days)
+
         is_in_reporting_period = commit_dt >= self._report_start
 
         diffs = parent.diff(commit, create_patch=True)

git_analytics/collectors/code_curn_21d.py git_analytics/collectors/code_churn.pygit_analytics/collectors/code_curn_21d.py renamed to git_analytics/collectors/code_churn.py

@@ -1,6 +1,6 @@
 from typing import List, Dict
-from git_analytics.engines.metrics import CommitContext
-from .base import WeeklyCollector
+from git_analytics.history import CommitContext
+from ._base import WeeklyCollector
 
 
 LIST_OF_TYPE_COMMIT: List[str] = ["feature", "fix", "docs", "style", "refactor", "test", "chore", "wip", "merge"]

git_analytics/collectors/commit_type.py

@@ -1,7 +1,7 @@
 from datetime import date
-from typing import Dict, Optional, Set
+from typing import Optional, Set
 
-from git_analytics.engines.metrics import CommitContext
+from git_analytics.history import CommitContext
 
 
 class CommitsSummaryCollector:

git_analytics/collectors/summary.py

@@ -1,7 +1,7 @@
 from typing import Dict
 from pathlib import Path
-from git_analytics.engines.metrics import CommitContext
-from .base import WeeklyCollector
+from git_analytics.history import CommitContext
+from ._base import WeeklyCollector
 
 
 def _get_file_extension(file_path: str) -> str: