chore: second group of duplications removed

Author: HardMax71

backend/app/db/docs/__init__.py

@@ -21,8 +21,6 @@
 from app.db.docs.saved_script import SavedScriptDocument
 from app.db.docs.user import UserDocument
 from app.db.docs.user_settings import (
-    EditorSettings,
-    NotificationSettings,
     UserSettingsDocument,
     UserSettingsSnapshotDocument,
 )
@@ -60,8 +58,6 @@
     # User Settings
     "UserSettingsDocument",
     "UserSettingsSnapshotDocument",
-    "NotificationSettings",
-    "EditorSettings",
     # Saga
     "SagaDocument",
     # DLQ

backend/app/db/docs/user_settings.py

@@ -2,16 +2,13 @@
 from typing import Any
 
 from beanie import Document, Indexed
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field
 
 from app.domain.enums import NotificationChannel, Theme
 
 
 class NotificationSettings(BaseModel):
-    """User notification preferences (embedded document).
-
-    Copied from user_settings.py NotificationSettings.
-    """
+    """User notification preferences (embedded document)."""
 
     model_config = ConfigDict(from_attributes=True)
 
@@ -23,10 +20,7 @@ class NotificationSettings(BaseModel):
 
 
 class EditorSettings(BaseModel):
-    """Code editor preferences (embedded document).
-
-    Copied from user_settings.py EditorSettings.
-    """
+    """Code editor preferences (embedded document)."""
 
     model_config = ConfigDict(from_attributes=True)
 
@@ -36,26 +30,9 @@ class EditorSettings(BaseModel):
     word_wrap: bool = True
     show_line_numbers: bool = True
 
-    @field_validator("font_size")
-    @classmethod
-    def validate_font_size(cls, v: int) -> int:
-        if v < 8 or v > 32:
-            raise ValueError("Font size must be between 8 and 32")
-        return v
-
-    @field_validator("tab_size")
-    @classmethod
-    def validate_tab_size(cls, v: int) -> int:
-        if v not in (2, 4, 8):
-            raise ValueError("Tab size must be 2, 4, or 8")
-        return v
-
 
 class UserSettingsDocument(Document):
-    """Complete user settings model.
-
-    Copied from UserSettings schema.
-    """
+    """Complete user settings model."""
 
     user_id: Indexed(str, unique=True)  # type: ignore[valid-type]
     theme: Theme = Theme.AUTO

backend/app/schemas_pydantic/user_settings.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 from typing import Any
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field
 
 from app.domain.enums import EventType, NotificationChannel, Theme
 
@@ -29,20 +29,6 @@ class EditorSettings(BaseModel):
     word_wrap: bool = True
     show_line_numbers: bool = True
 
-    @field_validator("font_size")
-    @classmethod
-    def validate_font_size(cls, v: int) -> int:
-        if v < 8 or v > 32:
-            raise ValueError("Font size must be between 8 and 32")
-        return v
-
-    @field_validator("tab_size")
-    @classmethod
-    def validate_tab_size(cls, v: int) -> int:
-        if v not in (2, 4, 8):
-            raise ValueError("Tab size must be 2, 4, or 8")
-        return v
-
 
 class UserSettings(BaseModel):
     """Complete user settings model"""

backend/app/services/user_settings_service.py

@@ -8,6 +8,7 @@
 from app.db import UserSettingsRepository
 from app.domain.enums import EventType, Theme
 from app.domain.events import EventMetadata, UserSettingsUpdatedEvent
+from app.domain.exceptions import ValidationError
 from app.domain.user import (
     DomainEditorSettings,
     DomainNotificationSettings,
@@ -86,6 +87,9 @@ async def update_user_settings(
         self, user_id: str, updates: DomainUserSettingsUpdate, reason: str | None = None
     ) -> DomainUserSettings:
         """Upsert provided fields into current settings, publish minimal event, and cache."""
+        if updates.editor is not None:
+            self._validate_editor_settings(updates.editor)
+
         current = await self.get_user_settings(user_id)
 
         changes = {k: v for k, v in dataclasses.asdict(updates).items() if v is not None}
@@ -218,6 +222,13 @@ def _build_settings(data: dict[str, Any]) -> DomainUserSettings:
             filtered["editor"] = DomainEditorSettings(**filtered["editor"])
         return DomainUserSettings(**filtered)
 
+    @staticmethod
+    def _validate_editor_settings(editor: DomainEditorSettings) -> None:
+        if not 8 <= editor.font_size <= 32:
+            raise ValidationError("Font size must be between 8 and 32")
+        if editor.tab_size not in (2, 4, 8):
+            raise ValidationError("Tab size must be 2, 4, or 8")
+
     async def invalidate_cache(self, user_id: str) -> None:
         """Invalidate cached settings for a user."""
         if self._cache.pop(user_id, None) is not None:

backend/tests/load/plot_report.py

@@ -3,10 +3,13 @@
 import argparse
 import json
 from pathlib import Path
-from typing import Dict, List, Tuple, TypedDict
+from typing import TYPE_CHECKING, Callable, Dict, List, Tuple, TypedDict
 
 import matplotlib.pyplot as plt
 
+if TYPE_CHECKING:
+    from matplotlib.axes import Axes
+
 
 class LatencyStats(TypedDict, total=False):
     p50: int
@@ -75,6 +78,28 @@ def _top_endpoints(report: ReportDict, top_n: int = 10) -> List[Tuple[str, Endpo
     return items[:top_n]
 
 
+def _save_bar_chart(
+    labels: List[str],
+    title: str,
+    ylabel: str,
+    out_path: Path,
+    plot_bars: Callable[[Axes, range], None],
+) -> Path:
+    x = range(len(labels))
+    fig, ax = plt.subplots(figsize=(max(10, len(labels) * 0.6), 5))
+    plot_bars(ax, x)
+    ax.set_ylabel(ylabel)
+    ax.set_title(title)
+    ax.set_xticks(list(x))
+    ax.set_xticklabels(labels, rotation=45, ha="right")
+    ax.grid(True, axis="y", alpha=0.3)
+    ax.legend()
+    fig.tight_layout()
+    fig.savefig(out_path)
+    plt.close(fig)
+    return out_path
+
+
 def plot_endpoint_latency(report: ReportDict, out_dir: Path, top_n: int = 10) -> Path:
     data = _top_endpoints(report, top_n)
     if not data:
@@ -86,24 +111,14 @@ def plot_endpoint_latency(report: ReportDict, out_dir: Path, top_n: int = 10) ->
     p90 = [v.get("latency_ms_success", empty_latency).get("p90", 0) for _, v in data]
     p99 = [v.get("latency_ms_success", empty_latency).get("p99", 0) for _, v in data]
 
-    x = range(len(labels))
     width = 0.25
 
-    fig, ax = plt.subplots(figsize=(max(10, len(labels) * 0.6), 5))
-    ax.bar([i - width for i in x], p50, width=width, label="p50", color="#22c55e")
-    ax.bar(x, p90, width=width, label="p90", color="#eab308")
-    ax.bar([i + width for i in x], p99, width=width, label="p99", color="#ef4444")
-    ax.set_ylabel("Latency (ms)")
-    ax.set_title("Success Latency by Endpoint (Top N)")
-    ax.set_xticks(list(x))
-    ax.set_xticklabels(labels, rotation=45, ha="right")
-    ax.grid(True, axis="y", alpha=0.3)
-    ax.legend()
-    out_path = out_dir / "endpoint_latency.png"
-    fig.tight_layout()
-    fig.savefig(out_path)
-    plt.close(fig)
-    return out_path
+    def bars(ax: Axes, x: range) -> None:
+        ax.bar([i - width for i in x], p50, width=width, label="p50", color="#22c55e")
+        ax.bar(x, p90, width=width, label="p90", color="#eab308")
+        ax.bar([i + width for i in x], p99, width=width, label="p99", color="#ef4444")
+
+    return _save_bar_chart(labels, "Success Latency by Endpoint (Top N)", "Latency (ms)", out_dir / "endpoint_latency.png", bars)
 
 
 def plot_endpoint_throughput(report: ReportDict, out_dir: Path, top_n: int = 10) -> Path:
@@ -116,23 +131,13 @@ def plot_endpoint_throughput(report: ReportDict, out_dir: Path, top_n: int = 10)
     errors = [v.get("errors", 0) for _, v in data]
     successes = [t - e for t, e in zip(total, errors)]
 
-    x = range(len(labels))
     width = 0.45
 
-    fig, ax = plt.subplots(figsize=(max(10, len(labels) * 0.6), 5))
-    ax.bar(x, successes, width=width, label="Success", color="#22c55e")
-    ax.bar(x, errors, width=width, bottom=successes, label="Errors", color="#ef4444")
-    ax.set_ylabel("Requests")
-    ax.set_title("Endpoint Throughput (Top N)")
-    ax.set_xticks(list(x))
-    ax.set_xticklabels(labels, rotation=45, ha="right")
-    ax.grid(True, axis="y", alpha=0.3)
-    ax.legend()
-    out_path = out_dir / "endpoint_throughput.png"
-    fig.tight_layout()
-    fig.savefig(out_path)
-    plt.close(fig)
-    return out_path
+    def bars(ax: Axes, x: range) -> None:
+        ax.bar(x, successes, width=width, label="Success", color="#22c55e")
+        ax.bar(x, errors, width=width, bottom=successes, label="Errors", color="#ef4444")
+
+    return _save_bar_chart(labels, "Endpoint Throughput (Top N)", "Requests", out_dir / "endpoint_throughput.png", bars)
 
 
 def generate_plots(report_path: str | Path, output_dir: str | Path | None = None) -> List[Path]: